Add create account functionality (85af0f2b) · Commits · e / os / android_packages_apps_SetupWizard

res/layout/setup_e_account_manager.xml

+26 −1

Original line number	Diff line number	Diff line
		@@ -47,6 +47,31 @@
		style="@style/SudItemTitle.GlifDescription"
		android:text="@string/e_account_manager_setup_summary" />

		<Button
		android:id="@+id/create_account"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:text="@string/create_account"
		android:textSize="14sp"
		android:textAllCaps="true"
		android:layout_marginEnd="16dp"
		android:layout_marginStart="16dp"
		android:layout_marginTop="80dp"
		style="@style/SudGlifButton.Primary" />

		<Button
		android:id="@+id/sign_in"
		android:text="@string/sign_in"
		android:textSize="14sp"
		android:textAllCaps="true"
		android:layout_gravity="center"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_marginTop="8dp"
		style="@style/SudGlifButton.Secondary" />



		</LinearLayout>
		</ScrollView>
		</FrameLayout>
		@@ -55,7 +80,7 @@
		android:id="@+id/navigation_bar"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		app:showSkipButton="true" />
		app:showSkipButton="false" />

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

+3 −0

Original line number	Diff line number	Diff line
		@@ -121,4 +121,7 @@
		<string name="e_account_manager_setup_title">Sync your cloud account</string>
		<string name="e_account_manager_setup_summary">Log in with your e.email or murena.io ID to connect your personal account with this phone. This will enable to synchronize your emails, contacts, calendar events, pictures, videos, notes and tasks across this phone and your personal cloud.</string>
		<string name="e_account_manager_setup_configure">Log in</string>

		<string name="create_account">Create Account</string>
		<string name="sign_in">Sign in</string>
		</resources>

+22 −6

Original line number	Diff line number	Diff line
		@@ -24,6 +24,7 @@ import android.accounts.AccountManager;
		import android.content.Intent;
		import android.provider.Settings;
		import android.util.Log;
		import android.view.View;

		import org.lineageos.setupwizard.util.SetupWizardUtils;

		@@ -33,8 +34,28 @@ public class EAccountManagerActivity extends SubBaseActivity {

		@Override
		protected void onStartSubactivity() {
		setNextText(R.string.e_account_manager_setup_configure);
		setNextAllowed(true);
		findViewById(R.id.sign_in).setOnClickListener(new View.OnClickListener() {
		@Override
		public void onClick(View view) {
		launchAccountManagerSetup();
		}
		});
		findViewById(R.id.create_account).setOnClickListener(new View.OnClickListener() {
		@Override
		public void onClick(View view) {
		Intent intent = new Intent(SetupWizardApp.ACTION_CREATE_E_ACCOUNT);
		startActivityForResult(intent, SetupWizardApp.REQUEST_CODE_CREATE_E_ACCOUNT);
		}
		});
		}

		@Override
		protected void onActivityResult(int requestCode, int resultCode, Intent data) {
		super.onActivityResult(requestCode, resultCode, data);
		if(resultCode == RESULT_OK) {
		onNavigateNext();
		}
		}

		@Override
		@@ -48,11 +69,6 @@ public class EAccountManagerActivity extends SubBaseActivity {
		}
		}

		@Override
		protected void onNextPressed() {
		launchAccountManagerSetup();
		}

		@Override
		protected int getLayoutResId() {
		return R.layout.setup_e_account_manager;

+2 −0

Original line number	Diff line number	Diff line
		@@ -46,6 +46,7 @@ public class SetupWizardApp extends Application {
		public static final String ACTION_EMERGENCY_DIAL = "com.android.phone.EmergencyDialer.DIAL";
		public static final String ACTION_NEXT = "com.android.wizard.NEXT";
		public static final String ACTION_LOAD = "com.android.wizard.LOAD";
		public static final String ACTION_CREATE_E_ACCOUNT = "foundation.e.accountmanager.ui.setup.CreateAccountActivity";

		public static final String EXTRA_HAS_MULTIPLE_USERS = "hasMultipleUsers";
		public static final String EXTRA_TITLE = "title";
		@@ -75,6 +76,7 @@ public class SetupWizardApp extends Application {
		public static final int REQUEST_CODE_SETUP_LOCKSCREEN = 9;
		public static final int REQUEST_CODE_RESTORE = 10;
		public static final int REQUEST_CODE_SETUP_ACCOUNT_TYPE_E = 11;
		public static final int REQUEST_CODE_CREATE_E_ACCOUNT = 1;

		public static final int RADIO_READY_TIMEOUT = 10 * 1000;