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

Commit f1d5ca9c authored by Lin Guo's avatar Lin Guo Committed by android-build-merger
Browse files

Merge "Adjust the volumeDialog layout" into pi-dev 

am: e19226b1

Change-Id: Ie9e1244899ec5ecb1db8123a575f7dfad9efb551
parents 11491a74 e19226b1

packages/SystemUI/res/layout/car_volume_dialog.xml

+5 −4
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 
    android:clipChildren="false" >

    <LinearLayout

        android:id="@+id/volume_dialog"

        android:layout_width="wrap_content"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_gravity="center_horizontal|top"

        android:orientation="vertical"
@@ -53,14 +53,15 @@ 
        android:layout_width="wrap_content"

        android:layout_height="@dimen/car_single_line_list_item_height"

        android:gravity="center"

        android:layout_marginEnd="@dimen/car_keyline_1">

        <ImageButton

        android:layout_marginEnd="@dimen/car_keyline_1"

        android:layout_gravity="end">

        <com.android.keyguard.AlphaOptimizedImageButton

            android:id="@+id/expand"

            android:layout_gravity="center"

            android:layout_width="@dimen/car_primary_icon_size"

            android:layout_height="@dimen/car_primary_icon_size"

            android:layout_marginEnd="@dimen/car_keyline_1"

            android:src="@drawable/car_ic_arrow_drop_up"

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

            android:tint="@color/car_tint"

            android:scaleType="fitCenter"

        />

packages/SystemUI/res/layout/car_volume_dialog_row.xml

+2 −1
Original line number Diff line number Diff line
@@ -33,13 +33,14 @@ 
            android:layout_width="@dimen/car_primary_icon_size"

            android:layout_height="@dimen/car_primary_icon_size"

            android:layout_marginStart="@dimen/car_keyline_1"

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

            android:tint="@color/car_tint"

            android:scaleType="fitCenter"

            android:soundEffectsEnabled="false" />

        <SeekBar

                android:id="@+id/volume_row_slider"

                android:clickable="true"

                android:layout_marginStart="@dimen/car_keyline_3"

                android:layout_marginStart="@dimen/car_keyline_1_keyline_3_diff"

                android:layout_marginEnd="@dimen/car_keyline_3"

                android:layout_width="match_parent"

                android:layout_height="@dimen/car_single_line_list_item_height"/>