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

Commit 9d5c050c authored by Jason Monk's avatar Jason Monk
Browse files

Add additional fingerprints suggestion 

Change-Id: Id18f3e9fffb1f9e964edb635689d3c7d410034fa
parent d3ac239e

AndroidManifest.xml

+16 −0
Original line number Diff line number Diff line
@@ -1539,6 +1539,22 @@ 
            android:windowSoftInputMode="stateHidden|adjustResize"

            android:theme="@style/Theme.ConfirmDeviceCredentials"/>



        <activity

            android:name=".Settings$FingerprintSuggestionActivity"

            android:label="@string/security_settings_fingerprint_preference_title"

            android:icon="@drawable/ic_fingerprint">

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

                <category android:name="com.android.settings.suggested.category.SETTINGS_ONLY" />

            </intent-filter>

            <meta-data android:name="com.android.settings.dismiss"

                android:value="10,30" />

            <meta-data android:name="com.android.settings.require_feature"

                android:value="android.hardware.fingerprint" />

            <meta-data android:name="com.android.settings.title"

                android:resource="@string/suggestion_additional_fingerprints" />

        </activity>



        <activity android:name=".fingerprint.FingerprintSettings" android:exported="false"/>

        <activity android:name=".fingerprint.FingerprintEnrollFindSensor" android:exported="false"/>

        <activity android:name=".fingerprint.FingerprintEnrollEnrolling" android:exported="false"/>

res/values/strings.xml

+3 −0
Original line number Diff line number Diff line
@@ -7011,4 +7011,7 @@ 
    <!-- No default home set summary [CHAR LIMIT=NONE] -->

    <string name="no_default_home">No default Home</string>









    <!-- Title for suggestion adding more fingerprints [CHAR LIMIT=30] -->









    <string name="suggestion_additional_fingerprints">Additional Fingerprints</string>

















</resources>

























src/com/android/settings/Settings.java



+4
−2






























Original line number
Diff line number
Diff line







@@ -17,6 +17,7 @@







package com.android.settings;



















import com.android.settings.applications.AppOpsSummary;









import com.android.settings.fingerprint.FingerprintSettings;



















/**









 * Top-level Settings activity








@@ -103,7 +104,6 @@ public class Settings extends SettingsActivity {







    public static class ZenModeSettingsActivity extends SettingsActivity { /* empty */ }









    public static class ZenModePrioritySettingsActivity extends SettingsActivity { /* empty */ }









    public static class ZenModeAutomationSettingsActivity extends SettingsActivity { /* empty */ }









    public static class ZenModeAutomationSuggestionActivity extends SettingsActivity { /* empty */ }









    public static class ZenModeScheduleRuleSettingsActivity extends SettingsActivity { /* empty */ }









    public static class ZenModeEventRuleSettingsActivity extends SettingsActivity { /* empty */ }









    public static class ZenModeExternalRuleSettingsActivity extends SettingsActivity { /* empty */ }








@@ -118,7 +118,6 @@ public class Settings extends SettingsActivity {







    public static class TopLevelSettings extends SettingsActivity { /* empty */ }









    public static class ApnSettingsActivity extends SettingsActivity { /* empty */ }









    public static class WifiCallingSettingsActivity extends SettingsActivity { /* empty */ }









    public static class WifiCallingSuggestionActivity extends SettingsActivity { /* empty */ }









    public static class MemorySettingsActivity extends SettingsActivity { /* empty */ }









    public static class OverlaySettingsActivity extends SettingsActivity { /* empty */ }









    public static class WriteSettingsActivity extends SettingsActivity { /* empty */ }








@@ -126,7 +125,10 @@ public class Settings extends SettingsActivity {







    public static class AppWriteSettingsActivity extends SettingsActivity { /* empty */ }









    public static class ManageDefaultAppsActivity extends SettingsActivity { /* empty */ }



















    public static class WifiCallingSuggestionActivity extends SettingsActivity { /* empty */ }









    public static class ZenModeAutomationSuggestionActivity extends SettingsActivity { /* empty */ }









    public static class WallpaperSuggestionActivity extends SettingsActivity { /* empty */ }









    public static class FingerprintSuggestionActivity extends FingerprintSettings { /* empty */ }



















    // Categories.









    public static class WirelessSettings extends SettingsActivity { /* empty */ }
































src/com/android/settings/dashboard/SuggestionsChecks.java



+9
−0






























Original line number
Diff line number
Diff line







@@ -20,11 +20,13 @@ import android.app.IWallpaperManager.Stub;







import android.app.IWallpaperManagerCallback;









import android.app.NotificationManager;









import android.content.Context;









import android.hardware.fingerprint.FingerprintManager;









import android.os.Bundle;









import android.os.IBinder;









import android.os.RemoteException;









import android.os.ServiceManager;









import com.android.ims.ImsManager;









import com.android.settings.Settings.FingerprintSuggestionActivity;









import com.android.settings.Settings.WallpaperSuggestionActivity;









import com.android.settings.Settings.WifiCallingSuggestionActivity;









import com.android.settings.Settings.ZenModeAutomationSuggestionActivity;








@@ -51,10 +53,17 @@ public class SuggestionsChecks {







            return hasWallpaperSet();









        } else if (className.equals(WifiCallingSuggestionActivity.class.getName())) {









            return isWifiCallingUnavailableOrEnabled();









        } else if (className.equals(FingerprintSuggestionActivity.class.getName())) {









            return isNotSingleFingerprintEnrolled();









        }









        return false;









    }



















    private boolean isNotSingleFingerprintEnrolled() {









        FingerprintManager manager = mContext.getSystemService(FingerprintManager.class);









        return manager == null || manager.getEnrolledFingerprints().size() != 1;









    }



















    public boolean isWifiCallingUnavailableOrEnabled() {









        if (!ImsManager.isWfcEnabledByPlatform(mContext)) {









            return true;