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

Commit 80b3bb51 authored by Bonian Chen's avatar Bonian Chen Committed by Automerger Merge Worker
Browse files

Merge "Remove PreferenceCategory wrapper" am: 75124d79 

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1394552

Change-Id: Ia40d77f7daf669323275aab1b05ba81a14c5f499
parents caf6ede5 75124d79

res/layout/night_display_activation_button.xml

+6 −5
Original line number Diff line number Diff line
@@ -15,10 +15,11 @@ 
  limitations under the License.

  -->



<FrameLayout

<LinearLayout

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

    android:layout_width="match_parent"

    android:layout_height="wrap_content">

    android:layout_height="wrap_content"

    android:minHeight="?android:attr/listPreferredItemHeight">



    <Button

        android:id="@+id/night_display_turn_on_button"
@@ -26,7 +27,7 @@ 
        android:layout_marginStart="@dimen/screen_margin_sides"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_gravity="start" />

        android:layout_gravity="center_vertical" />



    <Button

        android:id="@+id/night_display_turn_off_button"
@@ -34,6 +35,6 @@ 
        android:layout_marginStart="@dimen/screen_margin_sides"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_gravity="start" />

        android:layout_gravity="center_vertical" />



</FrameLayout>
 
 No newline at end of file
 
</LinearLayout>
 
 No newline at end of file

res/xml/mobile_network_settings_v2.xml

+11 −12
Original line number Diff line number Diff line
@@ -209,16 +209,15 @@ 
        android:key="erase_sim"

        android:persistent="false"

        android:title="@string/mobile_network_erase_sim"

        settings:allowDividerBelow="true"

        settings:controller="com.android.settings.network.telephony.DeleteSimProfilePreferenceController"/>



    <PreferenceCategory

        android:key="footer_container"

        android:title="@string/summary_placeholder"

        android:layout="@layout/preference_category_no_label"

        settings:controller="com.android.settings.network.telephony.DisableSimFooterPreferenceController">

    <com.android.settingslib.widget.FooterPreference

        android:key="disable_sim_explanation"

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

    </PreferenceCategory>

        android:title="@string/mobile_network_disable_sim_explanation"

        android:selectable="false"

        settings:allowDividerAbove="true"

        settings:searchable="false"

        settings:controller="com.android.settings.network.telephony.DisableSimFooterPreferenceController"/>



</PreferenceScreen>

res/xml/night_display_settings.xml

+9 −4
Original line number Diff line number Diff line
@@ -49,11 +49,16 @@ 
        android:title="@string/night_display_title"

        android:selectable="false"

        android:layout="@layout/night_display_activation_button"

        settings:allowDividerBelow="true"

        settings:keywords="@string/keywords_display_night_display"

        settings:controller="com.android.settings.display.NightDisplayActivationPreferenceController" />



    <PreferenceCategory android:key="night_display_footer_category">

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

    </PreferenceCategory>

    <com.android.settingslib.widget.FooterPreference

        android:key="night_display_footer"

        android:title="@string/night_display_text"

        android:selectable="false"

        settings:allowDividerAbove="true"

        settings:searchable="false"

        settings:controller="com.android.settings.display.NightDisplayFooterPreferenceController"/>



</PreferenceScreen>