Merge "Revert "Change to use setupdesign library"" (b97e88e1) · Commits · e / os / android_frameworks_base

packages/SimAppDialog/Android.bp

+1 −2

Original line number	Diff line number	Diff line
		@@ -7,8 +7,7 @@ android_app {

		static_libs: [
		"androidx.legacy_legacy-support-v4",
		"setupcompat",
		"setupdesign",
		"setup-wizard-lib",
		],

		resource_dirs: ["res"],

packages/SimAppDialog/AndroidManifest.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -23,7 +23,7 @@
		android:name=".InstallCarrierAppActivity"
		android:exported="true"
		android:permission="android.permission.NETWORK_SETTINGS"
		android:theme="@style/SudThemeGlif.Light">
		android:theme="@style/SuwThemeGlif.Light">
		</activity>
		</application>
		</manifest>

packages/SimAppDialog/res/layout/install_carrier_app_activity.xml

+10 −9

Original line number	Diff line number	Diff line
		@@ -14,17 +14,18 @@
		See the License for the specific language governing permissions and
		limitations under the License.
		-->
		<com.google.android.setupdesign.GlifLayout
		<com.android.setupwizardlib.GlifLayout
		xmlns:android="http://schemas.android.com/apk/res/android"
		xmlns:app="http://schemas.android.com/apk/res-auto"
		android:id="@+id/setup_wizard_layout"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:icon="@drawable/ic_signal_cellular_alt_rounded"
		app:sucHeaderText="@string/install_carrier_app_title">
		app:suwHeaderText="@string/install_carrier_app_title"
		app:suwFooter="@layout/install_carrier_app_footer">

		<LinearLayout
		style="@style/SudContentFrame"
		style="@style/SuwContentFrame"
		android:id="@+id/content_frame"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		@@ -32,12 +33,12 @@

		<TextView
		android:id="@+id/install_carrier_app_description"
		style="@style/SudDescription.Glif"
		style="@style/SuwDescription.Glif"
		android:text="@string/install_carrier_app_description_default"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"/>

		<com.google.android.setupdesign.view.FillContentLayout
		<com.android.setupwizardlib.view.FillContentLayout
		android:id="@+id/illo_container"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		@@ -46,12 +47,12 @@

		<ImageView
		android:src="@drawable/illo_sim_app_dialog"
		style="@style/SudContentIllustration"
		style="@style/SuwContentIllustration"
		android:contentDescription="@string/install_carrier_app_image_content_description"
		android:layout_width="match_parent"
		android:layout_height="match_parent"/>

		</com.google.android.setupdesign.view.FillContentLayout>
		</com.android.setupwizardlib.view.FillContentLayout>
		</LinearLayout>

		</com.google.android.setupdesign.GlifLayout>
		</com.android.setupwizardlib.GlifLayout>

packages/SimAppDialog/res/values/styles.xml→packages/SimAppDialog/res/layout/install_carrier_app_footer.xml

+43 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		Copyright (C) 2020 The Android Open Source Project
		Copyright (C) 2018 The Android Open Source Project

		Licensed under the Apache License, Version 2.0 (the "License");
		you may not use this file except in compliance with the License.
		@@ -14,13 +14,30 @@
		See the License for the specific language governing permissions and
		limitations under the License.
		-->
		<resources>

		<style name="SetupWizardPartnerResource">
		<!-- Disable to use partner overlay theme for outside setupwizard flow. -->
		<item name="sucUsePartnerResource">false</item>
		<!-- Enable heavy theme style inside setupwizard flow. -->
		<item name="sudUsePartnerHeavyTheme">true</item>
		</style>
		<com.android.setupwizardlib.view.ButtonBarLayout
		xmlns:android="http://schemas.android.com/apk/res/android"
		android:id="@+id/footer"
		style="@style/SuwGlifButtonBar.Stackable"
		android:layout_width="match_parent"
		android:layout_height="wrap_content">

		</resources>
		<Button
		android:id="@+id/skip_button"
		style="@style/SuwGlifButton.Secondary"
		android:text="@string/install_carrier_app_defer_action"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"/>

		<Space
		android:layout_width="0dp"
		android:layout_height="0dp"
		android:layout_weight="1"/>

		<Button
		android:id="@+id/download_button"
		style="@style/SuwGlifButton.Primary"
		android:text="@string/install_carrier_app_download_action"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"/>
		</com.android.setupwizardlib.view.ButtonBarLayout>

packages/SimAppDialog/src/com/android/simappdialog/InstallCarrierAppActivity.java

+21 −39

Original line number	Diff line number	Diff line
		@@ -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) {
		public void onClick(View v) {
		switch (v.getId()) {
		case R.id.skip_button:
		finish(DEFER_RESULT);
		}

		protected void onDownloadButtonClick(View view) {
		break;
		case R.id.download_button:
		finish(DOWNLOAD_RESULT);
		break;
		}
		}

		private void finish(int resultCode) {