From 0c2ccba2f9c8f683536b167a47b720d52d6893d2 Mon Sep 17 00:00:00 2001
From: Jason Monk <jmonk@google.com>
Date: Fri, 17 Jun 2016 10:05:06 -0400
Subject: [PATCH] Make sure screen pinning desc is part of view hierarchy

Change-Id: I2c2e25e129d8530512e1a1f4ee6a7483b5322286
Fixes: 29243233
---
 .../android/settings/ScreenPinningSettings.java    | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/com/android/settings/ScreenPinningSettings.java b/src/com/android/settings/ScreenPinningSettings.java
index 5b5b9efa919..fb28dfbfc15 100644
--- a/src/com/android/settings/ScreenPinningSettings.java
+++ b/src/com/android/settings/ScreenPinningSettings.java
@@ -28,6 +28,7 @@ import android.support.v7.preference.Preference.OnPreferenceChangeListener;
 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 @@ public class ScreenPinningSettings extends SettingsPreferenceFragment
         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);
@@ -75,6 +73,16 @@ public class ScreenPinningSettings extends SettingsPreferenceFragment
         mSwitchBar.setChecked(isLockToAppEnabled(getActivity()));
     }
 
+    @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();