[Android] Remove unused code
Alexandre Perraud
git at videolan.org
Thu Jul 30 09:48:44 CEST 2015
vlc-ports/android | branch: master | Alexandre Perraud <4leyx4ndre at gmail.com> | Wed Jul 29 19:02:33 2015 +0200| [126ca79d9d706b921f17a75faabd0aefcd5c935f] | committer: Thomas Guillem
Remove unused code
Signed-off-by: Thomas Guillem <thomas at gllm.fr>
> http://git.videolan.org/gitweb.cgi/vlc-ports/android.git/?a=commit;h=126ca79d9d706b921f17a75faabd0aefcd5c935f
---
.../vlc/gui/dialogs/TimePickerDialogFragment.java | 121 --------------------
1 file changed, 121 deletions(-)
diff --git a/vlc-android/src/org/videolan/vlc/gui/dialogs/TimePickerDialogFragment.java b/vlc-android/src/org/videolan/vlc/gui/dialogs/TimePickerDialogFragment.java
deleted file mode 100644
index 384b96d..0000000
--- a/vlc-android/src/org/videolan/vlc/gui/dialogs/TimePickerDialogFragment.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/**
- * **************************************************************************
- * TimePickerDialogFragment.java
- * ****************************************************************************
- * Copyright © 2015 VLC authors and VideoLAN
- * Author: Geoffrey Métais
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
- * ***************************************************************************
- */
-package org.videolan.vlc.gui.dialogs;
-
-import android.app.Dialog;
-import android.app.TimePickerDialog;
-import android.os.Bundle;
-import android.support.v4.app.DialogFragment;
-import android.text.format.DateFormat;
-import android.widget.TimePicker;
-
-import org.videolan.libvlc.MediaPlayer;
-import org.videolan.libvlc.util.AndroidUtil;
-import org.videolan.vlc.PlaybackService;
-import org.videolan.vlc.R;
-import org.videolan.vlc.VLCApplication;
-import org.videolan.vlc.gui.PlaybackServiceFragment;
-import org.videolan.vlc.util.VLCInstance;
-
-import java.util.Calendar;
-
-public class TimePickerDialogFragment extends DialogFragment implements TimePickerDialog.OnTimeSetListener,
- PlaybackService.Client.Callback {
- private PlaybackService mService;
- public static final int ACTION_SLEEP = 0;
- public static final int ACTION_JUMP = 1;
-
- boolean setTime = !AndroidUtil.isICSOrLater() || AndroidUtil.isLolliPopOrLater();
- int action =-1;
-
- public TimePickerDialogFragment(){}
-
- @Override
- public Dialog onCreateDialog(Bundle savedInstanceState) {
- setStyle(STYLE_NO_FRAME, R.attr.advanced_options_style);
- action = getArguments().getInt("action");
- boolean is24 = true;
- int hour = 0;
- int minute = 0;
- if (action == ACTION_SLEEP) {
- // Use the current time as the default values for the picker
- final Calendar c = VLCApplication.sPlayerSleepTime != null ?
- VLCApplication.sPlayerSleepTime : Calendar.getInstance();
- hour = c.get(Calendar.HOUR_OF_DAY);
- minute = c.get(Calendar.MINUTE);
- is24 = DateFormat.is24HourFormat(getActivity());
- }
-
- // Create a new instance of TimePickerDialog and return it
- return new TimePickerDialog(getActivity(), this, hour, minute, is24);
- }
-
- @Override
- public void onTimeSet(TimePicker view, int hourOfDay, int minute) {
- if (!setTime){ //workaround for weird ICS&JB bug
- setTime = true;
- return;
- }
- Calendar currentTime = Calendar.getInstance();
- Calendar sleepTime = Calendar.getInstance();
- sleepTime.set(Calendar.HOUR_OF_DAY, hourOfDay);
- sleepTime.set(Calendar.MINUTE, minute);
- sleepTime.set(Calendar.SECOND, 0);
- switch(action){
- case ACTION_SLEEP:
- if (sleepTime.before(currentTime))
- sleepTime.add(Calendar.DATE, 1);
-
- AdvOptionsDialog.setSleep(sleepTime);
- break;
- case ACTION_JUMP:
- long time = ( hourOfDay * 60l + minute ) * 60000l;
- if (mService != null)
- mService.setTime(time);
- break;
- }
- }
-
- @Override
- public void onStart() {
- super.onStart();
- getDialog().setCancelable(true);
- PlaybackServiceFragment.registerPlaybackService(this, this);
- }
-
- @Override
- public void onStop() {
- super.onStop();
- PlaybackServiceFragment.unregisterPlaybackService(this, this);
- }
-
- @Override
- public void onConnected(PlaybackService service) {
- mService = service;
- }
-
- @Override
- public void onDisconnected() {
- mService = null;
- }
-}
More information about the Android
mailing list