commit 5654815695729b2145da9c560fcd7b443add0a42
author Fyodor Kupolov <fkupolov@google.com> Wed Apr 29 17:36:36 2015 -0700
committer Fyodor Kupolov <fkupolov@google.com> Thu Apr 30 12:02:47 2015 -0700
tree 411e30593d3eab440720c55e850a5d078be8f865
parent c531044671ee80a1615013518778ddbf2793137a

Fixed an issue with back key behavior

Create mHeaderView and set it as a pinned header, each time onActivityCreated
is called.

Bug: 20652673
Change-Id: Ia0e174f0686ac0abb601c591f3774c9152b785fa

src/com/android/settings/SettingsPreferenceFragment.java

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);

src/com/android/settings/users/RestrictedProfileSettings.java

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);
     }