commit f21335c6f06f5972d74e2766267db309117c2cae
author Udam Saini <udam@google.com> Wed Feb 10 11:22:32 2016 -0800
committer Udam Saini <udam@google.com> Wed Feb 10 12:04:50 2016 -0800
tree 5acbdd9dc6f171ef1c11748f3d5a8cc660f6c842
parent 335a958b57045c90baad25f186a0a27f16dfa9bc

Fixes showing learn more screen from fingerprint intro page

bug:27063484
Change-Id: I2413ddff4953dc171aabbb0e9a6beb2f8d04552f

res/values/themes.xml

diff --git a/res/values/themes.xml b/res/values/themes.xml
index 5bab837..30c372b 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -35,6 +35,7 @@
     <style name="SetupWizardTheme" parent="SuwThemeMaterial">
         <!-- For all Alert Dialogs -->
         <item name="android:alertDialogTheme">@style/ThemeOverlay.AlertDialog</item>
+        <item name="android:colorPrimary">@color/suw_color_accent_dark</item>
         <item name="android:listPreferredItemPaddingEnd">@dimen/suw_layout_margin_sides</item>
         <item name="android:listPreferredItemPaddingStart">@dimen/suw_layout_margin_sides</item>
         <item name="android:windowBackground">?android:attr/colorBackground</item>
@@ -61,6 +62,7 @@
     <style name="SetupWizardTheme.Light" parent="SuwThemeMaterial.Light">
         <!-- For all Alert Dialogs -->
         <item name="android:alertDialogTheme">@style/ThemeOverlay.AlertDialog</item>
+        <item name="android:colorPrimary">@color/suw_color_accent_light</item>
         <item name="android:listPreferredItemPaddingEnd">@dimen/suw_layout_margin_sides</item>
         <item name="android:listPreferredItemPaddingStart">@dimen/suw_layout_margin_sides</item>
         <item name="android:windowBackground">?android:attr/colorBackground</item>

src/com/android/settings/fingerprint/FingerprintEnrollIntroduction.java

diff --git a/src/com/android/settings/fingerprint/FingerprintEnrollIntroduction.java b/src/com/android/settings/fingerprint/FingerprintEnrollIntroduction.java
index 7144745..bedeb30 100644
--- a/src/com/android/settings/fingerprint/FingerprintEnrollIntroduction.java
+++ b/src/com/android/settings/fingerprint/FingerprintEnrollIntroduction.java
@@ -53,6 +53,7 @@
 
     protected static final int CHOOSE_LOCK_GENERIC_REQUEST = 1;
     protected static final int FINGERPRINT_FIND_SENSOR_REQUEST = 2;
+    protected static final int LEARN_MORE_REQUEST = 3;
 
     private boolean mHasPassword;
 
@@ -182,7 +183,9 @@
             Context ctx = widget.getContext();
             Intent intent = HelpUtils.getHelpIntent(ctx, getURL(), ctx.getClass().getName());
             try {
-                ((Activity) ctx).startActivity(intent);
+                // This needs to be startActivityForResult even though we do not care about the
+                // actual result because the help app needs to know about who invoked it.
+                widget.startActivityForResult(intent, LEARN_MORE_REQUEST);
             } catch (ActivityNotFoundException e) {
                 Log.w(LearnMoreSpan.TAG,
                         "Actvity was not found for intent, " + intent.toString());