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

Commit 17521d0a authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Revert "Revert "Make subsettings display edge-to-edge""" into qt-dev

parents 5513a9bd b4b77259

AndroidManifest.xml

+2 −1
Original line number Diff line number Diff line
@@ -164,7 +164,8 @@ 
        </receiver>



        <activity android:name=".SubSettings"

                android:parentActivityName="Settings" />

                android:parentActivityName="Settings"

                android:theme="@style/Theme.SubSettings"/>



        <activity android:name=".Settings$CreateShortcutActivity"

                  android:label="@string/settings_shortcut">

color-check-baseline.xml

+123 −139

File changed.

Preview size limit exceeded, changes collapsed.

res/layout/preference_list_fragment.xml

+3 −1
Original line number Diff line number Diff line
@@ -27,6 +27,8 @@ 
    <FrameLayout android:id="@+id/pinned_header"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:background="?android:attr/windowBackground"

        android:elevation="1dp"

        android:visibility="gone"/>



    <FrameLayout

res/layout/settings_base_layout.xml

+2 −2
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
    xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:fitsSystemWindows="true"

    android:orientation="vertical">

    <Toolbar

        android:id="@+id/action_bar"
@@ -30,6 +31,5 @@ 
    <FrameLayout

        android:id="@+id/content_frame"

        android:layout_width="match_parent"

        android:layout_height="fill_parent"

        android:background="?android:attr/windowBackground" />

        android:layout_height="match_parent"/>

</LinearLayout>

res/layout/settings_main_prefs.xml

+13 −19
Original line number Diff line number Diff line
@@ -22,13 +22,8 @@ 
              android:layout_height="match_parent"

              android:layout_width="match_parent">



    <LinearLayout

            android:orientation="vertical"

            android:layout_height="0px"

            android:layout_width="match_parent"

            android:layout_weight="1">



        <com.android.settings.widget.SwitchBar android:id="@+id/switch_bar"

    <com.android.settings.widget.SwitchBar

        android:id="@+id/switch_bar"

        android:layout_height="?android:attr/actionBarSize"

        android:layout_width="match_parent"

        android:theme="?attr/switchBarTheme"/>
@@ -36,9 +31,8 @@ 
    <FrameLayout

        android:id="@+id/main_content"

        android:layout_width="match_parent"

                android:layout_height="match_parent" />



    </LinearLayout>

        android:layout_height="0dp"

        android:layout_weight="1"/>



    <RelativeLayout android:id="@+id/button_bar"

                    android:layout_height="wrap_content"