Add SetupManageFingerprints to setup wizard flow (8133bc0e) · Commits · e / os / android_packages_apps_Settings

AndroidManifest.xml

+6 −0

Original line number	Diff line number	Diff line
		@@ -1256,6 +1256,12 @@
		</intent-filter>
		</activity>

		<activity android:name="SetupManageFingerprints"
		android:exported="false"
		android:screenOrientation="portrait"
		android:taskAffinity="com.android.wizard"
		android:theme="@style/SetupWizardDisableAppStartingTheme" />

		<activity android:name="SetupChooseLockPassword"
		android:exported="false"
		android:screenOrientation="portrait"

+22 −1

Original line number	Diff line number	Diff line
		@@ -19,6 +19,26 @@
		android:layout_height="match_parent"
		android:orientation="vertical" >

		<com.android.settings.widget.SetupWizardIllustration
		android:id="@+id/setup_illustration"
		android:layout_width="match_parent"
		android:layout_height="80dp"
		android:elevation="@dimen/setup_wizard_title_area_elevation"
		android:background="@drawable/setup_illustration_bg"
		android:foreground="@drawable/setup_illustration_lock_screen_condensed"
		android:tag="stickyContainer">

		<TextView
		android:id="@+id/title"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:tag="sticky"
		android:layout_gravity="bottom"
		android:text="@string/fingerprint_item_add_new_fingerprint"
		style="@style/SetupTitleManageFingerprints"/>

		</com.android.settings.widget.SetupWizardIllustration>

		<TextView
		android:id="@+id/manage_fingerprints"
		android:layout_width="match_parent"
		@@ -31,7 +51,8 @@
		<ListView
		android:id="@+id/list"
		android:layout_width="match_parent"
		android:layout_height="wrap_content" />
		android:layout_height="0dp"
		android:layout_weight="1" />

		<fragment android:name="com.android.setupwizard.navigationbar.SetupWizardNavBar"
		android:id="@+id/navigation_bar"

+8 −0

Original line number	Diff line number	Diff line
		@@ -27,4 +27,12 @@
		<item name="android:textSize">20sp</item>
		</style>

		<style name="SetupTitleManageFingerprints" parent="@style/SetupTitle">
		<item name="android:layout_marginBottom">0dp</item>
		<item name="android:layout_marginStart">16dp</item>
		<item name="android:paddingBottom">16dp</item>
		<item name="android:paddingTop">0dp</item>
		<item name="android:textSize">20sp</item>
		</style>

		</resources>
		No newline at end of file

+19 −0

Original line number	Diff line number	Diff line
		@@ -19,4 +19,23 @@
		<item name="android:colorControlActivated">@color/fingerprint_enrollment_color_control_activated</item>
		<item name="android:statusBarColor">@color/setup_wizard_header_background_color</item>
		</style>

		<style name="SetupWizardThemeFingerprint"
		parent="android:Theme.Material.Light.NoActionBar">
		<item name="android:colorAccent">@color/setup_wizard_color_accent_light</item>
		<item name="android:listPreferredItemPaddingEnd">@dimen/setup_wizard_margin_sides</item>
		<item name="android:listPreferredItemPaddingStart">@dimen/setup_wizard_margin_sides</item>
		<item name="android:windowAnimationStyle">@style/Animation.SetupWizard</item>
		<item name="android:windowBackground">?android:attr/colorBackground</item>
		<item name="android:windowSoftInputMode">adjustPan</item>
		<item name="@android:preferencePanelStyle">@android:style/PreferencePanel.Dialog</item>
		<item name="ic_menu_add">@drawable/ic_menu_add_light</item>
		<item name="ic_menu_moreoverflow">@*android:drawable/ic_menu_moreoverflow_material</item>
		<item name="ic_wps">@drawable/ic_wps_light</item>
		<item name="setup_divider_color">@color/setup_divider_color_light</item>
		<item name="side_margin">0dip</item>
		<item name="wifi_signal_color">@color/setup_wizard_wifi_color_light</item>
		<item name="wifi_signal">@drawable/wifi_signal_teal</item>
		<item name="preferenceBackgroundColor">?android:attr/colorBackground</item>
		</style>
		</resources>
		No newline at end of file

+10 −2

Original line number	Diff line number	Diff line
		@@ -181,7 +181,7 @@ public class ManageFingerprints extends SettingsActivity {
		@Override
		public View onCreateView(LayoutInflater inflater, ViewGroup container,
		Bundle savedInstanceState) {
		View v = inflater.inflate(R.layout.fingerprint_list, container, false);
		View v = inflater.inflate(getLayoutResource(), container, false);
		mFingerList = (ListView) v.findViewById(R.id.list);
		mAdapter = new FingerprintAdapter(getActivity());
		mFingerList.setAdapter(mAdapter);
		@@ -209,13 +209,21 @@ public class ManageFingerprints extends SettingsActivity {
		super.onDestroy();
		}

		protected int getLayoutResource() {
		return R.layout.fingerprint_list;
		}

		protected Intent getEnrollmentIntent() {
		return EnrollFingerprint.createIntent(getActivity());
		}

		private void addFinger() {
		// Check if we can actually add more fingerprints
		if (mAdapter.getCount() - 1 == MAX_NUM_FINGERPRINTS) {
		DialogFragment dialogFragment = MaxNumFingerprintsDialog.newInstance();
		dialogFragment.show(getChildFragmentManager(), "MaxFingers");
		} else {
		Intent intent = EnrollFingerprint.createIntent(getActivity());
		Intent intent = getEnrollmentIntent();
		startActivity(intent);
		}
		}