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

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

Volume dialog: Add zen mode icons and notification access. 

- Add icon above text to all three zen mode states, update text style.
- Remove zentoast.
- Update shared borderless rect background, masks now support shapes.
- Update size of volume stream icons.
- Ensure all volume icons are expressions of white.
- Make volume icons testable via new demo mode command.
- Add a divider + secondary icon to access the notification slider.
- Animate the transition when accessing notification slider.

Bug: 18206097
Bug: 16303068
Bug: 18102850
Change-Id: I5eb6f820dc317e89be272cc78f6c80ed969ad5e9
parent aed8e761

packages/SystemUI/res/anim/zen_toast_enter.xml

deleted100644 → 0
+0 −20
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

     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.

-->

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

    android:interpolator="@android:interpolator/decelerate_quad"

    android:fromAlpha="0.0" android:toAlpha="1.0"

    android:duration="@integer/zen_toast_animation_duration" />

packages/SystemUI/res/anim/zen_toast_exit.xml

deleted100644 → 0
+0 −20
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

     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.

-->

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

    android:interpolator="@android:interpolator/accelerate_quad"

    android:fromAlpha="1.0" android:toAlpha="0.0"

    android:duration="@integer/zen_toast_animation_duration" />

packages/SystemUI/res/color/segmented_button_text_selector.xml

+2 −2
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 


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



    <item android:state_selected="true" android:color="@android:color/white"/>

    <item android:color="@color/segmented_button_text_inactive"/>

    <item android:state_selected="true" android:color="@color/segmented_button_selected"/>

    <item android:color="@color/segmented_button_unselected"/>



</selector>
 
 No newline at end of file

packages/SystemUI/res/drawable/btn_borderless_rect.xml

+6 −2
Original line number Diff line number Diff line
@@ -16,6 +16,10 @@ 


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

    android:color="?android:attr/colorControlHighlight">

    <item android:id="@android:id/mask"

          android:drawable="@android:color/white" />

    <item android:id="@android:id/mask">

        <shape>

            <corners android:radius="@dimen/borderless_button_radius" />

            <solid android:color="@android:color/white" />

        </shape>

    </item>

</ripple>
 
 No newline at end of file

packages/SystemUI/res/drawable/ic_audio_alarm.xml

+2 −2
Original line number Diff line number Diff line
@@ -14,8 +14,8 @@ Copyright (C) 2014 The Android Open Source Project 
    limitations under the License.

-->

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

        android:width="32.0dp"

        android:height="32.0dp"

        android:width="28.0dp"

        android:height="28.0dp"

        android:viewportWidth="48.0"

        android:viewportHeight="48.0">

    <path