forked from LawnchairLauncher/lawnchair
-
Notifications
You must be signed in to change notification settings - Fork 13
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/upstream' into trunk
# Conflicts: # .github/workflows/ci.yml # .github/workflows/release_update.yml # README.md
- Loading branch information
Showing
63 changed files
with
12,078 additions
and
103 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
| import com.android.build.api.dsl.ManagedVirtualDevice | ||
|
|
||
| plugins { | ||
| id 'com.android.test' | ||
| id 'androidx.baselineprofile' | ||
| id 'org.jetbrains.kotlin.android' | ||
| } | ||
|
|
||
| android { | ||
| namespace 'app.lawnchair.baseline' | ||
|
|
||
| defaultConfig { | ||
| testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" | ||
| } | ||
|
|
||
| targetProjectPath = ":" | ||
|
|
||
| flavorDimensions += ["app", "recents"] | ||
| productFlavors { | ||
| lawn { dimension = "app" } | ||
| withQuickstep { dimension = "recents" } | ||
| } | ||
|
|
||
| testOptions.managedDevices.devices { | ||
| pixel6Api33(ManagedVirtualDevice) { | ||
| device = "Pixel 6" | ||
| apiLevel = 33 | ||
| systemImageSource = "google" | ||
| } | ||
| } | ||
| } | ||
|
|
||
| // 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" | ||
| useConnectedDevices = false | ||
| } | ||
|
|
||
| dependencies { | ||
| implementation 'androidx.test.ext:junit:1.1.5' | ||
| implementation 'androidx.test.espresso:espresso-core:3.5.1' | ||
| implementation 'androidx.test.uiautomator:uiautomator:2.2.0' | ||
| implementation 'androidx.benchmark:benchmark-macro-junit4:1.2.2' | ||
| } |
59 changes: 59 additions & 0 deletions
59
baseline-profile/src/main/java/app/lawnchair/baseline/BaselineProfileGenerator.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,59 @@ | ||
| package app.lawnchair.baseline | ||
|
|
||
| import androidx.benchmark.macro.junit4.BaselineProfileRule | ||
| import androidx.test.ext.junit.runners.AndroidJUnit4 | ||
| import androidx.test.filters.LargeTest | ||
| import org.junit.Rule | ||
| import org.junit.Test | ||
| import org.junit.runner.RunWith | ||
|
|
||
| /** | ||
| * This test class generates a basic startup baseline profile for the target package. | ||
| * | ||
| * We recommend you start with this but add important user flows to the profile to improve their performance. | ||
| * Refer to the [baseline profile documentation](https://d.android.com/topic/performance/baselineprofiles) | ||
| * for more information. | ||
| * | ||
| * You can run the generator with the Generate Baseline Profile run configuration, | ||
| * or directly with `generateBaselineProfile` Gradle task: | ||
| * ``` | ||
| * ./gradlew :lawnchair:generateReleaseBaselineProfile -Pandroid.testInstrumentationRunnerArguments.androidx.benchmark.enabledRules=BaselineProfile | ||
| * ``` | ||
| * The run configuration runs the Gradle task and applies filtering to run only the generators. | ||
| * | ||
| * Check [documentation](https://d.android.com/topic/performance/benchmarking/macrobenchmark-instrumentation-args) | ||
| * for more information about available instrumentation arguments. | ||
| * | ||
| * After you run the generator, you can verify the improvements running the [StartupBenchmarks] benchmark. | ||
| * | ||
| * When using this class to generate a baseline profile, only API 33+ or rooted API 26+ are supported. | ||
| **/ | ||
| @RunWith(AndroidJUnit4::class) | ||
| @LargeTest | ||
| class BaselineProfileGenerator { | ||
|
|
||
| @get:Rule | ||
| val rule = BaselineProfileRule() | ||
|
|
||
| @Test | ||
| fun generate() { | ||
| rule.collect(Constants.PACKAGE_NAME) { | ||
| // This block defines the app's critical user journey. Here we are interested in | ||
| // optimizing for app startup. But you can also navigate and scroll | ||
| // through your most important UI. | ||
|
|
||
| // Start default activity for your app | ||
| pressHome() | ||
| startActivityAndWait() | ||
|
|
||
| // TODO Write more interactions to optimize advanced journeys of your app. | ||
| // For example: | ||
| // 1. Wait until the content is asynchronously loaded | ||
| // 2. Scroll the feed content | ||
| // 3. Navigate to detail screen | ||
|
|
||
| // Check UiAutomator documentation for more information how to interact with the app. | ||
| // https://d.android.com/training/testing/other-components/ui-automator | ||
| } | ||
| } | ||
| } |
5 changes: 5 additions & 0 deletions
5
baseline-profile/src/main/java/app/lawnchair/baseline/Constants.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| package app.lawnchair.baseline | ||
|
|
||
| object Constants { | ||
| val PACKAGE_NAME = "app.lawnchair" | ||
| } |
72 changes: 72 additions & 0 deletions
72
baseline-profile/src/main/java/app/lawnchair/baseline/StartupBenchmarks.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,72 @@ | ||
| package app.lawnchair.baseline | ||
|
|
||
| import androidx.benchmark.macro.BaselineProfileMode | ||
| import androidx.benchmark.macro.CompilationMode | ||
| import androidx.benchmark.macro.StartupMode | ||
| import androidx.benchmark.macro.StartupTimingMetric | ||
| import androidx.benchmark.macro.junit4.MacrobenchmarkRule | ||
| import androidx.test.ext.junit.runners.AndroidJUnit4 | ||
| import androidx.test.filters.LargeTest | ||
| import org.junit.Rule | ||
| import org.junit.Test | ||
| import org.junit.runner.RunWith | ||
|
|
||
| /** | ||
| * This test class benchmarks the speed of app startup. | ||
| * Run this benchmark to verify how effective a Baseline Profile is. | ||
| * It does this by comparing [CompilationMode.None], which represents the app with no Baseline | ||
| * Profiles optimizations, and [CompilationMode.Partial], which uses Baseline Profiles. | ||
| * | ||
| * Run this benchmark to see startup measurements and captured system traces for verifying | ||
| * the effectiveness of your Baseline Profiles. You can run it directly from Android | ||
| * Studio as an instrumentation test, or run all benchmarks with this Gradle task: | ||
| * ``` | ||
| * ./gradlew :baseline-profile:connectedAndroidTest -Pandroid.testInstrumentationRunnerArguments.androidx.benchmark.enabledRules=Macrobenchmark | ||
| * ``` | ||
| * | ||
| * You should run the benchmarks on a physical device, not an Android emulator, because the | ||
| * emulator doesn't represent real world performance and shares system resources with its host. | ||
| * | ||
| * For more information, see the [Macrobenchmark documentation](https://d.android.com/macrobenchmark#create-macrobenchmark) | ||
| * and the [instrumentation arguments documentation](https://d.android.com/topic/performance/benchmarking/macrobenchmark-instrumentation-args). | ||
| **/ | ||
| @RunWith(AndroidJUnit4::class) | ||
| @LargeTest | ||
| class StartupBenchmarks { | ||
|
|
||
| @get:Rule | ||
| val rule = MacrobenchmarkRule() | ||
|
|
||
| @Test | ||
| fun startupCompilationNone() = | ||
| benchmark(CompilationMode.None()) | ||
|
|
||
| @Test | ||
| fun startupCompilationBaselineProfiles() = | ||
| benchmark(CompilationMode.Partial(BaselineProfileMode.Require)) | ||
|
|
||
| private fun benchmark(compilationMode: CompilationMode) { | ||
| rule.measureRepeated( | ||
| packageName = Constants.PACKAGE_NAME, | ||
| metrics = listOf(StartupTimingMetric()), | ||
| compilationMode = compilationMode, | ||
| startupMode = StartupMode.COLD, | ||
| iterations = 10, | ||
| setupBlock = { | ||
| pressHome() | ||
| }, | ||
| measureBlock = { | ||
| startActivityAndWait() | ||
|
|
||
| // TODO Add interactions to wait for when your app is fully drawn. | ||
| // The app is fully drawn when Activity.reportFullyDrawn is called. | ||
| // For Jetpack Compose, you can use ReportDrawn, ReportDrawnWhen and ReportDrawnAfter | ||
| // from the AndroidX Activity library. | ||
|
|
||
| // Check the UiAutomator documentation for more information on how to | ||
| // interact with the app. | ||
| // https://d.android.com/training/testing/other-components/ui-automator | ||
| }, | ||
| ) | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,51 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <!-- | ||
| Copyright (C) 2022 The Android Open Source Project | ||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| --> | ||
|
|
||
| <com.android.quickstep.views.DesktopTaskView | ||
| xmlns:android="http://schemas.android.com/apk/res/android" | ||
| android:layout_width="match_parent" | ||
| android:layout_height="match_parent" | ||
| android:clipChildren="true" | ||
| android:clipToOutline="true" | ||
| android:defaultFocusHighlightEnabled="false" | ||
| android:focusable="true"> | ||
|
|
||
| <View | ||
| android:id="@+id/background" | ||
| android:layout_width="match_parent" | ||
| android:layout_height="match_parent" /> | ||
|
|
||
| <!-- | ||
| TODO(b249371338): DesktopTaskView extends from TaskView. TaskView expects TaskThumbnailView | ||
| and IconView with these ids to be present. Need to refactor RecentsView to accept child | ||
| views that do not inherint from TaskView only or create a generic TaskView that have | ||
| N number of tasks. | ||
| --> | ||
| <com.android.quickstep.views.TaskThumbnailView | ||
| android:id="@+id/snapshot" | ||
| android:layout_width="wrap_content" | ||
| android:layout_height="wrap_content" | ||
| android:visibility="gone" /> | ||
|
|
||
| <com.android.quickstep.views.IconView | ||
| android:id="@+id/icon" | ||
| android:layout_width="@dimen/task_thumbnail_icon_size" | ||
| android:layout_height="@dimen/task_thumbnail_icon_size" | ||
| android:focusable="false" | ||
| android:importantForAccessibility="no" /> | ||
|
|
||
| </com.android.quickstep.views.DesktopTaskView> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.