[Android] Remove hardware accel error dialog
Geoffrey Métais
git at videolan.org
Tue Oct 27 17:47:02 CET 2015
vlc-ports/android | branch: master | Geoffrey Métais <geoffrey.metais at gmail.com> | Thu Oct 22 12:01:06 2015 +0200| [0befd9cbf690af98f843f44c332897dc2979f56a] | committer: Geoffrey Métais
Remove hardware accel error dialog
> http://git.videolan.org/gitweb.cgi/vlc-ports/android.git/?a=commit;h=0befd9cbf690af98f843f44c332897dc2979f56a
---
vlc-android/res/values/strings.xml | 3 ---
.../vlc/gui/video/VideoPlayerActivity.java | 24 +-------------------
2 files changed, 1 insertion(+), 26 deletions(-)
diff --git a/vlc-android/res/values/strings.xml b/vlc-android/res/values/strings.xml
index ebcbff26..d1797ad 100644
--- a/vlc-android/res/values/strings.xml
+++ b/vlc-android/res/values/strings.xml
@@ -175,9 +175,6 @@
<string name="search">Search</string>
<string name="search_history">Search history</string>
- <string name="hardware_acceleration_error_title">HW acceleration error</string>
- <string name="hardware_acceleration_error_message">An error occurred with hardware acceleration. Would you like to disable it and try again?</string>
-
<!-- Tips -->
<string name="video_player_tips">Video player tips:</string>
<string name="seek">Seek</string>
diff --git a/vlc-android/src/org/videolan/vlc/gui/video/VideoPlayerActivity.java b/vlc-android/src/org/videolan/vlc/gui/video/VideoPlayerActivity.java
index 3cf8209..533cc6a 100644
--- a/vlc-android/src/org/videolan/vlc/gui/video/VideoPlayerActivity.java
+++ b/vlc-android/src/org/videolan/vlc/gui/video/VideoPlayerActivity.java
@@ -1523,30 +1523,8 @@ public class VideoPlayerActivity extends AppCompatActivity implements IVLCVout.C
return;
mService.removeCallback(this);
mService.stop();
- mAlertDialog = new AlertDialog.Builder(VideoPlayerActivity.this)
- .setPositiveButton(R.string.ok, new DialogInterface.OnClickListener() {
- @Override
- public void onClick(DialogInterface dialog, int id) {
- loadMedia();
- }
- })
- .setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
- @Override
- public void onClick(DialogInterface dialog, int id) {
- exit(RESULT_HARDWARE_ACCELERATION_ERROR);
- }
- })
- .setOnCancelListener(new DialogInterface.OnCancelListener() {
- @Override
- public void onCancel(DialogInterface dialog) {
- exit(RESULT_HARDWARE_ACCELERATION_ERROR);
- }
- })
- .setTitle(R.string.hardware_acceleration_error_title)
- .setMessage(R.string.hardware_acceleration_error_message)
- .create();
if(!isFinishing())
- mAlertDialog.show();
+ loadMedia();
}
private void handleVout(int voutCount) {
More information about the Android
mailing list