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

Commit c052d65a authored by Arian's avatar Arian Committed by Bruno Martins
Browse files

VolumeDialog: Move the media output selector next to the expandable indicator 

* Keep the non-expanded panel as slim as possible.

Change-Id: Ic0d171c1f52ad8f50e14f161431e41d49da6cad6
parent 91643253

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

+37 −32
Original line number Diff line number Diff line
@@ -87,28 +87,16 @@ 
                android:paddingLeft="@dimen/volume_dialog_stream_padding">

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

            </LinearLayout>

            <FrameLayout

                android:id="@+id/media_output_container"

            <LinearLayout

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:background="?android:attr/panelColorBackground">

                <com.android.keyguard.AlphaOptimizedImageButton

                    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_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>

                android:orientation="horizontal"

                android:background="@drawable/rounded_bg_bottom_background" >

                <FrameLayout

                    android:id="@+id/expandable_indicator_container"

                android:layout_width="match_parent"

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                android:background="@drawable/rounded_bg_bottom_background">

                    android:layout_weight="1">

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

                        android:id="@+id/expandable_indicator"

                        android:layout_width="@dimen/volume_dialog_tap_target_size"
@@ -121,6 +109,23 @@ 
                        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/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_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

packages/SystemUI/res/layout/volume_dialog.xml

+37 −32
Original line number Diff line number Diff line
@@ -88,28 +88,16 @@ 
                android:paddingLeft="@dimen/volume_dialog_stream_padding">

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

            </LinearLayout>

            <FrameLayout

                android:id="@+id/media_output_container"

            <LinearLayout

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:background="?android:attr/panelColorBackground">

                <com.android.keyguard.AlphaOptimizedImageButton

                    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_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>

                android:orientation="horizontal"

                android:background="@drawable/rounded_bg_bottom_background" >

                <FrameLayout

                    android:id="@+id/expandable_indicator_container"

                android:layout_width="match_parent"

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                android:background="@drawable/rounded_bg_bottom_background">

                    android:layout_weight="1">

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

                        android:id="@+id/expandable_indicator"

                        android:layout_width="@dimen/volume_dialog_tap_target_size"
@@ -122,6 +110,23 @@ 
                        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/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_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

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

+7 −2
Original line number Diff line number Diff line
@@ -552,12 +552,12 @@ public class VolumeDialogImpl implements VolumeDialog, 
                == BluetoothProfile.STATE_CONNECTED;

    }



    public void initSettingsH() {

    public void updateMediaOutputH() {

        if (mMediaOutputView != null) {

            mMediaOutputView.setVisibility(

                    mDeviceProvisionedController.isCurrentUserSetup() &&

                            mActivityManager.getLockTaskModeState() == LOCK_TASK_MODE_NONE &&

                            isBluetoothA2dpConnected() ? VISIBLE : GONE);

                            isBluetoothA2dpConnected() && mExpanded ? VISIBLE : GONE);

        }

        if (mMediaOutputIcon != null) {

            mMediaOutputIcon.setOnClickListener(v -> {
@@ -569,7 +569,10 @@ public class VolumeDialogImpl implements VolumeDialog, 
                        true /* dismissShade */);

            });

        }

    }



    public void initSettingsH() {

        updateMediaOutputH();

        if (mAllyStream == -1) {

            mAllyStream = mActiveStream;

        }
@@ -597,6 +600,8 @@ public class VolumeDialogImpl implements VolumeDialog, 
                if (mExpanded) mController.setActiveStream(mAllyStream);

                mExpandRows.setExpanded(!mExpanded);

                mExpanded = !mExpanded;



                updateMediaOutputH();

            });

        }

    }