diff options
| -rw-r--r-- | res/layout-land/fingerprint_enroll_finish.xml | 11 | ||||
| -rw-r--r-- | res/layout/fingerprint_enroll_finish_base.xml | 11 | ||||
| -rw-r--r-- | res/values/strings.xml | 4 | ||||
| -rw-r--r-- | src/com/android/settings/fingerprint/SetupFingerprintEnrollFinish.java | 7 |
4 files changed, 33 insertions, 0 deletions
diff --git a/res/layout-land/fingerprint_enroll_finish.xml b/res/layout-land/fingerprint_enroll_finish.xml index f1bf885..e051f15 100644 --- a/res/layout-land/fingerprint_enroll_finish.xml +++ b/res/layout-land/fingerprint_enroll_finish.xml @@ -39,11 +39,22 @@ android:orientation="vertical"> <TextView + android:id="@+id/message" style="@style/TextAppearance.FingerprintMessage" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/security_settings_fingerprint_enroll_finish_message"/> + <TextView + android:id="@+id/message_secondary" + style="@style/TextAppearance.FingerprintMessage" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/suw_description_margin_top" + android:text="@string/setup_fingerprint_enroll_finish_message_secondary" + android:textColor="?android:attr/textColorSecondary" + android:visibility="gone" /> + <LinearLayout android:layout_width="wrap_content" android:layout_height="wrap_content" diff --git a/res/layout/fingerprint_enroll_finish_base.xml b/res/layout/fingerprint_enroll_finish_base.xml index 3ca5dfc..03447b3 100644 --- a/res/layout/fingerprint_enroll_finish_base.xml +++ b/res/layout/fingerprint_enroll_finish_base.xml @@ -31,12 +31,23 @@ android:clipChildren="false"> <TextView + android:id="@+id/message" style="@style/TextAppearance.FingerprintMessage" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="@dimen/suw_description_margin_top" android:text="@string/security_settings_fingerprint_enroll_finish_message"/> + <TextView + android:id="@+id/message_secondary" + style="@style/TextAppearance.FingerprintMessage" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/suw_description_margin_top" + android:text="@string/setup_fingerprint_enroll_finish_message_secondary" + android:textColor="?android:attr/textColorSecondary" + android:visibility="gone" /> + <View android:layout_height="0dp" android:layout_width="match_parent" diff --git a/res/values/strings.xml b/res/values/strings.xml index a90a880..1ebe2d7 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -755,6 +755,10 @@ <string name="security_settings_fingerprint_enroll_finish_title">Fingerprint added!</string> <!-- Message shown in fingerprint enrollment dialog once enrollment is completed --> <string name="security_settings_fingerprint_enroll_finish_message">Whenever you see this icon, you can use your fingerprint for identification or to authorize a purchase.</string> + <!-- Message shown when fingerprint enrollment is completed during setup wizard [CHAR LIMIT=NONE] --> + <string name="setup_fingerprint_enroll_finish_message">Just touch the fingerprint sensor to wake and unlock your device.</string> + <!-- Message shown when fingerprint enrollment is completed, telling user about the fingerprint icon that will be shown whenever they can use their fingerprint [CHAR LIMIT=NONE] --> + <string name="setup_fingerprint_enroll_finish_message_secondary">When you see this icon, you can use your fingerprint.</string> <!-- Button text to setup screen lock in onboard dialog [CHAR LIMIT=34] --> <string name="security_settings_fingerprint_enroll_setup_screen_lock">Set up screen lock</string> <!-- Button text to exit fingerprint wizard after everything is done [CHAR LIMIT=15] --> diff --git a/src/com/android/settings/fingerprint/SetupFingerprintEnrollFinish.java b/src/com/android/settings/fingerprint/SetupFingerprintEnrollFinish.java index 10dfe13..351cd57 100644 --- a/src/com/android/settings/fingerprint/SetupFingerprintEnrollFinish.java +++ b/src/com/android/settings/fingerprint/SetupFingerprintEnrollFinish.java @@ -20,6 +20,7 @@ import android.content.Intent; import android.content.res.Resources; import android.view.View; import android.widget.Button; +import android.widget.TextView; import com.android.settings.ChooseLockSettingsHelper; import com.android.settings.R; @@ -55,6 +56,12 @@ public class SetupFingerprintEnrollFinish extends FingerprintEnrollFinish final NavigationBar navigationBar = getNavigationBar(); navigationBar.setNavigationBarListener(this); navigationBar.getBackButton().setVisibility(View.GONE); + + final TextView message = (TextView) findViewById(R.id.message); + message.setText(R.string.setup_fingerprint_enroll_finish_message); + + final TextView secondaryMessage = (TextView) findViewById(R.id.message_secondary); + secondaryMessage.setVisibility(View.VISIBLE); } @Override |