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

Commit 079ac4f3 authored by Angela Wang's avatar Angela Wang Committed by Automerger Merge Worker
Browse files

Merge "Enable scrolling in screen flash color selector dialog" into udc-qpr-dev am: 81a36464 

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



Change-Id: Ifd3337358a62ba1eb28095e8111b673fc1fb7043
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 27c4b3b6 81a36464

res/layout/layout_color_selector.xml

+154 −148
Original line number Diff line number Diff line
@@ -14,13 +14,18 @@ 
    See the License for the specific language governing permissions and

    limitations under the License.

-->

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

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

    android:id="@+id/color_selector_root_view"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:padding="20dp"

    android:clipToPadding="false"

    android:scrollbarStyle="outsideOverlay">

    <LinearLayout

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

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

        android:orientation="vertical">



        <LinearLayout

            android:layout_width="match_parent"

            android:layout_height="wrap_content"
@@ -172,3 +177,4 @@ 


        </LinearLayout>

    </LinearLayout>

</ScrollView>

res/layout/layout_color_selector_dialog.xml

+3 −7
Original line number Diff line number Diff line
@@ -17,16 +17,12 @@ 
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:orientation="vertical"

    android:paddingBottom="24dp">

    android:gravity="center_horizontal"

    android:orientation="vertical">



    <com.android.settings.accessibility.ColorSelectorLayout

        android:id="@+id/color_selector_preference"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_marginBottom="2dp"

        android:layout_marginHorizontal="25dp"

        android:layout_marginTop="21dp"

        android:orientation="vertical" />

        android:layout_height="wrap_content"/>



</LinearLayout>
 
 No newline at end of file