commit 52043371ef3cef643caa25a839dbdc7d502eceb1
author Neda Topoljanac <tneda@google.com> Mon Jun 05 16:37:08 2023 +0000
committer Neda Topoljanac <tneda@google.com> Tue Jun 06 08:21:32 2023 +0000
tree 42d2aed17b59e13a47f4a096105934676a84427a
parent 4baa8a181a9b3eacf22c8fa998030cb9cd990166

Move resources to androidTest folder for test app in Material

Bug: N/A
Test: Confirm that it's passing
Change-Id: I9baedf071fa1a57b1607f3ca77f9f13af0d7b9e6

wear/protolayout/protolayout-material/src/androidTest/AndroidManifest.xml

diff --git a/wear/protolayout/protolayout-material/src/androidTest/AndroidManifest.xml b/wear/protolayout/protolayout-material/src/androidTest/AndroidManifest.xml
index fc13b63..0925f9d 100644
--- a/wear/protolayout/protolayout-material/src/androidTest/AndroidManifest.xml
+++ b/wear/protolayout/protolayout-material/src/androidTest/AndroidManifest.xml
@@ -22,7 +22,7 @@
         android:taskAffinity="">
         <uses-library android:name="android.test.runner" />
 
-        <activity android:name="androidx.wear.protolayout.material.testapp.GoldenTestActivity"
+        <activity android:name="androidx.wear.protolayout.material.test.GoldenTestActivity"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

wear/protolayout/protolayout-material/src/androidTest/java/androidx/wear/protolayout/material/RunnerUtils.java

diff --git a/wear/protolayout/protolayout-material/src/androidTest/java/androidx/wear/protolayout/material/RunnerUtils.java b/wear/protolayout/protolayout-material/src/androidTest/java/androidx/wear/protolayout/material/RunnerUtils.java
index 2c74f74..060e5f1 100644
--- a/wear/protolayout/protolayout-material/src/androidTest/java/androidx/wear/protolayout/material/RunnerUtils.java
+++ b/wear/protolayout/protolayout-material/src/androidTest/java/androidx/wear/protolayout/material/RunnerUtils.java
@@ -28,7 +28,7 @@
 import androidx.test.screenshot.AndroidXScreenshotTestRule;
 import androidx.test.screenshot.matchers.MSSIMMatcher;
 import androidx.wear.protolayout.LayoutElementBuilders;
-import androidx.wear.protolayout.material.testapp.GoldenTestActivity;
+import androidx.wear.protolayout.material.test.GoldenTestActivity;
 
 public class RunnerUtils {
     // This isn't totally ideal right now. The screenshot tests run on a phone, so emulate some

wear/protolayout/protolayout-material/src/androidTest/java/androidx/wear/protolayout/material/test/GoldenTestActivity.java

diff --git a/wear/protolayout/protolayout-material/src/androidTest/java/androidx/wear/protolayout/material/testapp/GoldenTestActivity.java b/wear/protolayout/protolayout-material/src/androidTest/java/androidx/wear/protolayout/material/test/GoldenTestActivity.java
similarity index 97%
rename from wear/protolayout/protolayout-material/src/androidTest/java/androidx/wear/protolayout/material/testapp/GoldenTestActivity.java
rename to wear/protolayout/protolayout-material/src/androidTest/java/androidx/wear/protolayout/material/test/GoldenTestActivity.java
index db529ef..e16bd9f 100644
--- a/wear/protolayout/protolayout-material/src/androidTest/java/androidx/wear/protolayout/material/testapp/GoldenTestActivity.java
+++ b/wear/protolayout/protolayout-material/src/androidTest/java/androidx/wear/protolayout/material/test/GoldenTestActivity.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package androidx.wear.protolayout.material.testapp;
+package androidx.wear.protolayout.material.test;
 
 import static androidx.wear.protolayout.material.Helper.checkNotNull;
 import static androidx.wear.protolayout.material.RunnerUtils.SCREEN_HEIGHT;
@@ -37,7 +37,6 @@
 import androidx.wear.protolayout.ResourceBuilders.AndroidImageResourceByResId;
 import androidx.wear.protolayout.ResourceBuilders.ImageResource;
 import androidx.wear.protolayout.ResourceBuilders.Resources;
-import androidx.wear.protolayout.material.R;
 import androidx.wear.protolayout.renderer.impl.ProtoLayoutViewInstance;
 
 import com.google.common.util.concurrent.ListeningExecutorService;

wear/protolayout/protolayout-material/src/androidTest/res/drawable/avatar.png

diff --git a/wear/protolayout/protolayout-material/src/main/res/drawable/avatar.png b/wear/protolayout/protolayout-material/src/androidTest/res/drawable/avatar.png
similarity index 100%
rename from wear/protolayout/protolayout-material/src/main/res/drawable/avatar.png
rename to wear/protolayout/protolayout-material/src/androidTest/res/drawable/avatar.png
Binary files differ

wear/protolayout/protolayout-material/src/androidTest/res/drawable/icon.xml

diff --git a/wear/protolayout/protolayout-material/src/main/res/drawable/icon.xml b/wear/protolayout/protolayout-material/src/androidTest/res/drawable/icon.xml
similarity index 100%
rename from wear/protolayout/protolayout-material/src/main/res/drawable/icon.xml
rename to wear/protolayout/protolayout-material/src/androidTest/res/drawable/icon.xml

wear/protolayout/protolayout-material/src/androidTest/res/drawable/icon_small.xml

diff --git a/wear/protolayout/protolayout-material/src/main/res/drawable/icon_small.xml b/wear/protolayout/protolayout-material/src/androidTest/res/drawable/icon_small.xml
similarity index 100%
rename from wear/protolayout/protolayout-material/src/main/res/drawable/icon_small.xml
rename to wear/protolayout/protolayout-material/src/androidTest/res/drawable/icon_small.xml