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

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

Merge "Redo VolumeDialog with SeekbarListItem" into pi-dev

am: c8598063

Change-Id: I1b5d53173e2a0e600a5a004270d1ae80826839fe
parents 64df7a46 c8598063
Loading
Loading
Loading
Loading
+15 −46
Original line number Diff line number Diff line
@@ -15,55 +15,24 @@
-->
<FrameLayout
    xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"
    android:id="@+id/volume_dialog"
    android:clipChildren="false"
    android:layout_width="match_parent"
    android:layout_height="wrap_content"
    android:layout_marginStart="@dimen/car_margin"
    android:layout_marginEnd="@dimen/car_margin"
    android:theme="@style/qs_theme" >
    <androidx.car.widget.PagedListView
        android:id="@+id/volume_list"
        android:background="@drawable/car_rounded_bg_bottom"
    android:theme="@style/qs_theme"
    android:clipChildren="false" >
    <LinearLayout
        android:id="@+id/volume_dialog"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:layout_gravity="center_horizontal|top"
        android:orientation="vertical"
        android:clipChildren="false" >

        <LinearLayout
            android:id="@+id/main"
            android:layout_width="match_parent"
        android:minWidth="@dimen/volume_dialog_panel_width"
            android:layout_height="wrap_content"
            android:orientation="vertical"
            android:clipChildren="false"
            android:clipToPadding="false"
            android:elevation="@dimen/volume_dialog_elevation" >
            <LinearLayout
                android:id="@+id/car_volume_dialog_rows"
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
                android:gravity="center"
                android:orientation="vertical" >
                <!-- volume rows added and removed here! :-) -->
            </LinearLayout>
        </LinearLayout>
    </LinearLayout>
    <FrameLayout
        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"
        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:src="@drawable/car_ic_arrow_drop_up"
            android:background="?android:attr/selectableItemBackground"
            android:tint="@color/car_tint"
            android:scaleType="fitCenter"
        />
    </FrameLayout>
        android:theme="?attr/dialogListTheme"
        app:dividerStartMargin="@dimen/car_keyline_1"
        app:dividerEndMargin="@dimen/car_keyline_1"
        app:gutter="none"
        app:showPagedListViewDivider="true"
        app:scrollBarEnabled="false" />
</FrameLayout>
+0 −48
Original line number Diff line number Diff line
<!--
     Copyright (C) 2018 The Android Open Source Project

     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at

          http://www.apache.org/licenses/LICENSE-2.0

     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
-->
<FrameLayout
    xmlns:android="http://schemas.android.com/apk/res/android"
    android:tag="row"
    android:layout_height="@dimen/car_single_line_list_item_height"
    android:layout_width="match_parent"
    android:clipChildren="false"
    android:clipToPadding="false"
    android:theme="@style/qs_theme">

    <LinearLayout
        android:layout_height="match_parent"
        android:layout_width="match_parent"
        android:gravity="center"
        android:layout_gravity="center"
        android:orientation="horizontal" >
        <com.android.keyguard.AlphaOptimizedImageButton
            android:id="@+id/volume_row_icon"
            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_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"/>
    </LinearLayout>
</FrameLayout>
+153 −333

File changed.

Preview size limit exceeded, changes collapsed.