norohind/vanilla
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Use system strings where possible

Browse Source
This commit is contained in:
relan 2016-05-21 11:15:35 +03:00
parent 63b6d07c1b
commit 2c8a9850c4
8 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
res/layout/audiopicker.xml
View File

@ -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"

2
res/layout/new_playlist_dialog.xml
View File

@ -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"

2
res/layout/permission_request.xml
View File

@ -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>

3
res/values/translatable.xml
View File

@ -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>

2
src/ch/blinkenlights/android/vanilla/FullPlaybackActivity.java
View File

@ -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) {
}
});

2
src/ch/blinkenlights/android/vanilla/LibraryActivity.java
View File

@ -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) {
}
});

2
src/ch/blinkenlights/android/vanilla/PlaylistActivity.java
View File

@ -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;
}

4
src/ch/blinkenlights/android/vanilla/PreferencesActivity.java
View File

@ -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();
}