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

Commit 8f8dba3c authored by Alexandre Roux's avatar Alexandre Roux
Browse files

Merge remote-tracking branch 'origin/lineage-17.1' into v1-q

parents 2a9f2bb2 39a331c6

packages/SystemUI/res/drawable/ic_bluetooth_audio.xml

0 → 100644
+24 −0
Original line number Diff line number Diff line 
<!--

    Copyright (C) 2020 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.

-->

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

    android:height="24.0dp"

    android:width="24.0dp"

    android:viewportWidth="24.0"

    android:viewportHeight="24.0">

    <path

        android:fillColor="#FF000000"

        android:pathData="M12.88,16.29L11,18.17V14.41M11,5.83L12.88,7.71L11,9.58M15.71,7.71L10,2H9V9.58L4.41,5L3,6.41L8.59,12L3,17.58L4.41,19L9,14.41V22H10L15.71,16.29L11.41,12M19.53,6.71L18.26,8C18.89,9.18 19.25,10.55 19.25,12C19.25,13.45 18.89,14.82 18.26,16L19.46,17.22C20.43,15.68 21,13.87 21,11.91C21,10 20.46,8.23 19.53,6.71M14.24,12L16.56,14.33C16.84,13.6 17,12.82 17,12C17,11.18 16.84,10.4 16.57,9.68L14.24,12Z" />

</vector>

packages/SystemUI/res/drawable/ic_volume_ringer_vibrate.xml

+2 −2
Original line number Diff line number Diff line
@@ -14,8 +14,8 @@ 
     limitations under the License.

-->

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

    android:height="19dp"

    android:width="19dp"

    android:height="24dp"

    android:width="24dp"

    android:viewportHeight="24.0"

    android:viewportWidth="24.0">

packages/SystemUI/res/layout-land/volume_dialog.xml

+39 −21
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 
    <FrameLayout

        android:id="@+id/volume_dialog"

        android:minWidth="@dimen/volume_dialog_panel_width"

        android:layout_width="wrap_content"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:gravity="right"

        android:layout_gravity="right"
@@ -43,8 +43,6 @@ 
            android:layout_width="@dimen/volume_dialog_ringer_size"

            android:layout_height="@dimen/volume_dialog_ringer_size"

            android:layout_marginBottom="@dimen/volume_dialog_spacer"

            android:gravity="right"

            android:layout_gravity="right"

            android:translationZ="@dimen/volume_dialog_elevation"

            android:clipToPadding="false"

            android:background="@drawable/rounded_bg_full">
@@ -73,8 +71,6 @@ 
            android:minWidth="@dimen/volume_dialog_panel_width"

            android:layout_height="wrap_content"

            android:layout_marginTop="68dp"

            android:gravity="right"

            android:layout_gravity="right"

            android:orientation="vertical"

            android:translationZ="@dimen/volume_dialog_elevation"

            android:clipChildren="false"
@@ -91,31 +87,53 @@ 
                android:paddingLeft="@dimen/volume_dialog_stream_padding">

                <!-- volume rows added and removed here! :-) -->

            </LinearLayout>

            <FrameLayout

                android:id="@+id/settings_container"

            <LinearLayout

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:orientation="horizontal"

                android:background="@drawable/rounded_bg_bottom_background" >

                <FrameLayout

                    android:id="@+id/expandable_indicator_container"

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                    android:layout_weight="1">

                    <com.android.systemui.statusbar.phone.ExpandableIndicator

                        android:id="@+id/expandable_indicator"

                        android:layout_width="@dimen/volume_dialog_tap_target_size"

                        android:layout_height="@dimen/volume_dialog_tap_target_size"

                        android:layout_marginRight="8dp"

                        android:layout_marginLeft="8dp"

                        android:contentDescription="@string/accessibility_volume_expand"

                        android:background="@drawable/ripple_drawable_20dp"

                        android:tint="?android:attr/textColorSecondary"

                        android:soundEffectsEnabled="false"

                        android:padding="14dp" />

                </FrameLayout>

                <FrameLayout

                    android:id="@+id/media_output_container"

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content">

                    <com.android.keyguard.AlphaOptimizedImageButton

                    android:id="@+id/settings"

                    android:src="@drawable/ic_tune_black_16dp"

                        android:id="@+id/media_output"

                        android:src="@drawable/ic_bluetooth_audio"

                        android:layout_width="@dimen/volume_dialog_tap_target_size"

                        android:layout_height="@dimen/volume_dialog_tap_target_size"

                    android:layout_gravity="center"

                        android:layout_marginRight="8dp"

                        android:layout_marginLeft="8dp"

                        android:contentDescription="@string/accessibility_volume_settings"

                        android:background="@drawable/ripple_drawable_20dp"

                        android:tint="?android:attr/textColorSecondary"

                        android:soundEffectsEnabled="false" />

                </FrameLayout>

            </LinearLayout>

        </LinearLayout>



        <FrameLayout

            android:id="@+id/odi_captions"

            android:layout_width="@dimen/volume_dialog_caption_size"

            android:layout_height="@dimen/volume_dialog_caption_size"

            android:layout_marginLeft="68dp"

            android:layout_marginRight="68dp"

            android:gravity="right"

            android:layout_gravity="right"

            android:clipToPadding="false"

            android:translationZ="@dimen/volume_dialog_elevation"

            android:background="@drawable/rounded_bg_full">

