commit f200ae16037d3d83d9849809603091c4dd8c48b7
author Xin Li <delphij@google.com> Thu Jun 13 10:50:25 2024 -0700
committer Xin Li <delphij@google.com> Thu Jun 13 10:50:25 2024 -0700
tree 9acbecaf4500f3602ab8600d0e8bcf5d7c691e9d
parent c58b2ab1fe74b6223abb571703c8bbc0cfca1287
parent 43c5385e87b2fa70f2f493c49a2bbfaf88ca36b0

Merge Android 14 QPR3 to AOSP main

Bug: 346855327
Merged-In: I2cc9c5b1bf5bbea9786674e2f289f5b5f1c81e27
Change-Id: I03d04a88816a08b778297f14540a94a7d5aed23f

src/com/android/imsserviceentitlement/SuwUiFragment.java

diff --git a/src/com/android/imsserviceentitlement/SuwUiFragment.java b/src/com/android/imsserviceentitlement/SuwUiFragment.java
index c0fa82e..525954d 100644
--- a/src/com/android/imsserviceentitlement/SuwUiFragment.java
+++ b/src/com/android/imsserviceentitlement/SuwUiFragment.java
@@ -98,7 +98,7 @@
                     new FooterButton.Builder(getContext())
                             .setListener(v -> finishActivity(primaryResult))
                             .setText(primaryButtonText)
-                            .setTheme(R.style.SudGlifButton_Primary)
+                            .setTheme(com.google.android.setupdesign.R.style.SudGlifButton_Primary)
                             .build());
         }
 
@@ -107,7 +107,7 @@
                     new FooterButton.Builder(getContext())
                             .setListener(v -> finishActivity(Activity.RESULT_CANCELED))
                             .setText(secondaryButtonText)
-                            .setTheme(R.style.SudGlifButton_Primary)
+                            .setTheme(com.google.android.setupdesign.R.style.SudGlifButton_Primary)
                             .build());
         }
 

src/com/android/imsserviceentitlement/WfcActivationActivity.java

diff --git a/src/com/android/imsserviceentitlement/WfcActivationActivity.java b/src/com/android/imsserviceentitlement/WfcActivationActivity.java
index 56db329..f384362 100644
--- a/src/com/android/imsserviceentitlement/WfcActivationActivity.java
+++ b/src/com/android/imsserviceentitlement/WfcActivationActivity.java
@@ -125,8 +125,8 @@
     private void setSuwTheme() {
         int defaultTheme =
                 ThemeHelper.isSetupWizardDayNightEnabled(this)
-                        ? R.style.SudThemeGlifV3_DayNight
-                        : R.style.SudThemeGlifV3_Light;
+                        ? com.google.android.setupdesign.R.style.SudThemeGlifV3_DayNight
+                        : com.google.android.setupdesign.R.style.SudThemeGlifV3_Light;
         ThemeResolver themeResolver =
                 new ThemeResolver.Builder(ThemeResolver.getDefault())
                         .setDefaultTheme(defaultTheme)