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

Commit a3b210f6 authored by d34d's avatar d34d
Browse files

Show "Lock screen & fingerprint" when supported 

The dashboard should show "Lock screen & fingerprint" for devices
that support this feature.

Change-Id: I90556a08d8540766116f4f7974fe4b26468d6c54
REF: CYNGNOS-706
parent c94dfbb9

res/values/cm_strings.xml

+3 −0
Original line number Diff line number Diff line
@@ -1331,6 +1331,9 @@ 
    <string name="fingerprint_enrollment_error_title_3">Hmm, something went wrong</string>

    <string name="fingerprint_enrollment_error_title_4">Uh oh, try again</string>

    <string name="fingerprint_enrollment_error_title_5">Whoops, there was an error</string>

    <!-- Title for lockscreen settings, on dashboard, that is only used when a device supports

         the fingerprint feature -->

    <string name="lockscreen_settings_and_fingerprint">Lock screen &amp; fingerprint</string>



    <!-- Menu label for reset the battery stats -->

    <string name="menu_stats_reset">Reset stats</string>

src/com/android/settings/SettingsActivity.java

+13 −0
Original line number Diff line number Diff line
@@ -71,6 +71,7 @@ import android.widget.SearchView; 


import com.android.internal.util.ArrayUtils;

import com.android.internal.util.XmlUtils;

import com.android.internal.widget.LockPatternUtils;

import com.android.settings.accessibility.AccessibilitySettings;

import com.android.settings.accessibility.CaptionPropertiesFragment;

import com.android.settings.accounts.AccountSettings;
@@ -1097,6 +1098,18 @@ public class SettingsActivity extends Activity 
                                    com.android.internal.R.styleable.PreferenceHeader_title);

                            if (tv != null && tv.type == TypedValue.TYPE_STRING) {

                                if (tv.resourceId != 0) {

                                    // Need to adjust the title for lockscreen settings if the

                                    // device supports the fingerprint feature

                                    if (tile.id == R.id.lockscreen_settings) {

                                        boolean isPrimary =

                                                UserHandle.myUserId() == UserHandle.USER_OWNER;

                                        boolean hasFingerprint = new LockPatternUtils(this)

                                                .isFingerprintInstalled(this);

                                        if (isPrimary && hasFingerprint) {

                                            tv.resourceId =

                                                    R.string.lockscreen_settings_and_fingerprint;

                                        }

                                    }

                                    tile.titleRes = tv.resourceId;

                                } else {

                                    tile.title = tv.string;