[Android] redesign lock & locked icons

Sébastien Toque git at videolan.org
Sun Dec 15 21:50:45 CET 2013


vlc-ports/android | branch: master | Sébastien Toque <xilasz at gmail.com> | Sun Dec 15 20:52:51 2013 +0100| [c1de512add3c95c0adc135b5ad2fe26913c6af36] | committer: Sébastien Toque

redesign lock & locked icons

> http://git.videolan.org/gitweb.cgi/vlc-ports/android.git/?a=commit;h=c1de512add3c95c0adc135b5ad2fe26913c6af36
---

 vlc-android/res/drawable-hdpi/lock.png                             |  Bin 0 -> 303 bytes
 vlc-android/res/drawable-hdpi/locked.png                           |  Bin 0 -> 299 bytes
 vlc-android/res/drawable-ldpi/lock.png                             |  Bin 0 -> 188 bytes
 vlc-android/res/drawable-ldpi/locked.png                           |  Bin 0 -> 185 bytes
 vlc-android/res/drawable-mdpi/lock.png                             |  Bin 0 -> 214 bytes
 vlc-android/res/drawable-mdpi/locked.png                           |  Bin 0 -> 217 bytes
 vlc-android/res/drawable-xhdpi/lock.png                            |  Bin 0 -> 388 bytes
 vlc-android/res/drawable-xhdpi/locked.png                          |  Bin 0 -> 366 bytes
 vlc-android/res/drawable/ic_lock.png                               |  Bin 7612 -> 0 bytes
 vlc-android/res/drawable/ic_lock_glow.png                          |  Bin 9902 -> 0 bytes
 vlc-android/res/layout/player.xml                                  |    2 +-
 .../src/org/videolan/vlc/gui/video/VideoPlayerActivity.java        |    4 ++--
 12 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/vlc-android/res/drawable-hdpi/lock.png b/vlc-android/res/drawable-hdpi/lock.png
new file mode 100644
index 0000000..ac0d304
Binary files /dev/null and b/vlc-android/res/drawable-hdpi/lock.png differ
diff --git a/vlc-android/res/drawable-hdpi/locked.png b/vlc-android/res/drawable-hdpi/locked.png
new file mode 100644
index 0000000..e6863c0
Binary files /dev/null and b/vlc-android/res/drawable-hdpi/locked.png differ
diff --git a/vlc-android/res/drawable-ldpi/lock.png b/vlc-android/res/drawable-ldpi/lock.png
new file mode 100644
index 0000000..0558862
Binary files /dev/null and b/vlc-android/res/drawable-ldpi/lock.png differ
diff --git a/vlc-android/res/drawable-ldpi/locked.png b/vlc-android/res/drawable-ldpi/locked.png
new file mode 100644
index 0000000..560c9f9
Binary files /dev/null and b/vlc-android/res/drawable-ldpi/locked.png differ
diff --git a/vlc-android/res/drawable-mdpi/lock.png b/vlc-android/res/drawable-mdpi/lock.png
new file mode 100644
index 0000000..68c3b92
Binary files /dev/null and b/vlc-android/res/drawable-mdpi/lock.png differ
diff --git a/vlc-android/res/drawable-mdpi/locked.png b/vlc-android/res/drawable-mdpi/locked.png
new file mode 100644
index 0000000..b3e3997
Binary files /dev/null and b/vlc-android/res/drawable-mdpi/locked.png differ
diff --git a/vlc-android/res/drawable-xhdpi/lock.png b/vlc-android/res/drawable-xhdpi/lock.png
new file mode 100644
index 0000000..ec95ceb
Binary files /dev/null and b/vlc-android/res/drawable-xhdpi/lock.png differ
diff --git a/vlc-android/res/drawable-xhdpi/locked.png b/vlc-android/res/drawable-xhdpi/locked.png
new file mode 100644
index 0000000..d62bad1
Binary files /dev/null and b/vlc-android/res/drawable-xhdpi/locked.png differ
diff --git a/vlc-android/res/drawable/ic_lock.png b/vlc-android/res/drawable/ic_lock.png
deleted file mode 100644
index 4c8c5ee..0000000
Binary files a/vlc-android/res/drawable/ic_lock.png and /dev/null differ
diff --git a/vlc-android/res/drawable/ic_lock_glow.png b/vlc-android/res/drawable/ic_lock_glow.png
deleted file mode 100644
index c186e66..0000000
Binary files a/vlc-android/res/drawable/ic_lock_glow.png and /dev/null differ
diff --git a/vlc-android/res/layout/player.xml b/vlc-android/res/layout/player.xml
index 7d45be2..36b9dad 100644
--- a/vlc-android/res/layout/player.xml
+++ b/vlc-android/res/layout/player.xml
@@ -132,7 +132,7 @@
                 android:layout_alignParentLeft="true"
                 android:layout_centerVertical="true"
                 android:layout_marginRight="5dp"
-                android:background="@drawable/ic_lock" />
+                android:background="@drawable/lock" />
 
             <ImageButton
                 android:id="@+id/player_overlay_backward"
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 5a66ed3..34b048a 100644
--- a/vlc-android/src/org/videolan/vlc/gui/video/VideoPlayerActivity.java
+++ b/vlc-android/src/org/videolan/vlc/gui/video/VideoPlayerActivity.java
@@ -550,7 +550,7 @@ public class VideoPlayerActivity extends Activity implements IVideoPlayer {
                 setRequestedOrientation(getScreenOrientation());
         }
         showInfo(R.string.locked, 1000);
-        mLock.setBackgroundResource(R.drawable.ic_lock_glow);
+        mLock.setBackgroundResource(R.drawable.locked);
         mTime.setEnabled(false);
         mSeekbar.setEnabled(false);
         mLength.setEnabled(false);
@@ -565,7 +565,7 @@ public class VideoPlayerActivity extends Activity implements IVideoPlayer {
         if(mScreenOrientation == ActivityInfo.SCREEN_ORIENTATION_SENSOR)
             setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_SENSOR);
         showInfo(R.string.unlocked, 1000);
-        mLock.setBackgroundResource(R.drawable.ic_lock);
+        mLock.setBackgroundResource(R.drawable.lock);
         mTime.setEnabled(true);
         mSeekbar.setEnabled(true);
         mLength.setEnabled(true);



More information about the Android mailing list