Merge "Fix Settings home lifecycle" into nyc-dev
This commit is contained in:
@@ -102,16 +102,6 @@ public class SettingsDrawerActivity extends Activity {
|
|||||||
+ " ms");
|
+ " 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
|
@Override
|
||||||
public boolean onOptionsItemSelected(MenuItem item) {
|
public boolean onOptionsItemSelected(MenuItem item) {
|
||||||
if (mShowingMenu && mDrawerLayout != null && item.getItemId() == android.R.id.home
|
if (mShowingMenu && mDrawerLayout != null && item.getItemId() == android.R.id.home
|
||||||
|
|||||||
Reference in New Issue
Block a user