diff options
author | Ray Chen <raychen@google.com> | 2014-06-10 16:01:40 +0200 |
---|---|---|
committer | Ray Chen <raychen@google.com> | 2014-06-24 19:23:23 +0200 |
commit | a57da3c151ae174bc8621af79f3f09392ed90953 (patch) | |
tree | 71a72378bec0e18a9172c66604dd74d32e51ed06 /res/menu-sw600dp-land | |
parent | 6048112f3b004873db03b14efc5ae1d268fba041 (diff) | |
download | android_packages_apps_UnifiedEmail-a57da3c151ae174bc8621af79f3f09392ed90953.tar.gz android_packages_apps_UnifiedEmail-a57da3c151ae174bc8621af79f3f09392ed90953.tar.bz2 android_packages_apps_UnifiedEmail-a57da3c151ae174bc8621af79f3f09392ed90953.zip |
Implement support for help library
b/12068507
Primary changes:
* Merge help and feedback as requested by the new guideline
* Determine help context by the view mode (list or conversation)
Change-Id: I6d9d7cc56063e7eedfe6db18c2c363e9b4d07cef
Diffstat (limited to 'res/menu-sw600dp-land')
-rw-r--r-- | res/menu-sw600dp-land/conversation_actions.xml | 7 | ||||
-rw-r--r-- | res/menu-sw600dp-land/conversation_list_search_results_actions.xml | 7 |
2 files changed, 2 insertions, 12 deletions
diff --git a/res/menu-sw600dp-land/conversation_actions.xml b/res/menu-sw600dp-land/conversation_actions.xml index b8b172c68..1c3d1f9cf 100644 --- a/res/menu-sw600dp-land/conversation_actions.xml +++ b/res/menu-sw600dp-land/conversation_actions.xml @@ -146,13 +146,8 @@ android:showAsAction="never" /> <item - android:id="@+id/feedback_menu_item" - android:title="@string/feedback" - android:showAsAction="never" /> - - <item android:id="@+id/help_info_menu_item" - android:title="@string/help_and_info" + android:title="@string/help_and_feedback" android:showAsAction="never" /> </menu> diff --git a/res/menu-sw600dp-land/conversation_list_search_results_actions.xml b/res/menu-sw600dp-land/conversation_list_search_results_actions.xml index a9448a8aa..14b68fbe5 100644 --- a/res/menu-sw600dp-land/conversation_list_search_results_actions.xml +++ b/res/menu-sw600dp-land/conversation_list_search_results_actions.xml @@ -72,13 +72,8 @@ android:showAsAction="never" /> <item - android:id="@+id/feedback_menu_item" - android:showAsAction="never" - android:title="@string/feedback" /> - - <item android:id="@+id/help_info_menu_item" android:showAsAction="never" - android:title="@string/help_and_info" /> + android:title="@string/help_and_feedback" /> </menu> |