[Android] Remove the beta warning
Jean-Baptiste Kempf
git at videolan.org
Fri Sep 5 22:11:23 CEST 2014
vlc-ports/android | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Fri Sep 5 22:09:20 2014 +0200| [ba2c28adea17c9c65bf892349095a2936911e1ef] | committer: Jean-Baptiste Kempf
Remove the beta warning
> http://git.videolan.org/gitweb.cgi/vlc-ports/android.git/?a=commit;h=ba2c28adea17c9c65bf892349095a2936911e1ef
---
.../src/org/videolan/vlc/gui/MainActivity.java | 33 +-------------------
1 file changed, 1 insertion(+), 32 deletions(-)
diff --git a/vlc-android/src/org/videolan/vlc/gui/MainActivity.java b/vlc-android/src/org/videolan/vlc/gui/MainActivity.java
index c1a96d3..093ec81 100644
--- a/vlc-android/src/org/videolan/vlc/gui/MainActivity.java
+++ b/vlc-android/src/org/videolan/vlc/gui/MainActivity.java
@@ -49,7 +49,6 @@ import org.videolan.vlc.widget.SlidingPaneLayout;
import android.annotation.TargetApi;
import android.app.AlertDialog;
-import android.app.Dialog;
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.DialogInterface;
@@ -79,13 +78,10 @@ import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem;
import android.view.View;
-import android.view.View.OnClickListener;
import android.view.Window;
import android.view.WindowManager;
import android.widget.AdapterView;
import android.widget.AdapterView.OnItemClickListener;
-import android.widget.Button;
-import android.widget.CheckBox;
import android.widget.EditText;
import android.widget.ListView;
import android.widget.ProgressBar;
@@ -277,10 +273,7 @@ public class MainActivity extends ActionBarActivity {
.replace(R.id.audio_player, mAudioPlayer)
.commit();
- /* Show info/alpha/beta Warning */
- if (mSettings.getInt(PREF_SHOW_INFO, -1) != mVersionNumber)
- showInfoDialog();
- else if (mFirstRun) {
+ if (mFirstRun) {
/*
* The sliding menu is automatically opened when the user closes
* the info dialog. If (for any reason) the dialog is not shown,
@@ -692,30 +685,6 @@ public class MainActivity extends ActionBarActivity {
mCurrentFragment = sharedPrefs.getString("fragment", "video");
}
- private void showInfoDialog() {
- final Dialog infoDialog = new Dialog(this, R.style.info_dialog);
- infoDialog.setContentView(R.layout.info_dialog);
- Button okButton = (Button) infoDialog.findViewById(R.id.ok);
- okButton.setOnClickListener(new OnClickListener() {
- @Override
- public void onClick(View view) {
- CheckBox notShowAgain =
- (CheckBox) infoDialog.findViewById(R.id.not_show_again);
- if (notShowAgain.isChecked() && mSettings != null) {
- Editor editor = mSettings.edit();
- editor.putInt(PREF_SHOW_INFO, mVersionNumber);
- editor.commit();
- }
- /* Close the dialog */
- infoDialog.dismiss();
- /* and finally open the sliding menu if first run */
- if (mFirstRun)
- mMenu.showMenu();
- }
- });
- infoDialog.show();
- }
-
/**
* onClick event from xml
* @param view
More information about the Android
mailing list