commit c3ec1ab889d34f6553f3353ab5de9dade0327953
author Jason Monk <jmonk@google.com> Fri Jun 17 17:22:03 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jun 17 17:22:03 2016 +0000
tree 779bd536dbab0e91e1b410bf306c5abb373eeec4
parent 0c2ccba2f9c8f683536b167a47b720d52d6893d2
parent 7a19965c9f4385bce0671f034b68e3bddfa5cc39

Merge "Protect against crash in memory details" into nyc-dev

src/com/android/settings/ScreenPinningSettings.java

diff --git a/src/com/android/settings/ScreenPinningSettings.java b/src/com/android/settings/ScreenPinningSettings.java
index 5b5b9ef..fb28dfb 100644
--- a/src/com/android/settings/ScreenPinningSettings.java
+++ b/src/com/android/settings/ScreenPinningSettings.java
@@ -28,6 +28,7 @@
 import android.support.v7.preference.PreferenceScreen;
 import android.view.LayoutInflater;
 import android.view.View;
+import android.view.ViewGroup;
 import android.widget.Switch;
 
 import com.android.internal.logging.MetricsProto.MetricsEvent;
@@ -65,9 +66,6 @@
         final SettingsActivity activity = (SettingsActivity) getActivity();
         mLockPatternUtils = new LockPatternUtils(activity);
 
-        View emptyView = LayoutInflater.from(activity)
-                .inflate(R.layout.screen_pinning_instructions, null);
-        setEmptyView(emptyView);
 
         mSwitchBar = activity.getSwitchBar();
         mSwitchBar.addOnSwitchChangeListener(this);
@@ -76,6 +74,16 @@
     }
 
     @Override
+    public void onViewCreated(View view, Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        ViewGroup parent = (ViewGroup) view.findViewById(android.R.id.list_container);
+        View emptyView = LayoutInflater.from(getContext())
+                .inflate(R.layout.screen_pinning_instructions, parent, false);
+        parent.addView(emptyView);
+        setEmptyView(emptyView);
+    }
+
+    @Override
     public void onDestroyView() {
         super.onDestroyView();