packages/SystemUI/res/layout/volume_dialog.xml

+38 −21
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ 
    <LinearLayout

        android:id="@+id/volume_dialog"

        android:minWidth="@dimen/volume_dialog_panel_width"

        android:layout_width="wrap_content"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:gravity="right"

        android:layout_gravity="right"
@@ -45,8 +45,6 @@ 
            android:layout_width="@dimen/volume_dialog_ringer_size"

            android:layout_height="@dimen/volume_dialog_ringer_size"

            android:layout_marginBottom="@dimen/volume_dialog_spacer"

            android:gravity="right"

            android:layout_gravity="right"

            android:translationZ="@dimen/volume_dialog_elevation"

            android:clipToPadding="false"

            android:background="@drawable/rounded_bg_full">
@@ -74,8 +72,6 @@ 
            android:minWidth="@dimen/volume_dialog_panel_width"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:gravity="right"

            android:layout_gravity="right"

            android:orientation="vertical"

            android:translationZ="@dimen/volume_dialog_elevation"

            android:clipChildren="false"
@@ -92,31 +88,52 @@ 
                android:paddingLeft="@dimen/volume_dialog_stream_padding">

                    <!-- volume rows added and removed here! :-) -->

            </LinearLayout>

            <FrameLayout

                android:id="@+id/settings_container"

            <LinearLayout

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:orientation="horizontal"

                android:background="@drawable/rounded_bg_bottom_background" >

                <FrameLayout

                    android:id="@+id/expandable_indicator_container"

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                    android:layout_weight="1">

                    <com.android.systemui.statusbar.phone.ExpandableIndicator

                        android:id="@+id/expandable_indicator"

                        android:layout_width="@dimen/volume_dialog_tap_target_size"

                        android:layout_height="@dimen/volume_dialog_tap_target_size"

                        android:layout_marginRight="8dp"

                        android:layout_marginLeft="8dp"

                        android:contentDescription="@string/accessibility_volume_expand"

                        android:background="@drawable/ripple_drawable_20dp"

                        android:tint="?android:attr/textColorSecondary"

                        android:soundEffectsEnabled="false"

                        android:padding="14dp" />

                </FrameLayout>

                <FrameLayout

                    android:id="@+id/media_output_container"

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content">

                    <com.android.keyguard.AlphaOptimizedImageButton

                    android:id="@+id/settings"

                    android:src="@drawable/ic_tune_black_16dp"

                        android:id="@+id/media_output"

                        android:src="@drawable/ic_bluetooth_audio"

                        android:layout_width="@dimen/volume_dialog_tap_target_size"

                        android:layout_height="@dimen/volume_dialog_tap_target_size"

                    android:layout_gravity="center"

                        android:layout_marginRight="8dp"

                        android:layout_marginLeft="8dp"

                        android:contentDescription="@string/accessibility_volume_settings"

                        android:background="@drawable/ripple_drawable_20dp"

                        android:tint="?android:attr/textColorSecondary"

                        android:soundEffectsEnabled="false" />

                </FrameLayout>

            </LinearLayout>

        </LinearLayout>



        <FrameLayout

            android:id="@+id/odi_captions"

            android:layout_width="@dimen/volume_dialog_caption_size"

            android:layout_height="@dimen/volume_dialog_caption_size"

            android:layout_marginTop="@dimen/volume_dialog_spacer"

            android:gravity="right"

            android:layout_gravity="right"

            android:clipToPadding="false"

            android:translationZ="@dimen/volume_dialog_elevation"

            android:background="@drawable/rounded_bg_full">

packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java

+266 −134

File changed.

Preview size limit exceeded, changes collapsed.