commit ca9f59464648800fa10b6b08981c3032b9039836
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Feb 04 22:05:35 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Feb 04 22:05:35 2020 +0000
tree ca82b019c447b2922f4e2be1bca053e17728f040
parent 55620c31bdc281b4efbb8a9901981fb7d829497c
parent 70b533d15c61df9be509ef058b575d37ed492083

Merge "remove public.xml from google3"

car-ui-lib/tests/paintbooth/Android.bp

diff --git a/car-ui-lib/tests/paintbooth/Android.bp b/car-ui-lib/tests/paintbooth/Android.bp
index f5eb2da..bd9ed79 100644
--- a/car-ui-lib/tests/paintbooth/Android.bp
+++ b/car-ui-lib/tests/paintbooth/Android.bp
@@ -21,7 +21,7 @@
 
     required: ["privapp_whitelist_com.android.car.ui.paintbooth"],
 
-    resource_dirs: ["res"],
+    resource_dirs: ["res", "res-public"],
 
     platform_apis: true,
 

car-ui-lib/tests/paintbooth/build.gradle

diff --git a/car-ui-lib/tests/paintbooth/build.gradle b/car-ui-lib/tests/paintbooth/build.gradle
index 641b0f7..2891586 100644
--- a/car-ui-lib/tests/paintbooth/build.gradle
+++ b/car-ui-lib/tests/paintbooth/build.gradle
@@ -41,7 +41,7 @@
                         "com/android/car/ui/paintbooth/currentactivity/ActivityTaskManagerImpl.java",
                 ]
             }
-            res.srcDirs = ['res']
+            res.srcDirs = ['res', 'res-public']
         }
     }
 }

car-ui-lib/tests/paintbooth/res-public/values/public.xml

diff --git a/car-ui-lib/tests/paintbooth/res/values/public.xml b/car-ui-lib/tests/paintbooth/res-public/values/public.xml
similarity index 100%
rename from car-ui-lib/tests/paintbooth/res/values/public.xml
rename to car-ui-lib/tests/paintbooth/res-public/values/public.xml