Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit ccb2e1ed authored by Marvin W.'s avatar Marvin W. 🐿️
Browse files

Settings: Don't reserve icon space where not needed 

Matches current system settings style
parent 9ada10c0

play-services-core/src/main/res/xml/preferences_accounts.xml

+14 −7
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">

<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:app="http://schemas.android.com/apk/res-auto">



    <PreferenceCategory

        android:key="prefcat_current_accounts"

        android:title="@string/prefcat_accounts_current_accounts_title">

        android:title="@string/prefcat_accounts_current_accounts_title"

        app:iconSpaceReserved="false">

        <Preference

            android:enabled="false"

            android:order="9"
@@ -20,26 +22,31 @@ 
    </PreferenceCategory>

    <PreferenceCategory

        android:key="prefcat_account_settings"

        android:title="@string/prefcat_accounts_settings_title">

        android:title="@string/prefcat_accounts_settings_title"

        app:iconSpaceReserved="false">

        <SwitchPreferenceCompat

            android:persistent="false"

            android:key="auth_manager_trust_google"

            android:summary="@string/pref_auth_trust_google_summary"

            android:title="@string/pref_auth_trust_google_title"/>

            android:title="@string/pref_auth_trust_google_title"

            app:iconSpaceReserved="false" />

        <SwitchPreferenceCompat

            android:persistent="false"

            android:key="auth_manager_visible"

            android:summary="@string/pref_auth_visible_summary"

            android:title="@string/pref_auth_visible_title"/>

            android:title="@string/pref_auth_visible_title"

            app:iconSpaceReserved="false" />

        <SwitchPreferenceCompat

            android:persistent="false"

            android:key="auth_include_android_id"

            android:summary="@string/pref_auth_include_android_id_summary"

            android:title="@string/pref_auth_include_android_id_title"/>

            android:title="@string/pref_auth_include_android_id_title"

            app:iconSpaceReserved="false" />

        <SwitchPreferenceCompat

            android:persistent="false"

            android:key="auth_strip_device_name"

            android:summary="@string/pref_auth_strip_device_name_summary"

            android:title="@string/pref_auth_strip_device_name_title"/>

            android:title="@string/pref_auth_strip_device_name_title"

            app:iconSpaceReserved="false" />

    </PreferenceCategory>

</PreferenceScreen>

play-services-core/src/main/res/xml/preferences_device_registration.xml

+15 −9
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

<?xml version="1.0" encoding="utf-8"?><!--

  ~ SPDX-FileCopyrightText: 2017, microG Project Team

  ~ SPDX-License-Identifier: Apache-2.0

  -->
@@ -15,35 +14,42 @@ 


    <PreferenceCategory

        android:key="prefcat_device_profile"

        android:title="@string/pref_device_registration_device_profile_category">

        android:title="@string/pref_device_registration_device_profile_category"

        app:iconSpaceReserved="false">

        <ListPreference

            android:key="pref_device_profile"

            android:persistent="false"

            android:title="@string/pref_device_registration_select_profile_title"

            tools:summary="Automatic (Google Pixel 3, Android 11)" />

            tools:summary="Automatic (Google Pixel 3, Android 11)"

            app:iconSpaceReserved="false" />

        <Preference

            android:key="pref_device_profile_import"

            android:summary="@string/pref_device_registration_import_custom_profile_summary"

            android:title="@string/pref_device_registration_import_custom_profile_title" />

            android:title="@string/pref_device_registration_import_custom_profile_title"

            app:iconSpaceReserved="false" />

        <Preference

            android:enabled="false"

            android:key="pref_device_serial"

            android:title="@string/pref_device_registration_serial_title"

            tools:summary="123456" />

            tools:summary="123456"

            app:iconSpaceReserved="false" />

    </PreferenceCategory>

    <PreferenceCategory

        android:key="prefcat_device_registration_status"

        android:layout="@layout/preference_category_no_label">

        android:layout="@layout/preference_category_no_label"

        app:iconSpaceReserved="false">

        <Preference

            android:enabled="false"

            android:key="pref_device_registration_status"

            android:title="@string/pref_info_status"

            tools:summary="Last registration: 13 hours ago" />

            tools:summary="Last registration: 13 hours ago"

            app:iconSpaceReserved="false" />

        <Preference

            android:enabled="false"

            android:key="pref_device_registration_android_id"

            android:title="@string/pref_device_registration_android_id"

            tools:summary="1953a59d1c1b7e4b" />

            tools:summary="1953a59d1c1b7e4b"

            app:iconSpaceReserved="false" />

    </PreferenceCategory>

    <PreferenceCategory android:layout="@layout/preference_category_no_label">

        <org.microg.gms.ui.TextPreference

play-services-core/src/main/res/xml/preferences_gcm_advanced.xml

+22 −26
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  ~ Copyright (C) 2013-2017 microG Project Team

  ~

  ~ Licensed under the Apache License, Version 2.0 (the "License");

  ~ you may not use this file except in compliance with the License.

  ~ You may obtain a copy of the License at

  ~

  ~     http://www.apache.org/licenses/LICENSE-2.0

  ~

  ~ Unless required by applicable law or agreed to in writing, software

  ~ distributed under the License is distributed on an "AS IS" BASIS,

  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  ~ See the License for the specific language governing permissions and

  ~ limitations under the License.

