commit 5590e2eb44bc8a301c8f4647b739d6788e9c1512
author Sudheer Shanka <sudheersai@google.com> Fri Jan 22 20:40:56 2016 +0000
committer Sudheer Shanka <sudheersai@google.com> Mon Jan 25 15:12:07 2016 +0000
tree 217276b51f8718e9fcbd1106e195b9d5e7b6aa30
parent a16852480f5054923c8181a670bba1c4539b5063

Update the text shown when admin disabled fingerprint as unlock option.

When the admin has disabled fingerprint as unlock option, we let the
user know that the admin has disabled that option with a more details
link which will trigger the admin support dialog. And made some small
fixes apart from this.

Change-Id: I01021b952dc6fb29a65d37401a6411a6088d5cef

src/com/android/settings/SettingsPreferenceFragment.java

diff --git a/src/com/android/settings/SettingsPreferenceFragment.java b/src/com/android/settings/SettingsPreferenceFragment.java
index 4f81a38..c1e8d35 100644
--- a/src/com/android/settings/SettingsPreferenceFragment.java
+++ b/src/com/android/settings/SettingsPreferenceFragment.java
@@ -62,6 +62,9 @@
 
     private String mHelpUri;
 
+    private static final int ORDER_FIRST = -1;
+    private static final int ORDER_LAST = Integer.MAX_VALUE -1;
+
     // Cache the content resolver for async callbacks
     private ContentResolver mContentResolver;
 
@@ -235,7 +238,7 @@
 
     protected void setHeaderView(int resource) {
         mHeader = new LayoutPreference(getPrefContext(), resource);
-        mHeader.setOrder(-1);
+        mHeader.setOrder(ORDER_FIRST);
         if (getPreferenceScreen() != null) {
             getPreferenceScreen().addPreference(mHeader);
         }
@@ -255,7 +258,7 @@
         }
         if (footer != null) {
             mFooter = footer;
-            mFooter.setOrder(Integer.MAX_VALUE);
+            mFooter.setOrder(ORDER_LAST);
             if (getPreferenceScreen() != null) {
                 getPreferenceScreen().addPreference(mFooter);
             }