[Android] Remove custom checkbox layout

Geoffrey Métais git at videolan.org
Tue Oct 20 11:48:30 CEST 2015


vlc-ports/android | branch: master | Geoffrey Métais <geoffrey.metais at gmail.com> | Tue Oct 20 11:14:13 2015 +0200| [f0360bda0465398597581469e4ed47eee4f1adb1] | committer: Geoffrey Métais

Remove custom checkbox layout

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

 vlc-android/res/drawable-hdpi/ic_checkbox_false.png        |  Bin 276 -> 0 bytes
 .../res/drawable-hdpi/ic_checkbox_false_disable.png        |  Bin 282 -> 0 bytes
 vlc-android/res/drawable-hdpi/ic_checkbox_true.png         |  Bin 364 -> 0 bytes
 vlc-android/res/drawable-hdpi/ic_checkbox_true_disable.png |  Bin 404 -> 0 bytes
 vlc-android/res/drawable-ldpi/ic_checkbox_false.png        |  Bin 247 -> 0 bytes
 .../res/drawable-ldpi/ic_checkbox_false_disable.png        |  Bin 243 -> 0 bytes
 vlc-android/res/drawable-ldpi/ic_checkbox_true.png         |  Bin 333 -> 0 bytes
 vlc-android/res/drawable-ldpi/ic_checkbox_true_disable.png |  Bin 308 -> 0 bytes
 vlc-android/res/drawable-mdpi/ic_checkbox_false.png        |  Bin 227 -> 0 bytes
 .../res/drawable-mdpi/ic_checkbox_false_disable.png        |  Bin 226 -> 0 bytes
 vlc-android/res/drawable-mdpi/ic_checkbox_true.png         |  Bin 283 -> 0 bytes
 vlc-android/res/drawable-mdpi/ic_checkbox_true_disable.png |  Bin 308 -> 0 bytes
 vlc-android/res/drawable-xhdpi/ic_checkbox_false.png       |  Bin 329 -> 0 bytes
 .../res/drawable-xhdpi/ic_checkbox_false_disable.png       |  Bin 333 -> 0 bytes
 vlc-android/res/drawable-xhdpi/ic_checkbox_true.png        |  Bin 446 -> 0 bytes
 .../res/drawable-xhdpi/ic_checkbox_true_disable.png        |  Bin 485 -> 0 bytes
 vlc-android/res/drawable/custom_checkbox_button.xml        |   12 ------------
 vlc-android/res/layout/browser_item.xml                    |    1 -
 vlc-android/res/layout/custom_chexbox.xml                  |    8 --------
 vlc-android/res/layout/directory_view_item.xml             |    1 -
 vlc-android/res/values/styles.xml                          |    7 ++-----
 21 files changed, 2 insertions(+), 27 deletions(-)

