Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4b796fa7 authored by Udam Saini's avatar Udam Saini Committed by Android (Google) Code Review
Browse files

Merge "Fixes showing learn more screen from fingerprint intro page" into nyc-dev

parents 1c9b3d5b f21335c6

res/values/themes.xml

+2 −0
Original line number Diff line number Diff line
@@ -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

+4 −1
Original line number Diff line number Diff line
@@ -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());