Merge pull request #234 from android/variant_fix

Remove macrobenchmark_setup_variant and fix license issue in readme
android · Jun 12, 2023 · aac6d03 · aac6d03
2 parents fbce967 + fe67dfa
commit aac6d03
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 31 deletions.
diff --git a/MacrobenchmarkSample/macrobenchmark/build.gradle.kts b/MacrobenchmarkSample/macrobenchmark/build.gradle.kts
@@ -56,15 +56,6 @@ android {
 }
 // [END macrobenchmark_setup_android]
 
-// [START macrobenchmark_setup_variant]
-androidComponents {
-    beforeVariants(selector().all()) {
-        // enable only the benchmark buildType, since we only want to measure close to release performance
-        it.enable = it.buildType == "benchmark"
-    }
-}
-// [END macrobenchmark_setup_variant]
-
 dependencies {
     implementation(project(":baseBenchmarks"))
     implementation(libs.benchmark.junit)

diff --git a/...rk/src/main/java/com/example/macrobenchmark/frames/NestedRecyclerFrameTimingBenchmarks.kt b/...rk/src/main/java/com/example/macrobenchmark/frames/NestedRecyclerFrameTimingBenchmarks.kt
@@ -90,7 +90,7 @@ class NestedRecyclerFrameTimingBenchmarks {
             val nestedRecyclerToScroll = visibleNestedRecyclers[1]
 
             // Set gesture margin to avoid triggering gesture navigation with input events from automation.
-            nestedRecyclerToScroll.setGestureMargin(device.displayWidth / 5)
+            nestedRecyclerToScroll.setGestureMargin(device.displayWidth / 3)
 
             // swipe horizontally
             nestedRecyclerToScroll.fling(Direction.RIGHT)

diff --git a/...benchmark/src/main/java/com/example/macrobenchmark/frames/NonExportedActivityBenchmark.kt b/...benchmark/src/main/java/com/example/macrobenchmark/frames/NonExportedActivityBenchmark.kt
@@ -77,9 +77,9 @@ class NonExportedActivityBenchmark {
         startActivityAndWait()
 
         // click a button to launch the target activity.
-        // While we use resourceId here to find the button, you could also use
-        // accessibility info or button text content.
-        val selector = By.res(packageName, "launchRecyclerActivity")
+        // While we use button text  here to find the button, you could also use
+        // accessibility info or resourceId.
+        val selector = By.text("RecyclerView")
         if (!device.wait(Until.hasObject(selector), 5_500)) {
             fail("Could not find resource in time")
         }

diff --git a/README.md b/README.md
@@ -44,21 +44,3 @@ issue tracker link available in the sample README file.
 [WorkManagerSample](https://github.com/googlesamples/android-architecture-components/tree/master/WorkManagerSample)
 - Example of benchmarking asynchronously scheduled background work
 
-## License 
-
-```
-Copyright 2022 The Android Open Source Project, Inc.
-
-Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.
-See the NOTICE file distributed with this work for additional information regarding copyright
-ownership.  The ASF licenses this file to you under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.  You may obtain a copy of the
-License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software distributed under the License is
-distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-implied.  See the License for the specific language governing permissions and limitations under the
-License.
-```