PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes showing learn more screen from fingerprint intro page

Browse Source 
bug:27063484
Change-Id: I2413ddff4953dc171aabbb0e9a6beb2f8d04552f
This commit is contained in:
Udam Saini
2016-02-10 11:22:32 -08:00
parent 335a958b57
commit f21335c6f0
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/values/themes.xml
View File

@@ -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>

5
src/com/android/settings/fingerprint/FingerprintEnrollIntroduction.java
View File

@@ -53,6 +53,7 @@ public class FingerprintEnrollIntroduction extends FingerprintEnrollBase
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 @@ public class FingerprintEnrollIntroduction extends FingerprintEnrollBase
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());