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

Merge "Fixup settings entry points."

Browse Source
This commit is contained in:
Ben Komalo 2011-07-17 17:29:10 -07:00 committed by Android (Google) Code Review
commit 48f4df0911
4 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
res/menu/email_activity_options.xml
View File

@ -68,7 +68,7 @@
<item
android:id="@+id/account_settings"
android:orderInCategory="2000"
android:title="@string/account_settings_action"
android:title="@string/settings_action"
android:icon="@android:drawable/ic_menu_preferences"
/>
<item

2
res/values/strings.xml
View File

@ -128,6 +128,8 @@
<string name="search_action">Search</string>
<!-- Menu item -->
<string name="account_settings_action">Account settings</string>
<!-- Menu item for settings [CHAR LIMIT=40]-->
<string name="settings_action">Settings</string>
<!-- Menu item [CHAR LIMIT=32] -->
<string name="mailbox_settings_action">Folder settings</string>
<!-- Menu item -->

3
src/com/android/email/activity/EmailActivity.java
View File

@ -62,9 +62,6 @@ public class EmailActivity extends Activity implements View.OnClickListener, Fra
/** Loader IDs starting with this is safe to use from ActionBarController. */
static final int ACTION_BAR_CONTROLLER_LOADER_ID_BASE = 200;
private static final int MAILBOX_SYNC_FREQUENCY_DIALOG = 1;
private static final int MAILBOX_SYNC_LOOKBACK_DIALOG = 2;
private Controller mController;
private Controller.Result mControllerResult;

2
src/com/android/email/activity/UIControllerOnePane.java
View File

@ -580,7 +580,7 @@ class UIControllerOnePane extends UIControllerBase {
menu.findItem(R.id.search).setVisible(false);
menu.findItem(R.id.compose).setVisible(false);
menu.findItem(R.id.refresh).setVisible(false);
menu.findItem(R.id.account_settings).setVisible(false);
menu.findItem(R.id.show_all_mailboxes).setVisible(false);
menu.findItem(R.id.mailbox_settings).setVisible(false);
final MessageOrderManager om = getMessageOrderManager();