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

Commit 57b9d113 authored by Jacqueline Bronger's avatar Jacqueline Bronger
Browse files

Show mute icon when volume at zero.

Previously there were different icons for mute vs volume set to zero on
TV only.

Bug: 340265802
Bug: 351992317
Test: atest VolumeDialogImplTest + manual
Flag: EXEMPT bugfix
Change-Id: I11016de7a73dc4900e72f472d0f5ee144eb5df58
parent e322c00c
Loading
Loading
Loading
Loading
+0 −20
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!--
  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
  -->

<selector xmlns:android="http://schemas.android.com/apk/res/android">
    <item android:drawable="@drawable/ic_volume_media_mute" />
</selector>
+1 −1
Original line number Diff line number Diff line
@@ -1993,7 +1993,7 @@ public class VolumeDialogImpl implements VolumeDialog, Dumpable,
                                            : R.drawable.ic_volume_media_bt;
            }
        } else if (isStreamMuted(ss)) {
            iconRes = (ss.muted && isTv()) ? R.drawable.ic_volume_media_off : row.iconMuteRes;
            iconRes = row.iconMuteRes;
        } else {
            iconRes = mShowLowMediaVolumeIcon && ss.level * 2 < (ss.levelMax + ss.levelMin)
                      ? R.drawable.ic_volume_media_low : row.iconRes;