Merge "Updated Nexus imprint screen" into nyc-mr1-dev
diff --git a/res/layout/fingerprint_enroll_enrolling_content.xml b/res/layout/fingerprint_enroll_enrolling_content.xml
index 4b36b23..42769d1 100644
--- a/res/layout/fingerprint_enroll_enrolling_content.xml
+++ b/res/layout/fingerprint_enroll_enrolling_content.xml
@@ -37,6 +37,7 @@
         android:layout_centerInParent="true"
         style="?android:attr/progressBarStyleHorizontal"
         android:max="10000"
+        android:mirrorForRtl="false"
         android:progress="0"
         android:indeterminate="false"
         android:progressDrawable="@drawable/fingerprint_progress_ring"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 416c874..10d35e0 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -7643,7 +7643,7 @@
     <string name="support_disclaimer_title">Send system information</string>
 
     <!-- Dialog content displayed before initiating real time support  [CHAR LIMIT=NONE]-->
-    <string name="support_disclaimer_content">To help address your issue quickly, we need system information for diagnosis.</string>
+    <string name="support_disclaimer_content" product="default">To help address your issue quickly, we need system information for diagnosis.</string>
 
     <!-- Checkbox text, when checked dialog will not show again [CHAR LIMIT=80] -->
     <string name="support_disclaimer_do_not_show">Do not show again</string>
diff --git a/src/com/android/settings/dashboard/DashboardSummary.java b/src/com/android/settings/dashboard/DashboardSummary.java
index 12f036a..e0f727f 100644
--- a/src/com/android/settings/dashboard/DashboardSummary.java
+++ b/src/com/android/settings/dashboard/DashboardSummary.java
@@ -236,17 +236,18 @@
 
         @Override
         protected List<Tile> doInBackground(Void... params) {
+            final Context context = getContext();
             List<Tile> suggestions = mSuggestionParser.getSuggestions();
             for (int i = 0; i < suggestions.size(); i++) {
                 Tile suggestion = suggestions.get(i);
                 if (mSuggestionsChecks.isSuggestionComplete(suggestion)) {
                     mAdapter.disableSuggestion(suggestion);
                     suggestions.remove(i--);
-                } else {
-                    String id = DashboardAdapter.getSuggestionIdentifier(getContext(), suggestion);
+                } else if (context != null) {
+                    String id = DashboardAdapter.getSuggestionIdentifier(context, suggestion);
                     if (!mSuggestionsShownLogged.contains(id)) {
                         mSuggestionsShownLogged.add(id);
-                        MetricsLogger.action(getContext(),
+                        MetricsLogger.action(context,
                                 MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION, id);
                     }
                 }