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

Commit 1b372913 authored by Mill Chen's avatar Mill Chen
Browse files

Change ScrollView to NestedScrollView for screen size page 

To make sure the collapsing toolbar work as usual, we need to use
NestedScrollView instead of ScrollView in the screen size page.

Bug: 176896338
Test: manual test and visual verified
1) Navigate to Settings -> Display -> Display size
2) Change the size on the seekbar
3) Observe and check if the preview window can be scrolled

Change-Id: Ia5bb66ef63b9d9a7713cebddbf6ab6258ff82b8d
parent 90c976b8

res/layout-sw300dp-land/screen_zoom_activity.xml

+2 −2
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ 
            android:padding="6dp" />

    </LinearLayout>



    <ScrollView

    <androidx.core.widget.NestedScrollView

            android:layout_width="0dp"

            android:layout_weight="1"

            android:layout_height="match_parent"
@@ -106,5 +106,5 @@ 
                android:layout_marginBottom="16dp"

                android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Subhead" />

        </LinearLayout>

    </ScrollView>

    </androidx.core.widget.NestedScrollView>

</LinearLayout>

res/layout/preview_seek_bar_view_pager.xml

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
    <androidx.viewpager.widget.ViewPager

        android:id="@+id/preview_pager"

        android:layout_width="match_parent"

        android:layout_height="100dp"

        android:layout_height="400dp"

        android:layout_weight="1"

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

        android:contentDescription="@string/preview_pager_content_description" />

res/layout/screen_zoom_activity.xml

+13 −12
Original line number Diff line number Diff line
@@ -14,7 +14,8 @@ 
     limitations under the License.

-->



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

<androidx.core.widget.NestedScrollView

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

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:fillViewport="true">
@@ -96,4 +97,4 @@ 
                android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Subhead"/>

        </LinearLayout>

    </LinearLayout>

</ScrollView>
 
</androidx.core.widget.NestedScrollView>

res/layout/screen_zoom_preview_1.xml

+3 −2
Original line number Diff line number Diff line
@@ -13,7 +13,8 @@ 
     See the License for the specific language governing permissions and

     limitations under the License.

-->

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

<androidx.core.widget.NestedScrollView

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

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

    android:layout_width="match_parent"

    android:layout_height="match_parent"
@@ -75,4 +76,4 @@ 
                app:iconBackgroundColor="@color/message_icon_background_incoming" />

        </LinearLayout>

    </view>

</ScrollView>
 
</androidx.core.widget.NestedScrollView>

res/layout/screen_zoom_preview_settings.xml

+3 −2
Original line number Diff line number Diff line
@@ -14,7 +14,8 @@ 
     limitations under the License.

-->



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

<androidx.core.widget.NestedScrollView

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

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:fillViewport="true"
@@ -223,4 +224,4 @@ 
            </LinearLayout>

        </LinearLayout>

    </view>

</ScrollView>
 
</androidx.core.widget.NestedScrollView>