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

Commit 82988b48 authored by rich cannings's avatar rich cannings Committed by Android (Google) Code Review
Browse files

Merge "Add Help lin to Settings > Security" into jb-mr1-dev

parents 2485d9fc 93c0ee52

res/values/strings.xml

+2 −0
Original line number Original line Diff line number Diff line
@@ -4384,6 +4384,8 @@ 
    <string name="help_url_users" translatable="false"></string>

    <string name="help_url_users" translatable="false"></string>

    <!-- Help URL, Location access [DO NOT TRANSLATE] -->

    <!-- Help URL, Location access [DO NOT TRANSLATE] -->

    <string name="help_url_location_access" translatable="false"></string>

    <string name="help_url_location_access" translatable="false"></string>

    <!-- Help URL, Security settings [DO NOT TRANSLATE] -->

    <string name="help_url_security" translatable="false"></string>





    <!-- User account title [CHAR LIMIT=30] -->

    <!-- User account title [CHAR LIMIT=30] -->

    <string name="user_account_title">Account for content</string>

    <string name="user_account_title">Account for content</string>

src/com/android/settings/SecuritySettings.java

+5 −0
Original line number Original line Diff line number Diff line
@@ -727,6 +727,11 @@ public class SecuritySettings extends SettingsPreferenceFragment 
        return true;

        return true;

    }

    }





    @Override

    protected int getHelpResource() {

        return R.string.help_url_security;

    }



    public void startBiometricWeakImprove(){

    public void startBiometricWeakImprove(){

        Intent intent = new Intent();

        Intent intent = new Intent();

        intent.setClassName("com.android.facelock", "com.android.facelock.AddToSetup");

        intent.setClassName("com.android.facelock", "com.android.facelock.AddToSetup");

src/com/android/settings/Settings.java

+2 −1
Original line number Original line Diff line number Diff line
@@ -364,7 +364,8 @@ public class Settings extends PreferenceActivity 
                SoundSettings.class.getName().equals(fragmentName) ||

                SoundSettings.class.getName().equals(fragmentName) ||

                PrivacySettings.class.getName().equals(fragmentName) ||

                PrivacySettings.class.getName().equals(fragmentName) ||

                ManageAccountsSettings.class.getName().equals(fragmentName) ||

                ManageAccountsSettings.class.getName().equals(fragmentName) ||

                VpnSettings.class.getName().equals(fragmentName)) {

                VpnSettings.class.getName().equals(fragmentName) ||

                SecuritySettings.class.getName().equals(fragmentName)) {

            intent.putExtra(EXTRA_CLEAR_UI_OPTIONS, true);

            intent.putExtra(EXTRA_CLEAR_UI_OPTIONS, true);

        }

        }