Merge "[Expressive UI] Add settings Theme to non SettingsActivity." into main (868f4f3b) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/network/telephony/SubscriptionActionDialogActivity.java

+6 −1

Original line number	Diff line number	Diff line
		@@ -25,6 +25,9 @@ import android.util.Log;

		import androidx.fragment.app.FragmentActivity;

		import com.android.settings.R;
		import com.android.settingslib.widget.SettingsThemeHelper;

		/** The base class for subscription action dialogs */
		public class SubscriptionActionDialogActivity extends FragmentActivity {

		@@ -42,7 +45,9 @@ public class SubscriptionActionDialogActivity extends FragmentActivity {
		@Override
		protected void onCreate(Bundle savedInstanceState) {
		super.onCreate(savedInstanceState);

		int themeId = SettingsThemeHelper.isExpressiveTheme(this)
		? R.style.Theme_SubSettings_Expressive : R.style.Theme_SubSettings;
		setTheme(themeId);
		mSubscriptionManager = getSystemService(SubscriptionManager.class)
		.createForAllUserProfiles();
		setProgressState(PROGRESS_IS_NOT_SHOWING);

+5 −0

Original line number	Diff line number	Diff line
		@@ -49,6 +49,7 @@ import com.android.settings.network.telephony.MobileNetworkUtils;
		import com.android.settings.network.telephony.SubscriptionActionDialogActivity;
		import com.android.settings.overlay.FeatureFactory;
		import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
		import com.android.settingslib.widget.SettingsThemeHelper;

		import java.util.List;

		@@ -89,6 +90,10 @@ public class SimDialogActivity extends FragmentActivity {
		finish();
		return;
		}
		int themeId = SettingsThemeHelper.isExpressiveTheme(this)
		? R.style.Theme_SubSettings_Expressive : R.style.Theme_SubSettings;
		setTheme(themeId);

		SimDialogProhibitService.supportDismiss(this);

		mMetricsFeatureProvider = FeatureFactory.getFeatureFactory().getMetricsFeatureProvider();