Merge "Move support for settings menu to UnifiedEmail" into jb-ub-mail-ur10
diff --git a/res/menu-sw600dp/general_prefs_fragment_menu.xml b/res/menu-sw600dp/general_prefs_fragment_menu.xml
new file mode 100644
index 0000000..37b73f2
--- /dev/null
+++ b/res/menu-sw600dp/general_prefs_fragment_menu.xml
@@ -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="ifRoom|withText" />
+
+ <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>
\ No newline at end of file
diff --git a/res/menu-sw600dp/settings_fragment_menu.xml b/res/menu-sw600dp/settings_fragment_menu.xml
new file mode 100644
index 0000000..afff6a9
--- /dev/null
+++ b/res/menu-sw600dp/settings_fragment_menu.xml
@@ -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="ifRoom|withText" />
+
+ <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>
diff --git a/res/menu/general_prefs_fragment_menu.xml b/res/menu/general_prefs_fragment_menu.xml
index 39b19a5..8e92d5c 100644
--- a/res/menu/general_prefs_fragment_menu.xml
+++ b/res/menu/general_prefs_fragment_menu.xml
@@ -26,4 +26,6 @@
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>
\ No newline at end of file
diff --git a/res/menu/settings_fragment_menu.xml b/res/menu/settings_fragment_menu.xml
new file mode 100644
index 0000000..a39e681
--- /dev/null
+++ b/res/menu/settings_fragment_menu.xml
@@ -0,0 +1,27 @@
+<?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/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>
diff --git a/res/menu/settings_menu.xml b/res/menu/settings_menu.xml
new file mode 100644
index 0000000..4129ba2
--- /dev/null
+++ b/res/menu/settings_menu.xml
@@ -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>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index cb17a11..f6b13d3 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -929,4 +929,8 @@
<string name="conversation_photo_welcome_text">Touch a sender image to select that conversation.</string>
<!-- Content description for the folder icon for nested folders. -->
<string name="folder_icon_desc">Folder icon</string>
+
+ <!-- Button, "Add account" in the preference screen [CHAR LIMIT=30] -->
+ <string name="add_account">Add account</string>
+
</resources>