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

Fix settings menus. 

- Account & general fragments need to clear to remove
  "Add account" for phone & 7".
- 10" needs to therefore specify their menus in order to
  have "Add account".

Bug: 10097087
Change-Id: I133db9b9f7f6610ae30b46927ffcb8a9e4df4c0a
This commit is contained in:
Yu Ping Hu 2013-07-30 18:30:33 -07:00
parent 82e2830a7f
commit ef0d98155c
4 changed files with 70 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
res/menu-sw720dp/general_prefs_fragment_menu.xml Normal file
View File

@ -0,0 +1,36 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2013 Google Inc.
Licensed to The Android Open Source Project.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<menu xmlns:android="http://schemas.android.com/apk/res/android" >
<item
android:id="@+id/add_new_account"
android:title="@string/add_account"
android:showAsAction="always" />
<item
android:id="@+id/clear_picture_approvals_menu_item"
android:showAsAction="never"
android:title="@string/clear_display_images_whitelist_title"/>
<item
android:id="@+id/feedback_menu_item"
android:icon="@android:drawable/ic_menu_send"
android:title="@string/feedback"/>
<!-- TODO add help menu item, once help support has been moved to UnifiedEmail -->
</menu>

32
res/menu-sw720dp/settings_fragment_menu.xml Normal file
View File

@ -0,0 +1,32 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2013 Google Inc.
Licensed to The Android Open Source Project.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:id="@+id/add_new_account"
android:title="@string/add_account"
android:showAsAction="always" />
<item
android:id="@+id/feedback_menu_item"
android:icon="@android:drawable/ic_menu_send"
android:title="@string/feedback" />
<!-- TODO add help menu item, once help support has been moved to UnifiedEmail -->
</menu>

1
src/com/android/email/activity/setup/AccountSettingsFragment.java
View File

@ -413,6 +413,7 @@ public class AccountSettingsFragment extends EmailPreferenceFragment
@Override
public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
menu.clear();
inflater.inflate(R.menu.settings_fragment_menu, menu);
}

1
src/com/android/email/activity/setup/GeneralPreferences.java
View File

@ -194,6 +194,7 @@ public class GeneralPreferences extends EmailPreferenceFragment implements
@Override
public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
menu.clear();
inflater.inflate(R.menu.general_prefs_fragment_menu, menu);
}