[Android] [PATCH 1/2] Video Player Tips : Fix some bugs
Alexandre Perraud
4leyx4ndre at gmail.com
Mon Jun 2 16:17:14 CEST 2014
Signed-off-by: Alexandre Perraud <4leyx4ndre at gmail.com>
---
vlc-android/res/drawable/button_oval.xml | 6 +++---
vlc-android/res/layout/player_tips.xml | 1 -
vlc-android/src/org/videolan/vlc/gui/video/VideoPlayerActivity.java | 3 +--
3 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/vlc-android/res/drawable/button_oval.xml b/vlc-android/res/drawable/button_oval.xml
index 3c9fc10..dbfa2b2 100644
--- a/vlc-android/res/drawable/button_oval.xml
+++ b/vlc-android/res/drawable/button_oval.xml
@@ -1,12 +1,12 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle" >
- <solid android:color="@color/darkerorange" />
+ <solid android:color="@color/darkorange" />
<padding
android:bottom="6dp"
- android:left="6dp"
- android:right="6dp"
+ android:left="16dp"
+ android:right="16dp"
android:top="6dp" />
<corners android:radius="160dp" />
diff --git a/vlc-android/res/layout/player_tips.xml b/vlc-android/res/layout/player_tips.xml
index 08589f4..ad7dde4 100644
--- a/vlc-android/res/layout/player_tips.xml
+++ b/vlc-android/res/layout/player_tips.xml
@@ -160,7 +160,6 @@
android:background="@drawable/button_oval"
android:clickable="true"
android:onClick="onClickDismissTips"
- android:paddingLeft="5dp"
android:text="@string/ok_got_it"
android:textColor="@color/white"
android:textStyle="bold"
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 b5fbb2d..63913bf 100644
--- a/vlc-android/src/org/videolan/vlc/gui/video/VideoPlayerActivity.java
+++ b/vlc-android/src/org/videolan/vlc/gui/video/VideoPlayerActivity.java
@@ -1622,14 +1622,13 @@ public class VideoPlayerActivity extends Activity implements IVideoPlayer {
if (mShowing) {
mHandler.removeMessages(SHOW_PROGRESS);
Log.i(TAG, "remove View!");
- mOverlayTips.setVisibility(View.INVISIBLE);
+ if (mOverlayTips != null) mOverlayTips.setVisibility(View.INVISIBLE);
if (!fromUser && !mIsLocked) {
mOverlayHeader.startAnimation(AnimationUtils.loadAnimation(this, android.R.anim.fade_out));
mOverlayOption.startAnimation(AnimationUtils.loadAnimation(this, android.R.anim.fade_out));
mOverlayProgress.startAnimation(AnimationUtils.loadAnimation(this, android.R.anim.fade_out));
mPlayPause.startAnimation(AnimationUtils.loadAnimation(this, android.R.anim.fade_out));
mMenu.startAnimation(AnimationUtils.loadAnimation(this, android.R.anim.fade_out));
- //mOverlayTips.startAnimation(AnimationUtils.loadAnimation(this, android.R.anim.fade_out));
}
if (mPresentation != null) {
mOverlayBackground.startAnimation(AnimationUtils.loadAnimation(this, android.R.anim.fade_out));
--
1.9.1
More information about the Android
mailing list