commit 817178fda2b250a4b5ed716219e15cc225377cf8
author Jorim Jaggi <jjaggi@google.com> Fri Apr 24 21:34:37 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Apr 24 21:34:39 2015 +0000
tree 4ee258ee614df6f9c0285f7fbc75a11e7b558477
parent 13f830308662b3cea7986c44ab7fe51769fb1165
parent 3b7f2efd95945d3fb0299dda86861eaf22b2ebc5

Merge changes from topic 'fingerprint_ui'

* changes:
  Add dialog when user touches fingerprint icon
  Add pulsing animation for find sensor.
  Update fingerprint enroll UI to spec.

res/xml/development_prefs.xml

diff --git a/res/xml/development_prefs.xml b/res/xml/development_prefs.xml
index 4e8ca0e..c36b3e7 100644
--- a/res/xml/development_prefs.xml
+++ b/res/xml/development_prefs.xml
@@ -128,17 +128,17 @@
 
         <SwitchPreference
             android:key="wifi_verbose_logging"
-            android:title="@string/wifi_verbose_logging" />
+            android:title="@string/wifi_verbose_logging"
             android:summary="@string/wifi_verbose_logging_summary"/>
 
         <SwitchPreference
             android:key="wifi_aggressive_handover"
-            android:title="@string/wifi_aggressive_handover" />
+            android:title="@string/wifi_aggressive_handover"
             android:summary="@string/wifi_aggressive_handover_summary"/>
 
-       <SwitchPreference
+        <SwitchPreference
             android:key="wifi_allow_scan_with_traffic"
-            android:title="@string/wifi_allow_scan_with_traffic" />
+            android:title="@string/wifi_allow_scan_with_traffic"
             android:summary="@string/wifi_allow_scan_with_traffic_summary"/>
 
        <SwitchPreference