Fix external/setupdesign for use_resource_processor: true am: ad88e339de am: ecc2f29c96 am: a6cf20804c am: 2853987a8b

Original change: https://android-review.googlesource.com/c/platform/external/setupdesign/+/2767770

Change-Id: I18235795f6c2dce8abea5f95da78bfb789bbd3c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

6 files changed, 26 insertions, 11 deletions

diff --git a/Android.bp b/Android.bp
index 5f879ef..3653d5f 100644
--- a/Android.bp
+++ b/Android.bp
@@ -60,7 +60,7 @@ android_library {
 
 android_library {
     name: "setupdesign-strings",
-    manifest: "main/AndroidManifest.xml",
+    manifest: "strings/AndroidManifest.xml",
     resource_dirs: [
         "strings/res",
     ],
diff --git a/lottie_loading_layout/src/com/google/android/setupdesign/GlifLoadingLayout.java b/lottie_loading_layout/src/com/google/android/setupdesign/GlifLoadingLayout.java
index d4e1961..00be9ea 100644
--- a/lottie_loading_layout/src/com/google/android/setupdesign/GlifLoadingLayout.java
+++ b/lottie_loading_layout/src/com/google/android/setupdesign/GlifLoadingLayout.java
@@ -108,12 +108,12 @@ public class GlifLoadingLayout extends GlifLayout {
 
   public GlifLoadingLayout(Context context, int template, int containerId) {
     super(context, template, containerId);
-    init(null, R.attr.sudLayoutTheme);
+    init(null, com.google.android.setupdesign.R.attr.sudLayoutTheme);
   }
 
   public GlifLoadingLayout(Context context, AttributeSet attrs) {
     super(context, attrs);
-    init(attrs, R.attr.sudLayoutTheme);
+    init(attrs, com.google.android.setupdesign.R.attr.sudLayoutTheme);
   }
 
   public GlifLoadingLayout(Context context, AttributeSet attrs, int defStyleAttr) {
@@ -694,7 +694,10 @@ public class GlifLoadingLayout extends GlifLayout {
         }
       }
     }
-    return inflateTemplate(inflater, R.style.SudThemeGlif_Light, template);
+    return inflateTemplate(
+        inflater,
+        com.google.android.setupdesign.R.style.SudThemeGlif_Light,
+        template);
   }
 
   @Override
diff --git a/main/res/values/attrs.xml b/main/res/values/attrs.xml
index 4600bcc..d31ce14 100644
--- a/main/res/values/attrs.xml
+++ b/main/res/values/attrs.xml
@@ -157,6 +157,8 @@
 
     <attr name="sudHasStableIds" format="boolean|reference" />
 
+    <attr name="selectableItemBackground" format="reference" />
+
     <declare-styleable name="SudIllustration">
         <attr name="sudAspectRatio" format="float" />
     </declare-styleable>
diff --git a/main/src/com/google/android/setupdesign/template/HeaderMixin.java b/main/src/com/google/android/setupdesign/template/HeaderMixin.java
index 2a6114d..5085bda 100644
--- a/main/src/com/google/android/setupdesign/template/HeaderMixin.java
+++ b/main/src/com/google/android/setupdesign/template/HeaderMixin.java
@@ -76,11 +76,17 @@ public class HeaderMixin implements Mixin {
     final TypedArray a =
         layout
             .getContext()
-            .obtainStyledAttributes(attrs, R.styleable.SucHeaderMixin, defStyleAttr, 0);
+            .obtainStyledAttributes(
+                attrs,
+                com.google.android.setupcompat.R.styleable.SucHeaderMixin,
+                defStyleAttr,
+                0);
 
-    final CharSequence headerText = a.getText(R.styleable.SucHeaderMixin_sucHeaderText);
+    final CharSequence headerText = a.getText(
+        com.google.android.setupcompat.R.styleable.SucHeaderMixin_sucHeaderText);
     final ColorStateList headerTextColor =
-        a.getColorStateList(R.styleable.SucHeaderMixin_sucHeaderTextColor);
+        a.getColorStateList(
+            com.google.android.setupcompat.R.styleable.SucHeaderMixin_sucHeaderTextColor);
 
     a.recycle();
     if (getTextView() != null) {
diff --git a/main/src/com/google/android/setupdesign/util/DeviceHelper.java b/main/src/com/google/android/setupdesign/util/DeviceHelper.java
index 1a7e0bd..740e3b3 100644
--- a/main/src/com/google/android/setupdesign/util/DeviceHelper.java
+++ b/main/src/com/google/android/setupdesign/util/DeviceHelper.java
@@ -27,7 +27,6 @@ import android.util.Log;
 import androidx.annotation.NonNull;
 import androidx.annotation.VisibleForTesting;
 import com.google.android.setupcompat.util.Logger;
-import com.google.android.setupdesign.R;
 
 /** Helper class to get attributes of the device, like a friendly display name. */
 public final class DeviceHelper {
@@ -109,7 +108,8 @@ public final class DeviceHelper {
       }
     }
 
-    return context.getString(R.string.sud_default_device_name);
+    return context.getString(
+        com.google.android.setupdesign.strings.R.string.sud_default_device_name);
   }
 
   private DeviceHelper() {}
diff --git a/main/src/com/google/android/setupdesign/util/PartnerStyleHelper.java b/main/src/com/google/android/setupdesign/util/PartnerStyleHelper.java
index 78900b1..2029ddc 100644
--- a/main/src/com/google/android/setupdesign/util/PartnerStyleHelper.java
+++ b/main/src/com/google/android/setupdesign/util/PartnerStyleHelper.java
@@ -113,7 +113,9 @@ public final class PartnerStyleHelper {
     if (activity != null) {
       isSetupFlow = WizardManagerHelper.isAnySetupWizard(activity.getIntent());
     }
-    TypedArray a = context.obtainStyledAttributes(new int[] {R.attr.sucUsePartnerResource});
+    TypedArray a = context.obtainStyledAttributes(new int[] {
+        com.google.android.setupcompat.R.attr.sucUsePartnerResource
+    });
     boolean usePartnerResource = a.getBoolean(0, true);
     a.recycle();
 
@@ -180,7 +182,9 @@ public final class PartnerStyleHelper {
     }
 
     // try best to get dynamic color settings from attr
-    TypedArray a = context.obtainStyledAttributes(new int[] {R.attr.sucFullDynamicColor});
+    TypedArray a = context.obtainStyledAttributes(new int[] {
+        com.google.android.setupcompat.R.attr.sucFullDynamicColor
+    });
     boolean useDynamicColorTheme =
         a.hasValue(
             com.google