diff --git a/vlc-android/res/drawable-hdpi/ic_checkbox_false.png b/vlc-android/res/drawable-hdpi/ic_checkbox_false.png
deleted file mode 100644
index 69c8181..0000000
Binary files a/vlc-android/res/drawable-hdpi/ic_checkbox_false.png and /dev/null differ
diff --git a/vlc-android/res/drawable-hdpi/ic_checkbox_false_disable.png b/vlc-android/res/drawable-hdpi/ic_checkbox_false_disable.png
deleted file mode 100644
index 43e0259..0000000
Binary files a/vlc-android/res/drawable-hdpi/ic_checkbox_false_disable.png and /dev/null differ
diff --git a/vlc-android/res/drawable-hdpi/ic_checkbox_true.png b/vlc-android/res/drawable-hdpi/ic_checkbox_true.png
deleted file mode 100644
index f02f1f3..0000000
Binary files a/vlc-android/res/drawable-hdpi/ic_checkbox_true.png and /dev/null differ
diff --git a/vlc-android/res/drawable-hdpi/ic_checkbox_true_disable.png b/vlc-android/res/drawable-hdpi/ic_checkbox_true_disable.png
deleted file mode 100644
index 76911e6..0000000
Binary files a/vlc-android/res/drawable-hdpi/ic_checkbox_true_disable.png and /dev/null differ
diff --git a/vlc-android/res/drawable-ldpi/ic_checkbox_false.png b/vlc-android/res/drawable-ldpi/ic_checkbox_false.png
deleted file mode 100644
index 84ce15c..0000000
Binary files a/vlc-android/res/drawable-ldpi/ic_checkbox_false.png and /dev/null differ
diff --git a/vlc-android/res/drawable-ldpi/ic_checkbox_false_disable.png b/vlc-android/res/drawable-ldpi/ic_checkbox_false_disable.png
deleted file mode 100644
index d9dfe9e..0000000
Binary files a/vlc-android/res/drawable-ldpi/ic_checkbox_false_disable.png and /dev/null differ
diff --git a/vlc-android/res/drawable-ldpi/ic_checkbox_true.png b/vlc-android/res/drawable-ldpi/ic_checkbox_true.png
deleted file mode 100644
index 84e720c..0000000
Binary files a/vlc-android/res/drawable-ldpi/ic_checkbox_true.png and /dev/null differ
diff --git a/vlc-android/res/drawable-ldpi/ic_checkbox_true_disable.png b/vlc-android/res/drawable-ldpi/ic_checkbox_true_disable.png
deleted file mode 100644
index 24fc8f2..0000000
Binary files a/vlc-android/res/drawable-ldpi/ic_checkbox_true_disable.png and /dev/null differ
diff --git a/vlc-android/res/drawable-mdpi/ic_checkbox_false.png b/vlc-android/res/drawable-mdpi/ic_checkbox_false.png
deleted file mode 100644
index 085f9df..0000000
Binary files a/vlc-android/res/drawable-mdpi/ic_checkbox_false.png and /dev/null differ
diff --git a/vlc-android/res/drawable-mdpi/ic_checkbox_false_disable.png b/vlc-android/res/drawable-mdpi/ic_checkbox_false_disable.png
deleted file mode 100644
index 47aa433..0000000
Binary files a/vlc-android/res/drawable-mdpi/ic_checkbox_false_disable.png and /dev/null differ
diff --git a/vlc-android/res/drawable-mdpi/ic_checkbox_true.png b/vlc-android/res/drawable-mdpi/ic_checkbox_true.png
deleted file mode 100644
index 8a6f52f..0000000
Binary files a/vlc-android/res/drawable-mdpi/ic_checkbox_true.png and /dev/null differ
diff --git a/vlc-android/res/drawable-mdpi/ic_checkbox_true_disable.png b/vlc-android/res/drawable-mdpi/ic_checkbox_true_disable.png
deleted file mode 100644
index 05f2f5b..0000000
Binary files a/vlc-android/res/drawable-mdpi/ic_checkbox_true_disable.png and /dev/null differ
diff --git a/vlc-android/res/drawable-xhdpi/ic_checkbox_false.png b/vlc-android/res/drawable-xhdpi/ic_checkbox_false.png
deleted file mode 100644
index 7bfb529..0000000
Binary files a/vlc-android/res/drawable-xhdpi/ic_checkbox_false.png and /dev/null differ
diff --git a/vlc-android/res/drawable-xhdpi/ic_checkbox_false_disable.png b/vlc-android/res/drawable-xhdpi/ic_checkbox_false_disable.png
deleted file mode 100644
index 1f089de..0000000
Binary files a/vlc-android/res/drawable-xhdpi/ic_checkbox_false_disable.png and /dev/null differ
diff --git a/vlc-android/res/drawable-xhdpi/ic_checkbox_true.png b/vlc-android/res/drawable-xhdpi/ic_checkbox_true.png
deleted file mode 100644
index faf1eb7..0000000
Binary files a/vlc-android/res/drawable-xhdpi/ic_checkbox_true.png and /dev/null differ
diff --git a/vlc-android/res/drawable-xhdpi/ic_checkbox_true_disable.png b/vlc-android/res/drawable-xhdpi/ic_checkbox_true_disable.png
deleted file mode 100644
index a709406..0000000
Binary files a/vlc-android/res/drawable-xhdpi/ic_checkbox_true_disable.png and /dev/null differ
diff --git a/vlc-android/res/drawable/custom_checkbox_button.xml b/vlc-android/res/drawable/custom_checkbox_button.xml
deleted file mode 100644
index f56c7d6..0000000
--- a/vlc-android/res/drawable/custom_checkbox_button.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/ic_checkbox_false"
-        android:state_enabled="true" android:state_checked="false" />
-    <item android:drawable="@drawable/ic_checkbox_false_disable"
-        android:state_enabled="false" android:state_checked="false" />
-    <item android:drawable="@drawable/ic_checkbox_true"
-        android:state_enabled="true" android:state_checked="true" />
-    <item android:drawable="@drawable/ic_checkbox_true_disable"
-        android:state_enabled="false" android:state_checked="true" />
-    <item android:drawable="@drawable/ic_checkbox_false" />
-</selector>
\ No newline at end of file
diff --git a/vlc-android/res/layout/browser_item.xml b/vlc-android/res/layout/browser_item.xml
index 4ebf006..a341a98 100644
--- a/vlc-android/res/layout/browser_item.xml
+++ b/vlc-android/res/layout/browser_item.xml
@@ -11,7 +11,6 @@
         android:id="@+id/browser_item_selected"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:button="@drawable/custom_checkbox_button"
         android:focusable="false" />
     <TextView
         android:id="@+id/browser_item_dir"
