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

2016-01-26 22:36:06 +00:00
parent 49e9f612d1 5590e2eb44
commit a78572cf39
6 changed files with 51 additions and 23 deletions
--- a/src/com/android/settings/applications/LayoutPreference.java
+++ b/src/com/android/settings/applications/LayoutPreference.java
@@ -72,6 +72,10 @@ public class LayoutPreference extends Preference {
    public void onBindViewHolder(PreferenceViewHolder view) {
        FrameLayout layout = (FrameLayout) view.itemView;
        layout.removeAllViews();
+        ViewGroup parent = (ViewGroup) mRootView.getParent();
+        if (parent != null) {
+            parent.removeView(mRootView);
+        }
        layout.addView(mRootView);
    }