SetupWizard: Improve some of the transitions (59730c2e) · Commits · e / os / android_packages_apps_SetupWizard

res/values/styles.xml

+0 −3

Original line number	Diff line number	Diff line
		@@ -19,9 +19,6 @@
		<item name="android:windowActionBar">false</item>
		<item name="android:windowNoTitle">true</item>
		<item name="android:windowBackground">@color/primary</item>
		<item name="android:windowActivityTransitions">true</item>
		<item name="android:windowContentTransitions">true</item>
		<item name="android:windowExitTransition">@android:transition/explode</item>
		<item name="android:colorPrimary">@color/primary</item>
		<item name="android:colorPrimaryDark">@color/primary</item>
		<item name="android:colorAccent">@color/accent</item>

src/com/cyanogenmod/setupwizard/setup/ChooseDataSimPage.java

+7 −0

Original line number	Diff line number	Diff line
		@@ -161,12 +161,14 @@ public class ChooseDataSimPage extends SetupPage {

		@Override
		public void onSignalStrengthsChanged(SignalStrength signalStrength) {
		if (isDetached()) return;
		mSignalStrengths.put(subInfoRecord.slotId, signalStrength);
		updateSignalStrength(subInfoRecord);
		}

		@Override
		public void onServiceStateChanged(ServiceState state) {
		if (isDetached()) return;
		mServiceStates.put(subInfoRecord.slotId, state);
		updateSignalStrength(subInfoRecord);
		}
		@@ -174,12 +176,14 @@ public class ChooseDataSimPage extends SetupPage {
		}

		private void updateSignalStrengths() {
		if (isDetached()) return;
		for (int i = 0; i < mSubInfoRecords.size(); i++) {
		updateSignalStrength(mSubInfoRecords.get(i));
		}
		}

		private void setDataSubChecked(SubInfoRecord subInfoRecord) {
		if (isDetached()) return;
		for (int i = 0; i < mCheckBoxes.size(); i++) {
		mCheckBoxes.get(i).setChecked(subInfoRecord.slotId == i);

		@@ -187,6 +191,7 @@ public class ChooseDataSimPage extends SetupPage {
		}

		private void updateCurrentDataSub() {
		if (isDetached()) return;
		for (int i = 0; i < mSubInfoRecords.size(); i++) {
		SubInfoRecord subInfoRecord = mSubInfoRecords.get(i);
		mCheckBoxes.get(i).setChecked(SubscriptionManager.getDefaultDataSubId()
		@@ -196,6 +201,7 @@ public class ChooseDataSimPage extends SetupPage {
		}

		private void updateCarrierText(SubInfoRecord subInfoRecord) {
		if (isDetached()) return;
		String name = mPhone.getNetworkOperatorName(subInfoRecord.subId);
		ServiceState serviceState = mServiceStates.get(subInfoRecord.slotId);
		if (TextUtils.isEmpty(name)) {
		@@ -211,6 +217,7 @@ public class ChooseDataSimPage extends SetupPage {
		}

		private void updateSignalStrength(SubInfoRecord subInfoRecord) {
		if (isDetached()) return;
		ImageView signalView = mSignalViews.get(subInfoRecord.slotId);
		SignalStrength signalStrength = mSignalStrengths.get(subInfoRecord.slotId);
		if (!hasService(subInfoRecord)) {

src/com/cyanogenmod/setupwizard/setup/CyanogenServicesPage.java

+7 −1

Original line number	Diff line number	Diff line
		@@ -22,6 +22,7 @@ import android.accounts.AccountManagerFuture;
		import android.accounts.AuthenticatorException;
		import android.accounts.OperationCanceledException;
		import android.app.Activity;
		import android.app.ActivityOptions;
		import android.app.Fragment;
		import android.app.FragmentManager;
		import android.content.Context;
		@@ -299,8 +300,13 @@ public class CyanogenServicesPage extends SetupPage {
		Bundle result = future.getResult();
		Intent intent = result
		.getParcelable(AccountManager.KEY_INTENT);
		ActivityOptions options =
		ActivityOptions.makeCustomAnimation(activity,
		android.R.anim.fade_in,
		android.R.anim.fade_out);
		activity.startActivityForResult(intent,
		SetupWizardApp.REQUEST_CODE_SETUP_CYANOGEN);
		SetupWizardApp.REQUEST_CODE_SETUP_CYANOGEN,
		options.toBundle());
		} catch (OperationCanceledException e) {
		} catch (IOException e) {
		} catch (AuthenticatorException e) {

src/com/cyanogenmod/setupwizard/setup/GmsAccountPage.java

+6 −1

Original line number	Diff line number	Diff line
		@@ -22,6 +22,7 @@ import android.accounts.AccountManagerFuture;
		import android.accounts.AuthenticatorException;
		import android.accounts.OperationCanceledException;
		import android.app.Activity;
		import android.app.ActivityOptions;
		import android.app.Fragment;
		import android.app.FragmentManager;
		import android.content.Context;
		@@ -109,8 +110,12 @@ public class GmsAccountPage extends SetupPage {
		Bundle result = future.getResult();
		Intent intent = result
		.getParcelable(AccountManager.KEY_INTENT);
		ActivityOptions options =
		ActivityOptions.makeCustomAnimation(activity,
		android.R.anim.fade_in,
		android.R.anim.fade_out);
		activity.startActivityForResult(intent,
		SetupWizardApp.REQUEST_CODE_SETUP_GMS);
		SetupWizardApp.REQUEST_CODE_SETUP_GMS, options.toBundle());
		} catch (OperationCanceledException e) {
		} catch (IOException e) {
		} catch (AuthenticatorException e) {

src/com/cyanogenmod/setupwizard/ui/SetupWizardActivity.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -55,6 +55,7 @@ public class SetupWizardActivity extends Activity implements SetupDataCallbacks
		public void onCreate(Bundle savedInstanceState) {
		super.onCreate(savedInstanceState);
		setContentView(R.layout.setup_main);
		getWindow().setWindowAnimations(android.R.anim.fade_in);
		mRootView = findViewById(R.id.root);
		((SetupWizardApp)getApplicationContext()).disableStatusBar();
		mSetupData = (AbstractSetupData)getLastNonConfigurationInstance();