[Android] remove widgetLayout attribute
Geoffrey Métais
git at videolan.org
Tue Oct 20 11:48:27 CEST 2015
vlc-ports/android | branch: master | Geoffrey Métais <geoffrey.metais at gmail.com> | Mon Oct 19 19:00:01 2015 +0200| [8a3e8b4ae533bd35e3c819b61fe9ec7c3b46a7a1] | committer: Geoffrey Métais
remove widgetLayout attribute
It can be set by styling and brakes display
> http://git.videolan.org/gitweb.cgi/vlc-ports/android.git/?a=commit;h=8a3e8b4ae533bd35e3c819b61fe9ec7c3b46a7a1
---
vlc-android/res/values/styles.xml | 7 +++++--
vlc-android/res/xml/preferences.xml | 3 +--
vlc-android/res/xml/preferences_adv.xml | 3 +--
vlc-android/res/xml/preferences_dev.xml | 1 -
vlc-android/res/xml/preferences_perf.xml | 2 --
vlc-android/res/xml/preferences_ui.xml | 6 ------
6 files changed, 7 insertions(+), 15 deletions(-)
diff --git a/vlc-android/res/values/styles.xml b/vlc-android/res/values/styles.xml
index 730993f..3d5b239 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/PreferenceThemeOverlay</item>
+ <item name="preferenceTheme">@style/preferencesTheme</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/PreferenceThemeOverlay</item>
+ <item name="preferenceTheme">@style/preferencesTheme</item>
<item name="colorPrimary">@color/orange800</item>
<item name="colorPrimaryDark">@android:color/transparent</item>
@@ -235,6 +235,9 @@
<style name="Toolbar.VLC" parent="ThemeOverlay.AppCompat.Dark.ActionBar"/>
+ <!-- preferences -->
+ <style name="preferencesTheme" parent="PreferenceThemeOverlay"/>
+
<!-- Tips Apearance-->
<style name="TipsFontStyle">
diff --git a/vlc-android/res/xml/preferences.xml b/vlc-android/res/xml/preferences.xml
index f07106a..1f66cf4 100644
--- a/vlc-android/res/xml/preferences.xml
+++ b/vlc-android/res/xml/preferences.xml
@@ -13,18 +13,17 @@
android:key="hardware_acceleration"
android:summary="@string/hardware_acceleration_summary"
android:title="@string/hardware_acceleration" />
+
<CheckBoxPreference
android:defaultValue="false"
android:key="video_background"
android:summary="@string/play_as_audio_background_summary"
- android:widgetLayout="@layout/custom_chexbox"
android:title="@string/play_as_audio_background" />
<android.support.v7.preference.SwitchPreferenceCompat
android:defaultValue="false"
android:key="enable_black_theme"
android:summary="@string/enable_black_theme_summary"
- android:widgetLayout="@layout/custom_chexbox"
android:title="@string/enable_black_theme" />
<ListPreference
diff --git a/vlc-android/res/xml/preferences_adv.xml b/vlc-android/res/xml/preferences_adv.xml
index dd098d8..250e459 100644
--- a/vlc-android/res/xml/preferences_adv.xml
+++ b/vlc-android/res/xml/preferences_adv.xml
@@ -15,8 +15,7 @@
android:defaultValue="true"
android:key="auto_rescan"
android:title="@string/auto_rescan"
- android:summary="@string/auto_rescan_summary"
- android:widgetLayout="@layout/custom_chexbox" />
+ android:summary="@string/auto_rescan_summary" />
<Preference
android:enabled="true"
android:key="clear_media_db"
diff --git a/vlc-android/res/xml/preferences_dev.xml b/vlc-android/res/xml/preferences_dev.xml
index b5af4ab..2750caa 100644
--- a/vlc-android/res/xml/preferences_dev.xml
+++ b/vlc-android/res/xml/preferences_dev.xml
@@ -13,7 +13,6 @@
android:defaultValue="true"
android:key="enable_verbose_mode"
android:summary="@string/enable_verbose_mode_summary"
- android:widgetLayout="@layout/custom_chexbox"
android:title="@string/enable_verbose_mode" />
<PreferenceScreen
diff --git a/vlc-android/res/xml/preferences_perf.xml b/vlc-android/res/xml/preferences_perf.xml
index 7462390..2d85866 100644
--- a/vlc-android/res/xml/preferences_perf.xml
+++ b/vlc-android/res/xml/preferences_perf.xml
@@ -21,12 +21,10 @@
android:defaultValue="false"
android:key="enable_frame_skip"
android:summary="@string/enable_frame_skip_summary"
- android:widgetLayout="@layout/custom_chexbox"
android:title="@string/enable_frame_skip" />
<CheckBoxPreference
android:defaultValue="@bool/time_stretching_default"
android:key="enable_time_stretching_audio"
android:summary="@string/enable_time_stretching_audio_summary"
- android:widgetLayout="@layout/custom_chexbox"
android:title="@string/enable_time_stretching_audio" />
</PreferenceScreen>
\ No newline at end of file
diff --git a/vlc-android/res/xml/preferences_ui.xml b/vlc-android/res/xml/preferences_ui.xml
index 1d944aa..4f1fcc3 100644
--- a/vlc-android/res/xml/preferences_ui.xml
+++ b/vlc-android/res/xml/preferences_ui.xml
@@ -10,7 +10,6 @@
android:defaultValue="false"
android:key="enable_clone_mode"
android:summary="@string/enable_clone_mode_summary"
- android:widgetLayout="@layout/custom_chexbox"
android:title="@string/enable_clone_mode" />
</PreferenceCategory>
<PreferenceCategory android:title="@string/interface_other_category" >
@@ -18,31 +17,26 @@
android:defaultValue="false"
android:key="dialog_confirm_resume"
android:summary="@string/confirm_resume_summary"
- android:widgetLayout="@layout/custom_chexbox"
android:title="@string/confirm_resume_title" />
<CheckBoxPreference
android:defaultValue="false"
android:key="force_list_portrait"
android:summary="@string/force_list_portrait_summary"
- android:widgetLayout="@layout/custom_chexbox"
android:title="@string/force_list_portrait" />
<CheckBoxPreference
android:defaultValue="true"
android:key="enable_brightness_gesture"
android:summary="@string/enable_brightness_gesture_summary"
- android:widgetLayout="@layout/custom_chexbox"
android:title="@string/enable_brightness_gesture" />
<CheckBoxPreference
android:defaultValue="true"
android:key="enable_headset_detection"
android:summary="@string/enable_headset_detection_summary"
- android:widgetLayout="@layout/custom_chexbox"
android:title="@string/enable_headset_detection" />
<CheckBoxPreference
android:defaultValue="false"
android:key="enable_steal_remote_control"
android:summary="@string/enable_steal_remote_control_summary"
- android:widgetLayout="@layout/custom_chexbox"
android:title="@string/enable_steal_remote_control" />
<ListPreference
android:defaultValue="0"
More information about the Android
mailing list