TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-11-24 02:25:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix preference divider crash on KitKat

Browse Source 
Closes #6546
Fixes #6544
// FREEBIE
This commit is contained in:
Mateo Hernandez 2017-04-19 19:21:04 -05:00 committed by Moxie Marlinspike
parent 9c5fe77e96
commit 9716849bb9
5 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
res/drawable/preference_divider_dark.xml Normal file
View File

@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<shape>
<padding android:top="1dp" android:right="0dp" android:bottom="0dp" android:left="0dp" />
<solid android:color="#101010" />
</shape>
</item>
<item>
<shape>
<padding android:top="1dp" android:right="0dp" android:bottom="0dp" android:left="0dp" />
<solid android:color="#222222" />
<size android:height="20dp"/>
</shape>
</item>
</layer-list>

4
res/drawable/preference_divider.xml → res/drawable/preference_divider_light.xml
View File

@ -4,14 +4,14 @@
<item> <item>
<shape> <shape>
<padding android:top="1dp" android:right="0dp" android:bottom="0dp" android:left="0dp" /> <padding android:top="1dp" android:right="0dp" android:bottom="0dp" android:left="0dp" />
<solid android:color="?preference_divider_background_dark" /> <solid android:color="#d4d4d4" />
</shape> </shape>
</item> </item>
<item> <item>
<shape> <shape>
<padding android:top="1dp" android:right="0dp" android:bottom="0dp" android:left="0dp" /> <padding android:top="1dp" android:right="0dp" android:bottom="0dp" android:left="0dp" />
<solid android:color="?preference_divider_background_light" /> <solid android:color="#dddddd" />
<size android:height="20dp"/> <size android:height="20dp"/>
</shape> </shape>
</item> </item>

2
res/layout/preference_divider.xml
View File

@ -9,6 +9,6 @@
<View <View
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="10dp" android:layout_height="10dp"
android:background="@drawable/preference_divider"/> android:background="?pref_divider"/>
</LinearLayout> </LinearLayout>

3
res/values/attrs.xml
View File

@ -125,8 +125,7 @@
<attr name="pref_ic_devices" format="reference" /> <attr name="pref_ic_devices" format="reference" />
<attr name="pref_ic_advanced" format="reference" /> <attr name="pref_ic_advanced" format="reference" />
<attr name="preference_divider_background_light" format="color" /> <attr name="pref_divider" format="reference" />
<attr name="preference_divider_background_dark" format="color"/>
<attr name="app_protect_timeout_picker_color" format="reference"/> <attr name="app_protect_timeout_picker_color" format="reference"/>

6
res/values/themes.xml
View File

@ -216,8 +216,7 @@
<item name="pref_ic_devices">@drawable/ic_laptop_black_24dp</item> <item name="pref_ic_devices">@drawable/ic_laptop_black_24dp</item>
<item name="pref_ic_advanced">@drawable/ic_advanced_black_24dp</item> <item name="pref_ic_advanced">@drawable/ic_advanced_black_24dp</item>
<item name="preference_divider_background_light">#dddddd</item> <item name="pref_divider">@drawable/preference_divider_light</item>
<item name="preference_divider_background_dark">#d4d4d4</item>
<item name="app_protect_timeout_picker_color">@style/BetterPickersDialogFragment.Light</item> <item name="app_protect_timeout_picker_color">@style/BetterPickersDialogFragment.Light</item>
@ -349,8 +348,7 @@
<item name="pref_ic_devices">@drawable/ic_laptop_white_24dp</item> <item name="pref_ic_devices">@drawable/ic_laptop_white_24dp</item>
<item name="pref_ic_advanced">@drawable/ic_advanced_white_24dp</item> <item name="pref_ic_advanced">@drawable/ic_advanced_white_24dp</item>
<item name="preference_divider_background_light">#222222</item> <item name="pref_divider">@drawable/preference_divider_dark</item>
<item name="preference_divider_background_dark">#101010</item>
<item name="app_protect_timeout_picker_color">@style/BetterPickersDialogFragment</item> <item name="app_protect_timeout_picker_color">@style/BetterPickersDialogFragment</item>