diff options
| author | Paul Westbrook <pwestbro@google.com> | 2014-09-10 01:55:20 -0700 |
|---|---|---|
| committer | Paul Westbrook <pwestbro@google.com> | 2014-09-10 03:24:53 -0700 |
| commit | 8f0f19c41472ec4918987cd0292d63811a6260ae (patch) | |
| tree | 1a67ccab723f3f93dc1ee4a6e42b8c0603557da1 /AndroidManifest.xml | |
| parent | dfb7fe91e663fe9c0d4e2a645f0fac71be4dd316 (diff) | |
| download | android_packages_apps_Email-8f0f19c41472ec4918987cd0292d63811a6260ae.tar.gz android_packages_apps_Email-8f0f19c41472ec4918987cd0292d63811a6260ae.tar.bz2 android_packages_apps_Email-8f0f19c41472ec4918987cd0292d63811a6260ae.zip | |
Remove unused resources
Also remove broken & disabled tests that referenced otherwise
unused resources
Change resource names to prevent duplicate resources.
Bug: 17414014
Change-Id: Iea9f9799ec19692707e2949473c6f97a3bd29f4b
Diffstat (limited to 'AndroidManifest.xml')
| -rw-r--r-- | AndroidManifest.xml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 8414c9215..3ac586962 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -276,7 +276,7 @@ </activity> <activity android:name=".activity.setup.EmailPreferenceActivity" - android:label="@string/settings_activity_title" + android:label="@string/activity_preferences" android:exported="false" > <intent-filter> <action android:name="android.intent.action.EDIT" /> @@ -291,7 +291,7 @@ </activity> <activity android:name="com.android.mail.ui.settings.PublicPreferenceActivity" - android:label="@string/settings_activity_title" + android:label="@string/activity_preferences" android:exported="true" android:theme="@android:style/Theme.NoDisplay" > <!-- Must be exported in order for the AccountManager to launch it --> @@ -326,7 +326,7 @@ </activity> <activity android:name=".provider.FolderPickerActivity" - android:label="@string/folder_picker_title" + android:label="@string/app_name" > <intent-filter> <action android:name="android.intent.action.EDIT" /> |