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

Commit 9d17446d authored by Lei Yu's avatar Lei Yu Committed by Android (Google) Code Review
Browse files

Merge "Move scrollview to be the parent view."

parents 6c527956 13bf7906
Loading
Loading
Loading
Loading
+40 −38
Original line number Diff line number Diff line
@@ -14,8 +14,13 @@
     limitations under the License.
-->

<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
<ScrollView
    xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:settings="http://schemas.android.com/apk/res-auto"
    android:layout_width="match_parent"
    android:layout_height="match_parent">

    <LinearLayout
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:paddingStart="?android:attr/listPreferredItemPaddingStart"
@@ -27,6 +32,7 @@
            android:layout_height="wrap_content"
            android:focusable="true"
            android:orientation="vertical">

            <TextView
                android:id="@+id/charge"
                android:layout_width="match_parent"
@@ -59,10 +65,6 @@
            android:layout_marginTop="2dp"
            android:background="?android:attr/listDivider"/>

    <ScrollView
        android:layout_width="match_parent"
        android:layout_height="match_parent">

        <LinearLayout
            android:layout_width="match_parent"
            android:layout_height="match_parent"
@@ -94,6 +96,6 @@

        </LinearLayout>

    </ScrollView>

    </LinearLayout>

</ScrollView>