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

Commit d30ab9b8 authored by Abdullah Tabassum's avatar Abdullah Tabassum Committed by Android (Google) Code Review
Browse files

Merge "Remove clipping and stabilize lock preview screen" into udc-dev

parents 304143aa 8c2b48df
Loading
Loading
Loading
Loading
+35 −12
Original line number Diff line number Diff line
@@ -102,14 +102,22 @@
                android:orientation="vertical"
                android:clipChildren="false">

                <FrameLayout
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"
                    android:clipChildren="false">

                    <HorizontalScrollView
                        android:id="@+id/color_options_scroll_view"
                        android:layout_width="match_parent"
                        android:layout_height="wrap_content"
                        android:clipChildren="false"
                        android:scrollbars="none">

                        <LinearLayout
                            android:id="@+id/color_options"
                            android:clipToPadding="false"
                            android:clipChildren="false"
                            android:paddingHorizontal="16dp"
                            android:layout_marginBottom="16dp"
                            android:layout_width="wrap_content"
@@ -119,6 +127,21 @@
                            android:showDividers="middle" />
                    </HorizontalScrollView>

                    <!--
                        This is just an invisible placeholder put in place so that the parent keeps
                        its height stable as the RecyclerView updates from 0 items to N items.
                        Keeping it stable allows the layout logic to keep the size of the preview
                        container stable as well, which bodes well for setting up the SurfaceView
                        for remote rendering without changing its size after the content is loaded
                        into the RecyclerView.
                        -->
                    <include
                        layout="@layout/clock_color_option"
                        android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
                        android:visibility="invisible" />
                </FrameLayout>

                <SeekBar
                    android:id="@+id/slider"
                    android:layout_width="match_parent"