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

Commit f2e00697 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "add car volume dialog" into pi-dev

parents 113f9f85 e53f7499
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ LOCAL_SRC_FILES := \
LOCAL_STATIC_ANDROID_LIBRARIES := \
    SystemUIPluginLib \
    SystemUISharedLib \
    android-support-car \
    android-support-v4 \
    android-support-v7-recyclerview \
    android-support-v7-preference \
+11 −0
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
       android:shape="rectangle">
    <solid android:color="?android:attr/colorBackgroundFloating" />
    <corners
        android:bottomLeftRadius="@dimen/car_radius_3"
        android:topLeftRadius="0dp"
        android:bottomRightRadius="@dimen/car_radius_3"
        android:topRightRadius="0dp"
        />
</shape>
+68 −0
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:layout_width="match_parent"
    android:layout_height="wrap_content"
    android:layout_marginStart="@dimen/car_margin"
    android:layout_marginEnd="@dimen/car_margin"
    android:background="@drawable/car_rounded_bg_bottom"
    android:theme="@style/qs_theme"
    android:clipChildren="false" >
    <LinearLayout
        android:id="@+id/volume_dialog"
        android:layout_width="wrap_content"
        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_panel_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">
        <ImageButton
            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:tint="@color/car_tint"
            android:scaleType="fitCenter"
        />
    </FrameLayout>
</FrameLayout>
 No newline at end of file
+47 −0
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: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_marginEnd="@dimen/car_keyline_3"
                android:layout_width="match_parent"
                android:layout_height="@dimen/car_single_line_list_item_height"/>
    </LinearLayout>
</FrameLayout>
+835 −0

File added.

Preview size limit exceeded, changes collapsed.

Loading