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

Commit 7d87c74e authored by David Liu's avatar David Liu Committed by Android (Google) Code Review
Browse files

Merge "[Expressive] Replace no label preference group with... 

Merge "[Expressive] Replace no label preference group with SettingsTitlelessPreferenceCategory to add proper padding" into main
parents 6792db48 5fde5be8

res/layout/preference_category_no_label.xml

deleted100644 → 0
+0 −20
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

     Copyright (C) 2016 The Android Open Source Project



     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.

-->

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

    android:layout_width="match_parent"

    android:layout_height="0dp" />

res/xml/adb_device_details_fragment.xml

+3 −4
Original line number Diff line number Diff line
@@ -30,9 +30,8 @@ 
        android:selectable="false" />



    <!-- Device Fingerprint Details -->

    <PreferenceCategory

            android:key="fingerprint_category"

            android:layout="@layout/preference_category_no_label">

    </PreferenceCategory>

    <com.android.settingslib.widget.SettingsTitlelessPreferenceCategory

            android:key="fingerprint_category">

    </com.android.settingslib.widget.SettingsTitlelessPreferenceCategory>

</PreferenceScreen>

res/xml/adb_wireless_settings.xml

+5 −8
Original line number Diff line number Diff line
@@ -19,8 +19,7 @@ 
        xmlns:settings="http://schemas.android.com/apk/res-auto"

        android:title="@string/adb_wireless_settings">



    <PreferenceCategory

        android:layout="@layout/preference_category_no_label">

    <com.android.settingslib.widget.SettingsTitlelessPreferenceCategory>

        <!-- ADB device name -->

        <Preference

            android:key="adb_device_name_pref"
@@ -37,12 +36,11 @@ 
            android:summary="@string/summary_placeholder"

            android:selectable="false"

            settings:enableCopying="true"/>

    </PreferenceCategory>

    </com.android.settingslib.widget.SettingsTitlelessPreferenceCategory>



    <!-- Pairing methods category -->

    <PreferenceCategory

    <com.android.settingslib.widget.SettingsTitlelessPreferenceCategory

        android:key="adb_pairing_methods_category"

        android:layout="@layout/preference_category_no_label"

        settings:allowDividerAbove="true">

        <!-- qrcode scanner -->

        <Preference
@@ -56,7 +54,7 @@ 
            android:icon="@drawable/ic_password_adb_wireless"

            android:title="@string/adb_pair_method_code_title"

            android:summary="@string/adb_pair_method_code_summary"/>

    </PreferenceCategory>

    </com.android.settingslib.widget.SettingsTitlelessPreferenceCategory>



    <!-- Paired devices list -->

    <PreferenceCategory
@@ -65,9 +63,8 @@ 
        settings:allowDividerAbove="true"/>



    <!-- Off message: Shown only in the off state -->

    <PreferenceCategory

    <com.android.settingslib.widget.SettingsTitlelessPreferenceCategory

        android:key="adb_wireless_footer_category"

        android:layout="@layout/preference_category_no_label"

        settings:allowDividerAbove="false"/>



</PreferenceScreen>

res/xml/app_data_usage.xml

+3 −4
Original line number Diff line number Diff line
@@ -32,10 +32,9 @@ 
        android:key="app_data_usage_summary"

        settings:controller="com.android.settings.datausage.AppDataUsageSummaryController"/>



    <PreferenceCategory

    <com.android.settingslib.widget.SettingsTitlelessPreferenceCategory

        android:key="app_data_usage_settings_category"

        settings:isPreferenceVisible="@bool/config_show_sim_info"

        android:layout="@layout/preference_category_no_label">

        settings:isPreferenceVisible="@bool/config_show_sim_info">



        <Preference

            android:key="app_settings"
@@ -56,7 +55,7 @@ 
            settings:useAdditionalSummary="true"

            settings:restrictedSwitchSummary="@string/disabled_by_admin" />



    </PreferenceCategory>

    </com.android.settingslib.widget.SettingsTitlelessPreferenceCategory>



    <PreferenceCategory

        android:key="app_list"

res/xml/app_storage_settings.xml

+2 −3
Original line number Diff line number Diff line
@@ -67,15 +67,14 @@ 


    </PreferenceCategory>



    <PreferenceCategory

    <com.android.settingslib.widget.SettingsTitlelessPreferenceCategory

        android:key="uri_category"

        android:layout="@layout/preference_category_no_label"

        settings:allowDividerAbove="false"

        settings:allowDividerBelow="false">

        <com.android.settingslib.widget.LayoutPreference

            android:key="clear_uri_button"

            android:layout="@layout/single_button_panel"

            android:selectable="false" />

    </PreferenceCategory>

    </com.android.settingslib.widget.SettingsTitlelessPreferenceCategory>



</PreferenceScreen>