Merge "Update fingerprint settings to spec" into mnc-dev
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 3f5e9e9..dadf173 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1612,11 +1612,11 @@
<string name="wifi_skipped_message" product="default">WARNING: if you skip Wi\u2011Fi, your phone will only use cellular data for initial downloads and updates. To avoid possible data charges, connect to Wi\u2011Fi.</string>
<!-- Text warning about skipping Wi-Fi without a mobile connect (tablet) [CHAR LIMIT=NONE] -->
- <string name="wifi_and_mobile_skipped_message" product="tablet">If you skip Wi\u2011Fi:\n\nYour tablet won\'t have an Internet connection.\n\nYou won\'t get software updates until you connect to the Internet.\n\nYou can\'t activate device protection features at this time.</string>
+ <string name="wifi_and_mobile_skipped_message" product="tablet">If you skip Wi\u2011Fi:\n\n<li>Your tablet won\'t have an Internet connection.</li>\n\n<li>You won\'t get software updates until you connect to the Internet.</li>\n\n<li>You can\'t activate device protection features at this time.</li></string>
<!-- Text warning about skipping Wi-Fi without a mobile connect (device) [CHAR LIMIT=NONE] -->
- <string name="wifi_and_mobile_skipped_message" product="device">If you skip Wi\u2011Fi:\n\nYour device won\'t have an Internet connection.\n\nYou won\'t get software updates until you connect to the Internet.\n\nYou can\'t activate device protection features at this time.</string>
+ <string name="wifi_and_mobile_skipped_message" product="device">If you skip Wi\u2011Fi:\n\n<li>Your device won\'t have an Internet connection.</li>\n\n<li>You won\'t get software updates until you connect to the Internet.</li>\n\n<li>You can\'t activate device protection features at this time.</li></string>
<!-- Text warning about skipping Wi-Fi without a mobile connect (phone) [CHAR LIMIT=NONE] -->
- <string name="wifi_and_mobile_skipped_message" product="default">If you skip Wi\u2011Fi:\n\nYour phone won\'t have an Internet connection.\n\nYou won\'t get software updates until you connect to the Internet.\n\nYou can\'t activate device protection features at this time.</string>
+ <string name="wifi_and_mobile_skipped_message" product="default">If you skip Wi\u2011Fi:\n\n<li>Your phone won\'t have an Internet connection.</li>\n\n<li>You won\'t get software updates until you connect to the Internet.</li>\n\n<li>You can\'t activate device protection features at this time.</li></string>
<!-- Text alerting that Wi-Fi couldn't connect (tablet) [CHAR LIMIT=NONE] -->
<string name="wifi_connect_failed_message" product="tablet">The tablet was unable to connect to this Wi\u2011Fi network.</string>
<!-- Text alerting that Wi-Fi couldn't connect (device) [CHAR LIMIT=NONE] -->
@@ -5000,7 +5000,7 @@
<!-- UI debug setting: force anti-aliasing summary [CHAR LIMIT=50] -->
<string name="force_msaa_summary">Enable 4x MSAA in OpenGL ES 2.0 apps</string>
- <!-- UI debug setting: show when non-rectangular clip operations are used [CHAR LIMIT=50] -->
+ <!-- UI debug setting: show when non-rectangular clip operations are used [CHAR LIMIT=100] -->
<string name="show_non_rect_clip">Debug non-rectangular clip operations</string>
<!-- UI debug setting: profile time taken by hardware acceleration to render apps [CHAR LIMIT=25] -->
diff --git a/src/com/android/settings/SettingsPreferenceFragment.java b/src/com/android/settings/SettingsPreferenceFragment.java
index 2c566a1..095785b 100644
--- a/src/com/android/settings/SettingsPreferenceFragment.java
+++ b/src/com/android/settings/SettingsPreferenceFragment.java
@@ -125,11 +125,6 @@
mPinnedHeaderFrameLayout.setVisibility(View.VISIBLE);
}
- public void clearPinnedHeaderView() {
- mPinnedHeaderFrameLayout.removeAllViews();
- mPinnedHeaderFrameLayout.setVisibility(View.GONE);
- }
-
@Override
public void onSaveInstanceState(Bundle outState) {
super.onSaveInstanceState(outState);
diff --git a/src/com/android/settings/users/RestrictedProfileSettings.java b/src/com/android/settings/users/RestrictedProfileSettings.java
index 7b698cf..b0b86e4 100644
--- a/src/com/android/settings/users/RestrictedProfileSettings.java
+++ b/src/com/android/settings/users/RestrictedProfileSettings.java
@@ -23,6 +23,7 @@
import android.graphics.drawable.Drawable;
import android.os.Bundle;
import android.view.View;
+import android.view.ViewGroup;
import android.widget.ImageView;
import android.widget.TextView;
@@ -57,15 +58,13 @@
@Override
public void onActivityCreated(Bundle savedInstanceState) {
- if (mHeaderView == null) {
- mHeaderView = setPinnedHeaderView(R.layout.user_info_header);
- mHeaderView.setOnClickListener(this);
- mUserIconView = (ImageView) mHeaderView.findViewById(android.R.id.icon);
- mUserNameView = (TextView) mHeaderView.findViewById(android.R.id.title);
- mDeleteButton = (ImageView) mHeaderView.findViewById(R.id.delete);
- mDeleteButton.setOnClickListener(this);
- getListView().setFastScrollEnabled(true);
- }
+ mHeaderView = setPinnedHeaderView(R.layout.user_info_header);
+ mHeaderView.setOnClickListener(this);
+ mUserIconView = (ImageView) mHeaderView.findViewById(android.R.id.icon);
+ mUserNameView = (TextView) mHeaderView.findViewById(android.R.id.title);
+ mDeleteButton = (ImageView) mHeaderView.findViewById(R.id.delete);
+ mDeleteButton.setOnClickListener(this);
+ getListView().setFastScrollEnabled(true);
// This is going to bind the preferences.
super.onActivityCreated(savedInstanceState);
}