commit 4ea6657d587f0e06a335b9faf355e222d7cbd385
author Jason Monk <jmonk@google.com> Wed Mar 30 11:05:51 2016 -0400
committer Jason Monk <jmonk@google.com> Wed Mar 30 12:35:29 2016 -0400
tree 3f4a70c80f856d255d5b96e976a8bc8d9e1e6262
parent a3a3f35e8d5cafcb0e872e014ec3749329202174

Clear out old views when setting new content in settings

Bug: 27529989
Change-Id: Id44ca442c2117bc5df7929bcd79434c0ae23cded

packages/SettingsLib/src/com/android/settingslib/drawer/SettingsDrawerActivity.java

diff --git a/packages/SettingsLib/src/com/android/settingslib/drawer/SettingsDrawerActivity.java b/packages/SettingsLib/src/com/android/settingslib/drawer/SettingsDrawerActivity.java
index c3a5089..ff70190 100644
--- a/packages/SettingsLib/src/com/android/settingslib/drawer/SettingsDrawerActivity.java
+++ b/packages/SettingsLib/src/com/android/settingslib/drawer/SettingsDrawerActivity.java
@@ -176,8 +176,11 @@
 
     @Override
     public void setContentView(@LayoutRes int layoutResID) {
-        LayoutInflater.from(this).inflate(layoutResID,
-                (ViewGroup) findViewById(R.id.content_frame));
+        final ViewGroup parent = (ViewGroup) findViewById(R.id.content_frame);
+        if (parent != null) {
+            parent.removeAllViews();
+        }
+        LayoutInflater.from(this).inflate(layoutResID, parent);
     }
 
     @Override