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

Commit 601ddeba authored by Beverly's avatar Beverly
Browse files

Use Volume Panel intent in volume dialog 

Clicking on the settings gear on the volume dialog
will open a volume panel instead of bringing the user
to the Volume Settings

Test: manual visual inspection
Bug: 117804161
Change-Id: I55920b08844e54378c79f37c3a867742fdab91ec
parent 3d1c9d0d

packages/SystemUI/res/drawable/ic_tune_black_16dp.xml

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

    Copyright (C) 2019 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:width="16dp"

        android:height="16dp"

        android:viewportWidth="24.0"

        android:viewportHeight="24.0">

    <path

        android:fillColor="#FF000000"

        android:pathData="M3,17v2h6v-2L3,17zM3,5v2h10L13,5L3,5zM13,21v-2h8v-2h-8v-2h-2v6h2zM7,9v2L3,11v2h4v2h2L9,9L7,9zM21,13v-2L11,11v2h10zM15,9h2L17,7h4L21,5h-4L17,3h-2v6z"/>

</vector>
 
 No newline at end of file

packages/SystemUI/res/layout/volume_dialog.xml

+1 −1
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ 
                android:background="@drawable/rounded_bg_bottom_background">

                <com.android.keyguard.AlphaOptimizedImageButton

                    android:id="@+id/settings"

                    android:src="@drawable/ic_settings_16dp"

                    android:src="@drawable/ic_tune_black_16dp"

                    android:layout_width="@dimen/volume_dialog_tap_target_size"

                    android:layout_height="@dimen/volume_dialog_tap_target_size"

                    android:layout_gravity="center"

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

+1 −2
Original line number Diff line number Diff line
@@ -430,8 +430,7 @@ public class VolumeDialogImpl implements VolumeDialog { 
        if (mSettingsIcon != null) {

            mSettingsIcon.setOnClickListener(v -> {

                Events.writeEvent(mContext, Events.EVENT_SETTINGS_CLICK);

                Intent intent = new Intent(Settings.ACTION_SOUND_SETTINGS);

                intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);

                Intent intent = new Intent(Settings.Panel.ACTION_VOLUME);

                dismissH(DISMISS_REASON_SETTINGS_CLICKED);

                Dependency.get(ActivityStarter.class).startActivity(intent,

                        true /* dismissShade */);