Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 299a4c61 authored by Jason Monk's avatar Jason Monk Committed by android-build-merger
Browse files

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

am: ca4dc9a7

* commit 'ca4dc9a7':
  Clear out old views when setting new content in settings

Change-Id: I7ee7c2dcd152365f88859c64d8674514e6bb78b7
parents 483c65d1 ca4dc9a7

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

+5 −2
Original line number Diff line number Diff line
@@ -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