<?xml version="1.0" encoding="utf-8"?><!--

  ~ SPDX-FileCopyrightText: 2013 microG Project Team

  ~ SPDX-License-Identifier: Apache-2.0

  -->



<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">

<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:app="http://schemas.android.com/apk/res-auto"

    xmlns:tools="http://schemas.android.com/tools">



    <SwitchPreferenceCompat

        android:defaultValue="false"

        android:persistent="false"

        android:key="gcm_confirm_new_apps"

        android:summary="@string/pref_gcm_confirm_new_apps_summary"

        android:title="@string/pref_gcm_confirm_new_apps_title"/>

        android:title="@string/pref_gcm_confirm_new_apps_title"

        app:iconSpaceReserved="false" />



    <PreferenceCategory

        android:key="prefcat_networks"

        android:title="@string/prefcat_push_networks_title">

        android:title="@string/prefcat_push_networks_title"

        app:iconSpaceReserved="false">



        <ListPreference

            android:defaultValue="0"
@@ -34,8 +26,9 @@ 
            android:entries="@array/gcm_network_config_names"

            android:entryValues="@array/gcm_network_config_values"

            android:key="gcm_network_mobile"

            android:summary="ON / Automatic: 13 min"

            android:title="@string/network_type_mobile"/>

            android:title="@string/network_type_mobile"

            tools:summary="ON / Automatic: 13 min"

            app:iconSpaceReserved="false" />



        <ListPreference

            android:defaultValue="0"
@@ -43,8 +36,9 @@ 
            android:entries="@array/gcm_network_config_names"

            android:entryValues="@array/gcm_network_config_values"

            android:key="gcm_network_wifi"

            android:summary="ON / Manual: 30 min"

            android:title="@string/network_type_wifi"/>

            android:title="@string/network_type_wifi"

            tools:summary="ON / Manual: 30 min"

            app:iconSpaceReserved="false" />



        <ListPreference

            android:defaultValue="0"
@@ -52,8 +46,9 @@ 
            android:entries="@array/gcm_network_config_names"

            android:entryValues="@array/gcm_network_config_values"

            android:key="gcm_network_roaming"

            android:summary="OFF"

            android:title="@string/network_type_roaming"/>

            android:title="@string/network_type_roaming"

            tools:summary="OFF"

            app:iconSpaceReserved="false" />



        <ListPreference

            android:defaultValue="0"
@@ -61,8 +56,9 @@ 
            android:entries="@array/gcm_network_config_names"

            android:entryValues="@array/gcm_network_config_values"

            android:key="gcm_network_other"

            android:summary="ON / Automatic: 30 min"

            android:title="@string/network_type_other"/>

            android:title="@string/network_type_other"

            tools:summary="ON / Automatic: 30 min"

            app:iconSpaceReserved="false" />



    </PreferenceCategory>

</PreferenceScreen>

play-services-core/src/main/res/xml/preferences_push_notifications.xml

+7 −4
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?><!--

  ~ SPDX-FileCopyrightText: 2020, microG Project Team

  ~ SPDX-FileCopyrightText: 2020 microG Project Team

  ~ SPDX-License-Identifier: Apache-2.0

  -->
@@ -15,7 +15,8 @@ 


    <PreferenceCategory

        android:key="prefcat_push_apps"

        android:title="@string/prefcat_push_apps_title">

        android:title="@string/prefcat_push_apps_title"

        app:iconSpaceReserved="false">

        <Preference

            android:enabled="false"

            android:key="pref_push_apps_none"
@@ -28,12 +29,14 @@ 
    </PreferenceCategory>

    <PreferenceCategory

        android:key="prefcat_push_status"

        android:layout="@layout/preference_category_no_label">

        android:layout="@layout/preference_category_no_label"

        app:iconSpaceReserved="false">

        <Preference

            android:key="pref_push_status"

            android:enabled="false"

            android:title="@string/pref_info_status"

            tools:summary="Connected since 15 minutes ago" />

            tools:summary="Connected since 15 minutes ago"

            app:iconSpaceReserved="false" />

    </PreferenceCategory>

    <PreferenceCategory android:layout="@layout/preference_category_no_label">

        <org.microg.gms.ui.TextPreference

play-services-core/src/main/res/xml/preferences_push_notifications_all_apps.xml

+6 −4
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  ~ SPDX-FileCopyrightText: 2020, microG Project Team

<?xml version="1.0" encoding="utf-8"?><!--

  ~ SPDX-FileCopyrightText: 2020 microG Project Team

  ~ SPDX-License-Identifier: Apache-2.0

  -->
@@ -11,11 +10,13 @@ 
    <Preference

        android:key="pref_push_apps_all_progress"

        android:layout="@layout/preference_progress_bar"

        app:allowDividerBelow="false" />

        app:allowDividerBelow="false"

        app:iconSpaceReserved="false" />

    <PreferenceCategory

        android:key="prefcat_push_apps_registered"

        android:title="@string/prefcat_push_apps_registered_title"

        app:isPreferenceVisible="false"

        app:iconSpaceReserved="false"

        tools:isPreferenceVisible="true">

        <Preference

            android:enabled="false"
@@ -28,6 +29,7 @@ 
        android:key="prefcat_push_apps_unregistered"

        android:title="@string/prefcat_push_apps_unregistered_title"

        app:isPreferenceVisible="false"

        app:iconSpaceReserved="false"

        tools:isPreferenceVisible="true">

        <Preference

            android:enabled="false"