ADHOC/replicant-packages_apps_Email
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "Show the UP arrow on account settings" into honeycomb

Browse Source
This commit is contained in:
Makoto Onuki 2011-01-12 13:46:24 -08:00 committed by Android (Google) Code Review
commit 1316ccdc2a
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/com/android/email/activity/setup/AccountSettingsXL.java
View File

@ -28,6 +28,7 @@ import com.android.email.provider.EmailContent;
import com.android.email.provider.EmailContent.Account;
import com.android.email.provider.EmailContent.AccountColumns;
import android.app.ActionBar;
import android.app.Activity;
import android.app.AlertDialog;
import android.app.Dialog;
@ -161,6 +162,9 @@ public class AccountSettingsXL extends PreferenceActivity {
}
}
mShowDebugMenu = i.getBooleanExtra(EXTRA_ENABLE_DEBUG, false);
getActionBar().setDisplayOptions(
ActionBar.DISPLAY_HOME_AS_UP, ActionBar.DISPLAY_HOME_AS_UP);
}
@Override
@ -222,6 +226,13 @@ public class AccountSettingsXL extends PreferenceActivity {
@Override
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case android.R.id.home:
// The app icon on the action bar is pressed. Just emulate a back press.
// TODO: this should navigate to the main screen, even if a sub-setting is open.
// But we shouldn't just finish(), as we want to show "discard changes?" dialog
// when necessary.
onBackPressed();
break;
case R.id.add_new_account:
onAddNewAccount();
break;