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

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

Volume: new coat of paint. 

- Two sections (lighter header, darker detail) like QS.
- Fewer text variants.
- Remove backgrounds for segmented buttons.
- Remove alarm warning background.
- Fix slider-only style.
- Ensure all touch-targets are 48dp.

Bug:16419191

Change-Id: I220f3a736eba3dd7a1b9ff58a8fe4bf3d21db61a
parent 80260357

packages/SystemUI/res/drawable/zen_alarm_hard_background.xml→packages/SystemUI/res/drawable/qs_background_secondary.xml

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
     limitations under the License.

-->

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

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

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

    <corners

        android:topLeftRadius="0dp"

        android:topRightRadius="0dp"

packages/SystemUI/res/drawable/segmented_button.xml

deleted100644 → 0
+0 −27
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.

-->

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

    <item android:state_selected="true">

        <shape android:shape="rectangle">

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

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

        </shape>

    </item>

    <item>

        <ripple android:color="@color/segmented_button_selected" />

    </item>

</selector>
 
 No newline at end of file

packages/SystemUI/res/drawable/segmented_buttons.xml

deleted100644 → 0
+0 −21
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.

-->

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

    android:shape="rectangle" >

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

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

</shape>
 
 No newline at end of file

packages/SystemUI/res/drawable/zen_alarm_soft_background.xml

deleted100644 → 0
+0 −23
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.

-->

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

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

    <corners

        android:topLeftRadius="0dp"

        android:topRightRadius="0dp"

        android:bottomLeftRadius="@dimen/notification_material_rounded_rect_radius"

        android:bottomRightRadius="@dimen/notification_material_rounded_rect_radius"/>

</shape>