diff --git a/res/values/strings.xml b/res/values/strings.xml index 605dd8e9044306605334a5346b0b16ada5a65c0e..a5feba941fbdb3ae4cbae323f310565ec2769793 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -209,4 +209,17 @@ %1$s %2$s Music playback + + Music is forked from LineageOS Music + Authors + Source code + Licence + Music information + Music is an Open Source Music Player for Android + Privacy policy + Terms of service + About + Build Version + + diff --git a/res/xml/settings.xml b/res/xml/settings.xml index dec96c910172a6003ef592b1ce77c3f1e131e810..c3ad0e31afb5e66711ac424b11db309ae749dc04 100644 --- a/res/xml/settings.xml +++ b/res/xml/settings.xml @@ -75,4 +75,69 @@ android:summary="@string/settings_delete_cache_summary" android:title="@string/settings_delete_cache_title" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/org/lineageos/eleven/ui/activities/SettingsActivity.java b/src/org/lineageos/eleven/ui/activities/SettingsActivity.java index c1963fb127820187a03b2932dcecdca7478686df..982922fbb0dcb3a059a86b30263c553dc9781bf6 100644 --- a/src/org/lineageos/eleven/ui/activities/SettingsActivity.java +++ b/src/org/lineageos/eleven/ui/activities/SettingsActivity.java @@ -18,6 +18,7 @@ import android.content.DialogInterface; import android.content.DialogInterface.OnClickListener; import android.content.SharedPreferences; import android.content.SharedPreferences.OnSharedPreferenceChangeListener; +import android.content.pm.PackageManager; import android.os.Bundle; import android.preference.Preference; import android.preference.Preference.OnPreferenceClickListener; @@ -35,7 +36,9 @@ import org.lineageos.eleven.utils.PreferenceUtils; * @author Andrew Neal (andrewdneal@gmail.com) */ @SuppressWarnings("deprecation") -public class SettingsActivity extends PreferenceActivity implements OnSharedPreferenceChangeListener{ +public class SettingsActivity extends PreferenceActivity implements OnSharedPreferenceChangeListener { + + private final static String BUILD_VERSION = "build_version"; /** * {@inheritDoc} @@ -54,6 +57,14 @@ public class SettingsActivity extends PreferenceActivity implements OnSharedPref deleteCache(); PreferenceUtils.getInstance(this).setOnSharedPreferenceChangeListener(this); + + try { + String versionName = getPackageManager().getPackageInfo(getPackageName(), 0).versionName; + findPreference(BUILD_VERSION).setSummary(versionName); + } catch (PackageManager.NameNotFoundException e) { + } + + } /** @@ -81,19 +92,19 @@ public class SettingsActivity extends PreferenceActivity implements OnSharedPref @Override public boolean onPreferenceClick(final Preference preference) { new AlertDialog.Builder(SettingsActivity.this).setMessage(R.string.delete_warning) - .setPositiveButton(android.R.string.ok, new OnClickListener() { - @Override - public void onClick(final DialogInterface dialog, final int which) { - ImageFetcher.getInstance(SettingsActivity.this).clearCaches(); - } - }) - .setNegativeButton(R.string.cancel, new OnClickListener() { - @Override - public void onClick(final DialogInterface dialog, final int which) { - dialog.dismiss(); - } - }) - .create().show(); + .setPositiveButton(android.R.string.ok, new OnClickListener() { + @Override + public void onClick(final DialogInterface dialog, final int which) { + ImageFetcher.getInstance(SettingsActivity.this).clearCaches(); + } + }) + .setNegativeButton(R.string.cancel, new OnClickListener() { + @Override + public void onClick(final DialogInterface dialog, final int which) { + dialog.dismiss(); + } + }) + .create().show(); return true; } }); @@ -101,11 +112,12 @@ public class SettingsActivity extends PreferenceActivity implements OnSharedPref @Override public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, - String key) { + String key) { if (key.equals(PreferenceUtils.SHOW_VISUALIZER) && sharedPreferences.getBoolean(key, false) && !PreferenceUtils.canRecordAudio(this)) { PreferenceUtils.requestRecordAudio(this); - } if (key.equals(PreferenceUtils.SHAKE_TO_PLAY)) { + } + if (key.equals(PreferenceUtils.SHAKE_TO_PLAY)) { MusicUtils.setShakeToPlayEnabled(sharedPreferences.getBoolean(key, false)); } else if (key.equals(PreferenceUtils.SHOW_ALBUM_ART_ON_LOCKSCREEN)) { MusicUtils.setShowAlbumArtOnLockscreen(sharedPreferences.getBoolean(key, true));