From 2c8a9850c4914166b3f1bdcc3503b035f456f767 Mon Sep 17 00:00:00 2001
From: relan <relan@users.noreply.github.com>
Date: Sat, 21 May 2016 11:15:35 +0300
Subject: [PATCH] Use system strings where possible

---
 res/layout/audiopicker.xml                                    | 2 +-
 res/layout/new_playlist_dialog.xml                            | 2 +-
 res/layout/permission_request.xml                             | 2 +-
 res/values/translatable.xml                                   | 3 ---
 .../blinkenlights/android/vanilla/FullPlaybackActivity.java   | 2 +-
 src/ch/blinkenlights/android/vanilla/LibraryActivity.java     | 2 +-
 src/ch/blinkenlights/android/vanilla/PlaylistActivity.java    | 2 +-
 src/ch/blinkenlights/android/vanilla/PreferencesActivity.java | 4 ++--
 8 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/res/layout/audiopicker.xml b/res/layout/audiopicker.xml
index 23081fa5..38900545 100644
--- a/res/layout/audiopicker.xml
+++ b/res/layout/audiopicker.xml
@@ -62,7 +62,7 @@ THE SOFTWARE.
 			android:layout_width="0px"
 			android:layout_height="wrap_content"
 			android:layout_weight="1"
-			android:text="@string/cancel"
+			android:text="@android:string/cancel"
 			android:singleLine="true" />
 		<Button
 			style="?android:attr/buttonBarButtonStyle"
diff --git a/res/layout/new_playlist_dialog.xml b/res/layout/new_playlist_dialog.xml
index d8f21193..3a5de4f1 100644
--- a/res/layout/new_playlist_dialog.xml
+++ b/res/layout/new_playlist_dialog.xml
@@ -47,7 +47,7 @@ THE SOFTWARE.
 			android:layout_width="0px"
 			android:layout_height="wrap_content"
 			android:layout_weight="1"
-			android:text="@string/cancel"
+			android:text="@android:string/cancel"
 			android:singleLine="true" />
 		<Button
 			style="?android:attr/buttonBarButtonStyle"
diff --git a/res/layout/permission_request.xml b/res/layout/permission_request.xml
index 9126d910..4d311fe3 100644
--- a/res/layout/permission_request.xml
+++ b/res/layout/permission_request.xml
@@ -37,6 +37,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 			android:clickable="false"
 			android:layout_marginRight="8dip"
 			android:layout_gravity="center"
-			android:text="@string/ok" />
+			android:text="@android:string/ok" />
 	</TableRow>
 </TableLayout>
diff --git a/res/values/translatable.xml b/res/values/translatable.xml
index b0412d1e..a5cef9d5 100644
--- a/res/values/translatable.xml
+++ b/res/values/translatable.xml
@@ -54,8 +54,6 @@ THE SOFTWARE.
 	<string name="choose_playlist_name">Choose playlist name</string>
 	<string name="create">Create</string>
 	<string name="overwrite">Overwrite</string>
-	<string name="cancel">Cancel</string>
-	<string name="yes">Yes</string>
 
 	<string name="delete_playlist">Delete playlist %s?</string>
 
@@ -295,6 +293,5 @@ THE SOFTWARE.
 	<string name="autoplaylist_playcounts_name" formatted="false">Top %d</string>
 
 	<string name="permission_request_summary">Vanilla Music needs read permission to display your music library</string>
-	<string name="ok">Ok</string>
 	<string name="reverse_sort">Reverse sort</string>
 </resources>
diff --git a/src/ch/blinkenlights/android/vanilla/FullPlaybackActivity.java b/src/ch/blinkenlights/android/vanilla/FullPlaybackActivity.java
index ceabcdbb..48b0d744 100644
--- a/src/ch/blinkenlights/android/vanilla/FullPlaybackActivity.java
+++ b/src/ch/blinkenlights/android/vanilla/FullPlaybackActivity.java
@@ -360,7 +360,7 @@ public class FullPlaybackActivity extends SlidingPlaybackActivity
 							mHandler.sendMessage(mHandler.obtainMessage(MSG_DELETE, intent));
 						}
 					})
-					.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
+					.setNegativeButton(android.R.string.cancel, new DialogInterface.OnClickListener() {
 						public void onClick(DialogInterface dialog, int id) {
 						}
 					});
diff --git a/src/ch/blinkenlights/android/vanilla/LibraryActivity.java b/src/ch/blinkenlights/android/vanilla/LibraryActivity.java
index ba3ad154..38a9d52d 100644
--- a/src/ch/blinkenlights/android/vanilla/LibraryActivity.java
+++ b/src/ch/blinkenlights/android/vanilla/LibraryActivity.java
@@ -741,7 +741,7 @@ public class LibraryActivity
 						mHandler.sendMessage(mHandler.obtainMessage(MSG_DELETE, intent));
 					}
 				})
-				.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
+				.setNegativeButton(android.R.string.cancel, new DialogInterface.OnClickListener() {
 					public void onClick(DialogInterface dialog, int id) {
 					}
 				});
diff --git a/src/ch/blinkenlights/android/vanilla/PlaylistActivity.java b/src/ch/blinkenlights/android/vanilla/PlaylistActivity.java
index 5242257f..0cdd28c6 100644
--- a/src/ch/blinkenlights/android/vanilla/PlaylistActivity.java
+++ b/src/ch/blinkenlights/android/vanilla/PlaylistActivity.java
@@ -176,7 +176,7 @@ public class PlaylistActivity extends Activity
 			String message = getResources().getString(R.string.delete_playlist, mPlaylistName);
 			builder.setMessage(message);
 			builder.setPositiveButton(R.string.delete, this);
-			builder.setNegativeButton(R.string.cancel, this);
+			builder.setNegativeButton(android.R.string.cancel, this);
 			builder.show();
 			break;
 		}
diff --git a/src/ch/blinkenlights/android/vanilla/PreferencesActivity.java b/src/ch/blinkenlights/android/vanilla/PreferencesActivity.java
index 7b82d88a..1d6f612c 100644
--- a/src/ch/blinkenlights/android/vanilla/PreferencesActivity.java
+++ b/src/ch/blinkenlights/android/vanilla/PreferencesActivity.java
@@ -253,7 +253,7 @@ public class PreferencesActivity extends PreferenceActivity {
 				new AlertDialog.Builder(activity)
 				.setTitle(R.string.headset_launch_title)
 				.setMessage(R.string.headset_launch_app_missing)
-				.setPositiveButton(R.string.yes, new DialogInterface.OnClickListener() {
+				.setPositiveButton(android.R.string.yes, new DialogInterface.OnClickListener() {
 					public void onClick(DialogInterface dialog, int id) {
 						Intent marketIntent = new Intent(Intent.ACTION_VIEW);
 						marketIntent.setData(Uri.parse("market://details?id="+VPLUG_PACKAGE_NAME));
@@ -261,7 +261,7 @@ public class PreferencesActivity extends PreferenceActivity {
 						getActivity().finish();
 					}
 				})
-				.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
+				.setNegativeButton(android.R.string.cancel, new DialogInterface.OnClickListener() {
 					public void onClick(DialogInterface dialog, int id) {
 						getActivity().finish();
 					}