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

am 4b5b7886: Merge "Disable the debug menu" into ub-mail-algol 

* commit '4b5b7886bc91c27688387ae00e552ad8540eb3e7':
  Disable the debug menu
This commit is contained in:
Martin Hibdon 2014-05-15 20:42:34 +00:00 committed by Android Git Automerger
parent 236d84c7c0 4b5b7886bc
commit 4461f1d99e
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/com/android/email/activity/setup/AccountSettings.java
View File

@ -87,6 +87,8 @@ public class AccountSettings extends PreferenceActivity implements
private static final String EXTRA_LOGIN_WARNING_REASON_FOR_ACCOUNT =
"AccountSettings.for_account_reason";
private static final String EXTRA_TITLE = "AccountSettings.title";
// STOPSHIP: Do not ship with the debug menu allowed.
private static final boolean DEBUG_MENU_ALLOWED = false;
public static final String EXTRA_NO_ACCOUNTS = "AccountSettings.no_account";
public static final String EXTRA_ACCOUNT = "AccountSettings.account";
@ -453,15 +455,17 @@ public class AccountSettings extends PreferenceActivity implements
}
// finally, if debug header is enabled, show it
if (mShowDebugMenu) {
// setup lightweight header for debugging
final Header debugHeader = new Header();
debugHeader.title = getText(R.string.debug_title);
debugHeader.summary = null;
debugHeader.iconRes = 0;
debugHeader.fragment = DebugFragment.class.getCanonicalName();
debugHeader.fragmentArguments = null;
target.add(debugHeader);
if (DEBUG_MENU_ALLOWED) {
if (mShowDebugMenu) {
// setup lightweight header for debugging
final Header debugHeader = new Header();
debugHeader.title = getText(R.string.debug_title);
debugHeader.summary = null;
debugHeader.iconRes = 0;
debugHeader.fragment = DebugFragment.class.getCanonicalName();
debugHeader.fragmentArguments = null;
target.add(debugHeader);
}
}
// Save for later use (see forceSwitch)