From 87020ca2e758b013c119827f004b06bd406cede2 Mon Sep 17 00:00:00 2001
From: Karim Abou Zeid <karim23697@gmail.com>
Date: Sun, 5 Jul 2015 17:55:26 +0200
Subject: [PATCH] Reorganized some strings

---
 app/src/main/AndroidManifest.xml           | 14 ++++++--------
 app/src/main/res/values/donottranslate.xml |  7 -------
 app/src/main/res/values/strings.xml        |  1 +
 3 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index e666bdc6..19cd0866 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -113,14 +113,13 @@
 
         <activity
             android:name=".ui.activities.tageditor.SongTagEditorActivity"
-            android:label="@string/title_activity_tag_editor"
             android:windowSoftInputMode="adjustResize" />
+
         <activity
             android:name=".ui.activities.tageditor.AlbumTagEditorActivity"
-            android:label="@string/title_activity_album_tag_editor" />
-        <activity
-            android:name=".ui.activities.SearchActivity"
-            android:label="@string/title_activity_search" />
+            android:windowSoftInputMode="adjustResize" />
+
+        <activity android:name=".ui.activities.SearchActivity" />
 
         <receiver android:name=".appwidget.WidgetMedium">
             <intent-filter>
@@ -135,9 +134,8 @@
         <activity
             android:name=".ui.activities.SettingsActivity"
             android:label="@string/title_activity_settings" />
-        <activity
-            android:name=".ui.activities.PlaylistDetailActivity"
-            android:label="@string/title_activity_smart_playlist_detail" />
+
+        <activity android:name=".ui.activities.PlaylistDetailActivity" />
     </application>
 
 </manifest>
diff --git a/app/src/main/res/values/donottranslate.xml b/app/src/main/res/values/donottranslate.xml
index 2b412fe8..49b0eb2a 100644
--- a/app/src/main/res/values/donottranslate.xml
+++ b/app/src/main/res/values/donottranslate.xml
@@ -3,11 +3,4 @@
     <string name="app_name">Phonograph</string>
     <string name="credits_4">\u0020<a href="http://cookicons.co/">Cookicons</a></string>
     <string name="credits_2">\u0020<b>Karim Abou Zeid</b>.\n\n<a href="https://plus.google.com/+KarimAbouZeid23697">Google+</a>&#160;&#160;&#160;<a href="https://twitter.com/karim23697">Twitter</a>\n\n</string>
-
-    <string name="title_activity_smart_playlist_detail">SmartPlaylistDetailActivity</string>
-    <string name="title_activity_tag_editor">TagEditorActivity</string>
-    <string name="title_activity_album_tag_editor">AlbumTagEditorActivity</string>
-    <string name="title_activity_settings">SettingsActivity</string>
-    <string name="title_activity_playlist_detail">PlaylistActivity</string>
-    <string name="title_activity_search">SearchActivity</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 00d53799..1974595b 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -171,4 +171,5 @@
     <string name="download_from_last_fm">Download from Last.fm</string>
     <string name="pick_from_local_storage">Pick from Local Storage</string>
     <string name="web_search">Web Search</string>
+    <string name="title_activity_settings">Settings</string>
 </resources>