1 files changed, 21 insertions, 39 deletions

diff --git a/packages/SimAppDialog/src/com/android/simappdialog/InstallCarrierAppActivity.java b/packages/SimAppDialog/src/com/android/simappdialog/InstallCarrierAppActivity.java
index 0b6f9bb4f9e0..abe82a885a94 100644
--- a/packages/SimAppDialog/src/com/android/simappdialog/InstallCarrierAppActivity.java
+++ b/packages/SimAppDialog/src/com/android/simappdialog/InstallCarrierAppActivity.java
@@ -17,17 +17,14 @@ package com.android.simappdialog;
 
 import android.app.Activity;
 import android.content.Intent;
-import android.content.res.Resources;
 import android.os.Bundle;
 import android.sysprop.SetupWizardProperties;
 import android.text.TextUtils;
 import android.view.View;
+import android.widget.Button;
 import android.widget.TextView;
 
-import com.google.android.setupcompat.template.FooterBarMixin;
-import com.google.android.setupcompat.template.FooterButton;
-import com.google.android.setupdesign.GlifLayout;
-import com.google.android.setupdesign.util.ThemeResolver;
+import com.android.setupwizardlib.util.WizardManagerHelper;
 
 /**
  * Activity that gives a user the choice to download the SIM app or defer until a later time
@@ -38,7 +35,7 @@ import com.google.android.setupdesign.util.ThemeResolver;
  * Can display the carrier app name if its passed into the intent with key
  * {@link #BUNDLE_KEY_CARRIER_NAME}
  */
-public class InstallCarrierAppActivity extends Activity {
+public class InstallCarrierAppActivity extends Activity implements View.OnClickListener {
     /**
      * Key for the carrier app name that will be displayed as the app to download.  If unset, a
      * default description will be used
@@ -53,33 +50,20 @@ public class InstallCarrierAppActivity extends Activity {
     protected void onCreate(Bundle icicle) {
         // Setup theme for aosp/pixel
         setTheme(
-                new ThemeResolver.Builder()
-                        .setDefaultTheme(R.style.SudThemeGlifV3_Light)
-                        .build()
-                        .resolve(SetupWizardProperties.theme().orElse(""),
-                                /* suppressDayNight= */ false));
+                WizardManagerHelper.getThemeRes(
+                        SetupWizardProperties.theme().orElse(""),
+                        R.style.SuwThemeGlif_Light
+                )
+        );
 
         super.onCreate(icicle);
         setContentView(R.layout.install_carrier_app_activity);
 
-        GlifLayout layout = findViewById(R.id.setup_wizard_layout);
-        FooterBarMixin mixin = layout.getMixin(FooterBarMixin.class);
-        mixin.setSecondaryButton(
-                new FooterButton.Builder(this)
-                        .setText(R.string.install_carrier_app_defer_action)
-                        .setListener(this::onSkipButtonClick)
-                        .setButtonType(FooterButton.ButtonType.SKIP)
-                        .setTheme(R.style.SudGlifButton_Secondary)
-                        .build());
-
-        mixin.setPrimaryButton(
-                new FooterButton.Builder(this)
-                        .setText(R.string.install_carrier_app_download_action)
-                        .setListener(this::onDownloadButtonClick)
-                        .setButtonType(FooterButton.ButtonType.OTHER)
-                        .setTheme(R.style.SudGlifButton_Primary)
-                        .build());
+        Button notNowButton = findViewById(R.id.skip_button);
+        notNowButton.setOnClickListener(this);
 
+        Button downloadButton = findViewById(R.id.download_button);
+        downloadButton.setOnClickListener(this);
 
         // Show/hide illo depending on whether one was provided in a resource overlay
         boolean showIllo = getResources().getBoolean(R.bool.show_sim_app_dialog_illo);
@@ -98,17 +82,15 @@ public class InstallCarrierAppActivity extends Activity {
     }
 
     @Override
-    protected void onApplyThemeResource(Resources.Theme theme, int resid, boolean first) {
-        theme.applyStyle(R.style.SetupWizardPartnerResource, true);
-        super.onApplyThemeResource(theme, resid, first);
-    }
-
-    protected void onSkipButtonClick(View view) {
-        finish(DEFER_RESULT);
-    }
-
-    protected void onDownloadButtonClick(View view) {
-        finish(DOWNLOAD_RESULT);
+    public void onClick(View v) {
+        switch (v.getId()) {
+            case R.id.skip_button:
+                finish(DEFER_RESULT);
+                break;
+            case R.id.download_button:
+                finish(DOWNLOAD_RESULT);
+                break;
+        }
     }
 
     private void finish(int resultCode) {