diff options
| author | Paul Westbrook <pwestbro@google.com> | 2013-06-07 17:31:15 -0700 |
|---|---|---|
| committer | Paul Westbrook <pwestbro@google.com> | 2013-06-07 18:09:57 -0700 |
| commit | 38f22dbf08664b885b4cf063ea665c02edfb1c32 (patch) | |
| tree | 0e761cd2b9562eea175794bf88b331b15ab6636e /res | |
| parent | 0ec8c365e795d9a73ecae0ba00fa0535e57e528e (diff) | |
| download | android_packages_apps_Email-38f22dbf08664b885b4cf063ea665c02edfb1c32.tar.gz android_packages_apps_Email-38f22dbf08664b885b4cf063ea665c02edfb1c32.tar.bz2 android_packages_apps_Email-38f22dbf08664b885b4cf063ea665c02edfb1c32.zip | |
Use "show pictures" code from UnifiedEmail
Bug: 9320770
Change-Id: I701a93e2f09b8405a2c4bc56f7793f5abadbcd1e
Diffstat (limited to 'res')
| -rw-r--r-- | res/values/strings.xml | 7 | ||||
| -rw-r--r-- | res/xml/general_preferences.xml | 5 |
2 files changed, 0 insertions, 12 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index 04160e494..ddd117326 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -1160,17 +1160,10 @@ as <xliff:g id="filename">%s</xliff:g>.</string> <!-- General preference: Text zoom. Value is "huge" (+2) [CHAR LIMIT=32] --> <string name="general_preference_text_zoom_huge">Huge</string> - <!-- Settings screen, title used to clear the setting for the list of - senders to automatically show pictures for [CHAR LIMIT=80] --> - <string name="general_preferences_clear_trusted_senders_title" - >Ask to show pictures</string> <!-- Settings screen, summary for clearing the settings for the list of senders to automatically show pictures for [CHAR LIMIT=160] --> <string name="general_preferences_clear_trusted_senders_summary" >Pictures in messages won\'t be shown automatically</string> - <!-- Message shown in toast when the user taps to clear the lsit of senders - to automatically show pictures for [CHAR LIMIT=80] --> - <string name="trusted_senders_cleared">\"Show pictures\" cleared.</string> <!-- Generic string for "current position" / "total number" [CHAR LIMIT=12] --> <string name="position_of_count"><xliff:g example="1">%1$d</xliff:g> of <xliff:g diff --git a/res/xml/general_preferences.xml b/res/xml/general_preferences.xml index 0b554f315..3fb588a29 100644 --- a/res/xml/general_preferences.xml +++ b/res/xml/general_preferences.xml @@ -70,9 +70,4 @@ android:title="@string/preference_swipe_title_delete" android:summary="@string/preference_swipe_description" /> - <PreferenceScreen - android:key="clear_trusted_senders" - android:title="@string/general_preferences_clear_trusted_senders_title" - android:summary="@string/general_preferences_clear_trusted_senders_summary" /> - </PreferenceScreen> |