Verified Commit a6cd8937 authored by Torsten Grote's avatar Torsten Grote Committed by akwizgran

Remove space reserved for icons from preferences

Works around https://issuetracker.google.com/issues/111907042

Might be replacable with a solution from
https://issuetracker.google.com/issues/111907042 in the future.
parent e8566906
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<PreferenceScreen <PreferenceScreen
xmlns:android="http://schemas.android.com/apk/res/android"> xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<SwitchPreference <SwitchPreference
android:defaultValue="true" android:defaultValue="true"
android:key="pref_key_lock" android:key="pref_key_lock"
android:summary="@string/panic_setting_signout_summary" android:summary="@string/panic_setting_signout_summary"
android:title="@string/panic_setting_signout_title"/> android:title="@string/panic_setting_signout_title"
app:iconSpaceReserved="false"/>
<PreferenceCategory <PreferenceCategory
android:layout="@layout/preferences_category" android:layout="@layout/preferences_category"
...@@ -23,7 +25,8 @@ ...@@ -23,7 +25,8 @@
android:enabled="false" android:enabled="false"
android:key="pref_key_purge" android:key="pref_key_purge"
android:summary="@string/purge_setting_summary" android:summary="@string/purge_setting_summary"
android:title="@string/purge_setting_title"/> android:title="@string/purge_setting_title"
app:iconSpaceReserved="false"/>
</PreferenceCategory> </PreferenceCategory>
......
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<PreferenceScreen <PreferenceScreen
xmlns:android="http://schemas.android.com/apk/res/android"> xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<PreferenceCategory <PreferenceCategory
android:layout="@layout/preferences_category" android:layout="@layout/preferences_category"
android:title="@string/display_settings_title"> android:title="@string/display_settings_title">
...@@ -10,7 +11,8 @@ ...@@ -10,7 +11,8 @@
android:entryValues="@array/pref_language_values" android:entryValues="@array/pref_language_values"
android:key="pref_key_language" android:key="pref_key_language"
android:summary="%s" android:summary="%s"
android:title="@string/pref_language_title"/> android:title="@string/pref_language_title"
app:iconSpaceReserved="false"/>
<ListPreference <ListPreference
android:defaultValue="@string/pref_theme_light_value" android:defaultValue="@string/pref_theme_light_value"
...@@ -18,8 +20,9 @@ ...@@ -18,8 +20,9 @@
android:entryValues="@array/pref_theme_values" android:entryValues="@array/pref_theme_values"
android:key="pref_key_theme" android:key="pref_key_theme"
android:summary="%s" android:summary="%s"
android:title="@string/pref_theme_title"/> android:title="@string/pref_theme_title"
app:iconSpaceReserved="false"/>
</PreferenceCategory> </PreferenceCategory>
<PreferenceCategory <PreferenceCategory
...@@ -33,7 +36,8 @@ ...@@ -33,7 +36,8 @@
android:key="pref_key_bluetooth" android:key="pref_key_bluetooth"
android:persistent="false" android:persistent="false"
android:summary="%s" android:summary="%s"
android:title="@string/bluetooth_setting"/> android:title="@string/bluetooth_setting"
app:iconSpaceReserved="false"/>
<ListPreference <ListPreference
android:defaultValue="0" android:defaultValue="0"
...@@ -42,14 +46,16 @@ ...@@ -42,14 +46,16 @@
android:key="pref_key_tor_network" android:key="pref_key_tor_network"
android:persistent="false" android:persistent="false"
android:summary="%s" android:summary="%s"
android:title="@string/tor_network_setting"/> android:title="@string/tor_network_setting"
app:iconSpaceReserved="false"/>
<SwitchPreference <SwitchPreference
android:defaultValue="true" android:defaultValue="true"
android:key="pref_key_tor_mobile_data" android:key="pref_key_tor_mobile_data"
android:persistent="false" android:persistent="false"
android:title="@string/tor_mobile_data_title" android:title="@string/tor_mobile_data_title"
android:widgetLayout="@layout/preference_switch_compat"/> android:widgetLayout="@layout/preference_switch_compat"
app:iconSpaceReserved="false"/>
</PreferenceCategory> </PreferenceCategory>
...@@ -63,7 +69,8 @@ ...@@ -63,7 +69,8 @@
android:persistent="false" android:persistent="false"
android:summary="@string/pref_lock_summary" android:summary="@string/pref_lock_summary"
android:title="@string/pref_lock_title" android:title="@string/pref_lock_title"
android:widgetLayout="@layout/preference_switch_compat"/> android:widgetLayout="@layout/preference_switch_compat"
app:iconSpaceReserved="false"/>
<ListPreference <ListPreference
android:defaultValue="@string/pref_lock_timeout_value_default" android:defaultValue="@string/pref_lock_timeout_value_default"
...@@ -73,11 +80,13 @@ ...@@ -73,11 +80,13 @@
android:key="pref_key_lock_timeout" android:key="pref_key_lock_timeout"
android:persistent="false" android:persistent="false"
android:summary="@string/pref_lock_timeout_summary" android:summary="@string/pref_lock_timeout_summary"
android:title="@string/pref_lock_timeout_title"/> android:title="@string/pref_lock_timeout_title"
app:iconSpaceReserved="false"/>
<Preference <Preference
android:key="pref_key_change_password" android:key="pref_key_change_password"
android:title="@string/change_password"> android:title="@string/change_password"
app:iconSpaceReserved="false">
<intent <intent
android:targetClass="org.briarproject.briar.android.login.ChangePasswordActivity" android:targetClass="org.briarproject.briar.android.login.ChangePasswordActivity"
...@@ -92,7 +101,8 @@ ...@@ -92,7 +101,8 @@
<Preference <Preference
android:summary="@string/panic_setting_hint" android:summary="@string/panic_setting_hint"
android:title="@string/panic_setting"> android:title="@string/panic_setting"
app:iconSpaceReserved="false">
<intent <intent
android:targetClass="org.briarproject.briar.android.panic.PanicPreferencesActivity" android:targetClass="org.briarproject.briar.android.panic.PanicPreferencesActivity"
...@@ -111,7 +121,8 @@ ...@@ -111,7 +121,8 @@
android:key="pref_key_notify_sign_in" android:key="pref_key_notify_sign_in"
android:summary="@string/notify_sign_in_summary" android:summary="@string/notify_sign_in_summary"
android:title="@string/notify_sign_in_title" android:title="@string/notify_sign_in_title"
android:widgetLayout="@layout/preference_switch_compat"/> android:widgetLayout="@layout/preference_switch_compat"
app:iconSpaceReserved="false"/>
<SwitchPreference <SwitchPreference
android:defaultValue="true" android:defaultValue="true"
...@@ -119,7 +130,8 @@ ...@@ -119,7 +130,8 @@
android:persistent="false" android:persistent="false"
android:summary="@string/notify_private_messages_setting_summary" android:summary="@string/notify_private_messages_setting_summary"
android:title="@string/notify_private_messages_setting_title" android:title="@string/notify_private_messages_setting_title"
android:widgetLayout="@layout/preference_switch_compat"/> android:widgetLayout="@layout/preference_switch_compat"
app:iconSpaceReserved="false"/>
<SwitchPreference <SwitchPreference
android:defaultValue="true" android:defaultValue="true"
...@@ -127,7 +139,8 @@ ...@@ -127,7 +139,8 @@
android:persistent="false" android:persistent="false"
android:summary="@string/notify_group_messages_setting_summary" android:summary="@string/notify_group_messages_setting_summary"
android:title="@string/notify_group_messages_setting_title" android:title="@string/notify_group_messages_setting_title"
android:widgetLayout="@layout/preference_switch_compat"/> android:widgetLayout="@layout/preference_switch_compat"
app:iconSpaceReserved="false"/>
<SwitchPreference <SwitchPreference
android:defaultValue="true" android:defaultValue="true"
...@@ -135,7 +148,8 @@ ...@@ -135,7 +148,8 @@
android:persistent="false" android:persistent="false"
android:summary="@string/notify_forum_posts_setting_summary" android:summary="@string/notify_forum_posts_setting_summary"
android:title="@string/notify_forum_posts_setting_title" android:title="@string/notify_forum_posts_setting_title"
android:widgetLayout="@layout/preference_switch_compat"/> android:widgetLayout="@layout/preference_switch_compat"
app:iconSpaceReserved="false"/>
<SwitchPreference <SwitchPreference
android:defaultValue="true" android:defaultValue="true"
...@@ -143,28 +157,34 @@ ...@@ -143,28 +157,34 @@
android:persistent="false" android:persistent="false"
android:summary="@string/notify_blog_posts_setting_summary" android:summary="@string/notify_blog_posts_setting_summary"
android:title="@string/notify_blog_posts_setting_title" android:title="@string/notify_blog_posts_setting_title"
android:widgetLayout="@layout/preference_switch_compat"/> android:widgetLayout="@layout/preference_switch_compat"
app:iconSpaceReserved="false"/>
<SwitchPreference <SwitchPreference
android:defaultValue="true" android:defaultValue="true"
android:key="pref_key_notify_vibration" android:key="pref_key_notify_vibration"
android:persistent="false" android:persistent="false"
android:title="@string/notify_vibration_setting" android:title="@string/notify_vibration_setting"
android:widgetLayout="@layout/preference_switch_compat"/> android:widgetLayout="@layout/preference_switch_compat"
app:iconSpaceReserved="false"/>
<Preference <Preference
android:key="pref_key_notify_sound" android:key="pref_key_notify_sound"
android:title="@string/notify_sound_setting"/> android:title="@string/notify_sound_setting"
app:iconSpaceReserved="false"/>
</PreferenceCategory> </PreferenceCategory>
<PreferenceCategory <PreferenceCategory
android:layout="@layout/preferences_category" android:layout="@layout/preferences_category"
android:title="@string/feedback_settings_title"/> android:title="@string/feedback_settings_title">
<Preference
android:key="pref_key_send_feedback"
android:title="@string/send_feedback"
app:iconSpaceReserved="false"/>
<Preference </PreferenceCategory>
android:key="pref_key_send_feedback"
android:title="@string/send_feedback"/>
<PreferenceCategory <PreferenceCategory
android:layout="@layout/preferences_category" android:layout="@layout/preferences_category"
...@@ -172,7 +192,8 @@ ...@@ -172,7 +192,8 @@
<Preference <Preference
android:key="pref_key_test_data" android:key="pref_key_test_data"
android:title="Create Test Data"> android:title="Create Test Data"
app:iconSpaceReserved="false">
<intent <intent
android:targetClass="org.briarproject.briar.android.test.TestDataActivity" android:targetClass="org.briarproject.briar.android.test.TestDataActivity"
...@@ -181,7 +202,8 @@ ...@@ -181,7 +202,8 @@
<Preference <Preference
android:key="pref_key_explode" android:key="pref_key_explode"
android:title="Crash"/> android:title="Crash"
app:iconSpaceReserved="false"/>
</PreferenceCategory> </PreferenceCategory>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment