Merge "Clear out old views when setting new content in settings" into nyc-dev

2016-03-30 16:36:26 +00:00
parent 05ceda5ccc 4ea6657d58
commit ca4dc9a7e1
1 changed files with 5 additions and 2 deletions
--- a/packages/SettingsLib/src/com/android/settingslib/drawer/SettingsDrawerActivity.java
+++ b/packages/SettingsLib/src/com/android/settingslib/drawer/SettingsDrawerActivity.java
@@ -176,8 +176,11 @@ public class SettingsDrawerActivity extends Activity {

    @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