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

Commit 8300a859 authored by Lucas Dupin's avatar Lucas Dupin
Browse files

Remove QS background 

QS background was removed and elements around it were adjusted to match
the new Silk style.

This includes showing a scrim when pulling it down from the lock screen,
fading away the clock, and changing the color of some UI elements.

Fixes: 173562510
Test: atest ScrimControllerTest
Test: atest KeyguardClockPositionAlgorithmTest
Test: manual
Change-Id: Ie995121d85db9034860f4a70182d6328b4b6f0b3
parent 73665572

packages/SystemUI/res/color/qs_background_dark.xml

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

<!-- Copyright (C) 2017 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:alpha="1"

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

</selector>

packages/SystemUI/res/drawable/brightness_mirror_background.xml

+1 −1
Original line number Diff line number Diff line
@@ -15,6 +15,6 @@ 
  ~ limitations under the License

  -->

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

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

    <solid android:color="?android:attr/colorBackground" />

    <corners android:radius="8dp" />

</shape>

packages/SystemUI/res/drawable/qs_background_primary.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.

-->

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

    <shape>

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

        <corners android:radius="?android:attr/dialogCornerRadius" />

    </shape>

</inset>

packages/SystemUI/res/drawable/qs_footer_drag_handle.xml

+1 −1
Original line number Diff line number Diff line
@@ -17,6 +17,6 @@ 
    xmlns:android="http://schemas.android.com/apk/res/android"

    android:shape="rectangle" >

    <solid

        android:color="#e5e5e5" />

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

    <corners android:radius="2dp" />

</shape>

packages/SystemUI/res/layout/qs_panel.xml

+1 −3
Original line number Diff line number Diff line
@@ -25,9 +25,7 @@ 
    <View

        android:id="@+id/quick_settings_background"

        android:layout_width="match_parent"

        android:layout_height="0dp"

        android:elevation="4dp"

        android:background="@drawable/qs_background_primary" />

        android:layout_height="0dp" />



    <com.android.systemui.qs.NonInterceptingScrollView

        android:id="@+id/expanded_qs_scroll_view"