Merge "Fix Settings home lifecycle" into nyc-dev

This commit is contained in:
Jason Monk
2016-03-17 13:32:18 +00:00
committed by Android (Google) Code Review

View File

@@ -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