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

Commit fdebfc35 authored by John Spurlock's avatar John Spurlock
Browse files

Settings: Add effects suppression text to Ring volume. 

If the effects are being muted by a notification listener, display
a "Muted by <x>" msg instead of an active slider inside the
Ring/Notification volume setting pref.

Update volume pref design to optimize for this new custom appearance.

Depends on frameworks/base:
  Icdb5f85eb4bcaa1ead7d77c1460e06ad3f0604d5

Bug: 17461563
Change-Id: I6da871e16009370402451a2ff507de4762644a80
parent c88cdea2

res/drawable/ic_audio_alarm_24dp.xml

deleted100644 → 0
+0 −20
Original line number Diff line number Diff line 
<!--

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

-->

<!-- shrink ic_audio_alarm from 32dp to 24dp using insets -->

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

        android:drawable="@*android:drawable/ic_audio_alarm"

        android:inset="4dp"

        />

res/drawable/ic_audio_vol_24dp.xml

deleted100644 → 0
+0 −20
Original line number Diff line number Diff line 
<!--

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

-->

<!-- shrink ic_audio_vol from 32dp to 24dp using insets -->

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

        android:drawable="@*android:drawable/ic_audio_vol"

        android:inset="4dp"

        />

res/drawable/ring_notif.xml

deleted100644 → 0
+0 −21
Original line number Diff line number Diff line 
<!--

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

-->

<!-- shrink ic_audio_ring_notif from 32dp to 24dp using insets -->

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

        android:drawable="@*android:drawable/ic_audio_ring_notif"

        android:inset="4dp"

        />

res/drawable/ring_notif_mute.xml

deleted100644 → 0
+0 −20
Original line number Diff line number Diff line 
<!--

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

-->

<!-- shrink ic_audio_ring_notif_mute from 32dp to 24dp using insets -->

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

        android:drawable="@*android:drawable/ic_audio_ring_notif_mute"

        android:inset="4dp"

        />

res/drawable/ring_notif_vibrate.xml

deleted100644 → 0
+0 −20
Original line number Diff line number Diff line 
<!--

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

-->

<!-- shrink ic_audio_ring_notif_vibrate from 32dp to 24dp using insets -->

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

        android:drawable="@*android:drawable/ic_audio_ring_notif_vibrate"

        android:inset="4dp"

        />