[Gradle] Enable non transitive R classes (resource namespacing) and fix errors

PiperOrigin-RevId: 738871402

Author: dsn5ft

catalog/java/io/material/catalog/color/ColorHarmonizationDemoActivity.java

@@ -64,7 +64,7 @@ public class ColorHarmonizationDemoActivity extends DemoActivity {
  R.id.cat_colors_error,
  R.id.cat_colors_harmonized_error,
  new int[] {
- R.attr.colorError,
+ androidx.appcompat.R.attr.colorError,
  com.google.android.material.R.attr.colorOnError,
  com.google.android.material.R.attr.colorErrorContainer,
  com.google.android.material.R.attr.colorOnErrorContainer

catalog/java/io/material/catalog/color/ColorMainDemoFragment.java

@@ -104,7 +104,8 @@ private List<ColorRow> getColorRolesSurfaces() {
  private List<ColorRow> getColorRolesContent() {
  return Arrays.asList(
  new ColorRow(
- new ColorRoleItem(R.string.cat_color_role_primary, R.attr.colorPrimary),
+ new ColorRoleItem(
+ R.string.cat_color_role_primary, androidx.appcompat.R.attr.colorPrimary),
  new ColorRoleItem(R.string.cat_color_role_on_primary, com.google.android.material.R.attr.colorOnPrimary)),
  new ColorRow(
  new ColorRoleItem(
@@ -164,7 +165,8 @@ private List<ColorRow> getColorRolesContent() {
  private List<ColorRow> getColorRolesUtility() {
  return Arrays.asList(
  new ColorRow(
- new ColorRoleItem(R.string.cat_color_role_error, R.attr.colorError),
+ new ColorRoleItem(
+ R.string.cat_color_role_error, androidx.appcompat.R.attr.colorError),
  new ColorRoleItem(R.string.cat_color_role_on_error, com.google.android.material.R.attr.colorOnError)),
  new ColorRow(
  new ColorRoleItem(R.string.cat_color_role_error_container, com.google.android.material.R.attr.colorErrorContainer),

catalog/java/io/material/catalog/datepicker/DatePickerMainDemoFragment.java

@@ -267,7 +267,7 @@ private CharSequence getTitleWithDescription() {
  String titleAndDescriptionText =
  context.getString(R.string.cat_picker_title_description_main) + alarmTimes;
  SpannableString spannable = new SpannableString(titleAndDescriptionText);
- int alarmTimesColor = resolveOrThrow(context, R.attr.colorPrimary);
+ int alarmTimesColor = resolveOrThrow(context, androidx.appcompat.R.attr.colorPrimary);
  int spanStart = titleAndDescriptionText.indexOf(alarmTimes);
  int spanEnd = spanStart + alarmTimes.length();
  spannable.setSpan(

catalog/java/io/material/catalog/feature/DemoLandingFragment.java

@@ -94,7 +94,10 @@ public View onCreateView(
  TypedArray a =
  toolbarContext
  .getTheme()
- .obtainStyledAttributes(new int[] {com.google.android.material.R.attr.colorOnSurfaceVariant, R.attr.colorPrimary});
+ .obtainStyledAttributes(
+ new int[] {
+ com.google.android.material.R.attr.colorOnSurfaceVariant, androidx.appcompat.R.attr.colorPrimary
+ });
  menuIconColorUnchecked = a.getColor(0, 0);
  menuIconColorChecked = a.getColor(1, 0);
  a.recycle();

catalog/java/io/material/catalog/feature/FeatureDemoUtils.java

@@ -90,10 +90,10 @@ public static void startFragmentInternal(
  }
  } else {
  transaction.setCustomAnimations(
- R.anim.abc_grow_fade_in_from_bottom,
- R.anim.abc_fade_out,
- R.anim.abc_fade_in,
- R.anim.abc_shrink_fade_out_from_bottom);
+ androidx.appcompat.R.anim.abc_grow_fade_in_from_bottom,
+ androidx.appcompat.R.anim.abc_fade_out,
+ androidx.appcompat.R.anim.abc_fade_in,
+ androidx.appcompat.R.anim.abc_shrink_fade_out_from_bottom);
  }
 
  transaction

catalog/java/io/material/catalog/feature/MemoryView.java

@@ -124,7 +124,7 @@ protected void onAttachedToWindow() {
  TypedValue typedValue = new TypedValue();
  getContext()
  .getTheme()
- .resolveAttribute(R.attr.colorPrimary, typedValue, true);
+ .resolveAttribute(androidx.appcompat.R.attr.colorPrimary, typedValue, true);
 
  int colorPrimary = typedValue.data;
  paint.setColor(colorPrimary);

catalog/java/io/material/catalog/menu/MenuMainDemoFragment.java

@@ -173,7 +173,8 @@ public void setPopupItemLayoutRes(@LayoutRes int popupItemRes) {
 
  private ListPopupWindow initializeListPopupMenu(View v) {
  ListPopupWindow listPopupWindow =
- new ListPopupWindow(getContext(), null, R.attr.listPopupWindowStyle);
+ new ListPopupWindow(
+ getContext(), null, androidx.appcompat.R.attr.listPopupWindowStyle);
  ArrayAdapter<CharSequence> adapter =
  new ArrayAdapter<>(
  getContext(),
@@ -198,7 +199,9 @@ private void highlightText(TextView textView) {
  Context context = textView.getContext();
  CharSequence text = textView.getText();
  TypedValue value = new TypedValue();
- context.getTheme().resolveAttribute(R.attr.colorPrimary, value, true);
+ context
+ .getTheme()
+ .resolveAttribute(androidx.appcompat.R.attr.colorPrimary, value, true);
  Spannable spanText = Spannable.Factory.getInstance().newSpannable(text);
  spanText.setSpan(
  new BackgroundColorSpan(value.data), 0, text.length(), SPAN_EXCLUSIVE_EXCLUSIVE);

catalog/java/io/material/catalog/shapetheming/ShapeThemingDemoFragment.java

@@ -52,7 +52,7 @@ public View onCreateView(
  final TypedValue value = new TypedValue();
  wrappedContext
  .getTheme()
- .resolveAttribute(R.attr.colorPrimaryDark, value, true);
+ .resolveAttribute(androidx.appcompat.R.attr.colorPrimaryDark, value, true);
  window.setStatusBarColor(value.data);
 
  return super.onCreateView(layoutInflaterWithThemedContext, viewGroup, bundle);

catalog/java/io/material/catalog/topappbar/TopAppBarCollapsingMultilineDemoFragment.java

@@ -64,7 +64,7 @@ public View onCreateDemoView(
  Toolbar toolbar = view.findViewById(R.id.toolbar);
  AppCompatActivity activity = (AppCompatActivity) getActivity();
  activity.setSupportActionBar(toolbar);
- colorPrimary = MaterialColors.getColor(view, R.attr.colorPrimary);
+ colorPrimary = MaterialColors.getColor(view, androidx.appcompat.R.attr.colorPrimary);
 
  return view;
  }

gradle.properties

@@ -18,8 +18,6 @@ org.gradle.parallel=true
 
 android.useAndroidX=true
 android.enableUnitTestBinaryResources=true
-# (b/379121671) Non-transitive R classes were enabled by default in AGP 8+
-android.nonTransitiveRClass=false
 
 # Disable "The option setting 'android.enableUnitTestBinaryResources=true' is experimental and unsupported" warning
 android.suppressUnsupportedOptionWarnings=android.suppressUnsupportedOptionWarnings,android.enableUnitTestBinaryResources