[Android] Sync PreferencesActivity TV class to fix build
Geoffrey Métais
git at videolan.org
Thu Nov 12 14:53:54 CET 2015
vlc-ports/android | branch: master | Geoffrey Métais <geoffrey.metais at gmail.com> | Thu Nov 12 13:39:07 2015 +0100| [7ab6b32b61104f0f586e5f07e68dd2995ce52962] | committer: Geoffrey Métais
Sync PreferencesActivity TV class to fix build
> http://git.videolan.org/gitweb.cgi/vlc-ports/android.git/?a=commit;h=7ab6b32b61104f0f586e5f07e68dd2995ce52962
---
.../org/videolan/vlc/gui/preferences/PreferencesActivity.java | 6 +++++-
vlc-android/src/org/videolan/vlc/gui/preferences/Advanced.java | 5 ++---
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/vlc-android/flavors/tv/src/org/videolan/vlc/gui/preferences/PreferencesActivity.java b/vlc-android/flavors/tv/src/org/videolan/vlc/gui/preferences/PreferencesActivity.java
index 460d67f..1781d1b 100644
--- a/vlc-android/flavors/tv/src/org/videolan/vlc/gui/preferences/PreferencesActivity.java
+++ b/vlc-android/flavors/tv/src/org/videolan/vlc/gui/preferences/PreferencesActivity.java
@@ -111,8 +111,12 @@ public class PreferencesActivity extends Activity implements PlaybackService.Cli
mService.restartMediaPlayer();
}
- public void exitAndRescan(){
+ public void setRestart(){
setResult(RESULT_RESTART);
+ }
+
+ public void exitAndRescan(){
+ setRestart();
Intent intent = getIntent();
finish();
startActivity(intent);
diff --git a/vlc-android/src/org/videolan/vlc/gui/preferences/Advanced.java b/vlc-android/src/org/videolan/vlc/gui/preferences/Advanced.java
index 32d3114..e13bff0 100644
--- a/vlc-android/src/org/videolan/vlc/gui/preferences/Advanced.java
+++ b/vlc-android/src/org/videolan/vlc/gui/preferences/Advanced.java
@@ -30,17 +30,16 @@ import android.support.v7.app.AlertDialog;
import android.support.v7.preference.EditTextPreference;
import android.support.v7.preference.ListPreference;
import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceGroup;
import android.support.v7.preference.PreferenceManager;
import android.text.TextUtils;
import org.videolan.libvlc.util.HWDecoderUtil;
import org.videolan.vlc.BuildConfig;
-import org.videolan.vlc.gui.helpers.UiTools;
-import org.videolan.vlc.media.MediaDatabase;
import org.videolan.vlc.R;
import org.videolan.vlc.gui.helpers.AudioUtil;
import org.videolan.vlc.gui.helpers.BitmapCache;
+import org.videolan.vlc.gui.helpers.UiTools;
+import org.videolan.vlc.media.MediaDatabase;
import org.videolan.vlc.util.Util;
import org.videolan.vlc.util.VLCInstance;
import org.videolan.vlc.util.VLCOptions;
More information about the Android
mailing list