diff --git a/vlc-android/res/layout/custom_chexbox.xml b/vlc-android/res/layout/custom_chexbox.xml
deleted file mode 100644
index e5323b3..0000000
--- a/vlc-android/res/layout/custom_chexbox.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<CheckBox xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+android:id/checkbox"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:focusable="false"
-    android:clickable="false"
-    android:button="@drawable/custom_checkbox_button"/>
\ No newline at end of file
diff --git a/vlc-android/res/layout/directory_view_item.xml b/vlc-android/res/layout/directory_view_item.xml
index f42873e..553fe48 100644
--- a/vlc-android/res/layout/directory_view_item.xml
+++ b/vlc-android/res/layout/directory_view_item.xml
@@ -40,7 +40,6 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
-            android:button="@drawable/custom_checkbox_button"
             android:layout_marginLeft="15dp"
             android:visibility="@{type == 2 ? View.VISIBLE : View.GONE}"
             android:enabled="@{chechEnabled}"
diff --git a/vlc-android/res/values/styles.xml b/vlc-android/res/values/styles.xml
index 3d5b239..730993f 100644
--- a/vlc-android/res/values/styles.xml
+++ b/vlc-android/res/values/styles.xml
@@ -15,7 +15,7 @@
         <item name="android:gridViewStyle">@style/Theme.VLC.List</item>
         <item name="android:expandableListViewStyle">@style/Theme.VLC.List</item>
         <item name="android:dropDownListViewStyle">@style/Theme.VLC.List</item>
-        <item name="preferenceTheme">@style/preferencesTheme</item>
+        <item name="preferenceTheme">@style/PreferenceThemeOverlay</item>
 
         <item name="colorPrimary">@color/orange800</item>
         <item name="colorPrimaryDark">@color/orange700</item>
@@ -109,7 +109,7 @@
         <item name="android:gridViewStyle">@style/Theme.VLC.List</item>
         <item name="android:expandableListViewStyle">@style/Theme.VLC.List</item>
         <item name="android:dropDownListViewStyle">@style/Theme.VLC.List</item>
-        <item name="preferenceTheme">@style/preferencesTheme</item>
+        <item name="preferenceTheme">@style/PreferenceThemeOverlay</item>
 
         <item name="colorPrimary">@color/orange800</item>
         <item name="colorPrimaryDark">@android:color/transparent</item>
@@ -235,9 +235,6 @@
 
     <style name="Toolbar.VLC" parent="ThemeOverlay.AppCompat.Dark.ActionBar"/>
 
-    <!-- preferences -->
-    <style name="preferencesTheme" parent="PreferenceThemeOverlay"/>
-
     <!-- Tips Apearance-->
 
     <style name="TipsFontStyle">



More information about the Android mailing list