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

Commit a2e759d9 authored by Jason Monk's avatar Jason Monk Committed by Android (Google) Code Review
Browse files

Merge "Fix Settings home lifecycle" into nyc-dev

parents b6408ca4 14ee8d7e

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

+0 −10
Original line number Diff line number Diff line
@@ -102,16 +102,6 @@ public class SettingsDrawerActivity extends Activity { 
                + " ms");

    }



    @Override

    public void onBackPressed() {

        if (mShowingMenu) {

            // If we are showing the menu, then we are a top level activity and the back should

            // kick back to settings home.

            openTile(null);

        }

        super.onBackPressed();

    }



    @Override

    public boolean onOptionsItemSelected(MenuItem item) {

        if (mShowingMenu && mDrawerLayout != null && item.getItemId() == android.R.id.home