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

Commit 99e9adf5 authored by Selim Cinek's avatar Selim Cinek
Browse files

Removed the heads up scrim and replaced it with more elevation 

Fixes: 72748440
Test: runtest systemui
Change-Id: Id1eb413a2a44589727d212c0fefe3a1b742bb25e
parent aa9db1f3

packages/SystemUI/res/drawable/heads_up_scrim.xml

deleted100644 → 0
+0 −25
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">

    <gradient

            android:type="linear"

            android:angle="-90"

            android:startColor="#55000000"

            android:endColor="#00000000" />

</shape>
 
 No newline at end of file

packages/SystemUI/res/layout/super_status_bar.xml

+0 −8
Original line number Diff line number Diff line
@@ -51,14 +51,6 @@ 
        sysui:ignoreRightInset="true"

        />



    <com.android.systemui.statusbar.AlphaOptimizedView

        android:id="@+id/heads_up_scrim"

        android:layout_width="match_parent"

        android:layout_height="@dimen/heads_up_scrim_height"

        android:background="@drawable/heads_up_scrim"

        sysui:ignoreRightInset="true"

        android:importantForAccessibility="no"/>



    <FrameLayout

        android:id="@+id/status_bar_container"

        android:layout_width="match_parent"

packages/SystemUI/res/values/dimens.xml

+3 −1
Original line number Diff line number Diff line
@@ -113,6 +113,9 @@ 
    <!-- padding between the heads up and the statusbar -->

    <dimen name="heads_up_status_bar_padding">8dp</dimen>



    <!-- heads up elevation that is added if the view is pinned -->

    <dimen name="heads_up_pinned_elevation">16dp</dimen>



    <!-- Height of a messaging notifications with actions at least. Not that this is an upper bound

         and the notification won't use this much, but is measured with wrap_content -->

    <dimen name="notification_messaging_actions_min_height">196dp</dimen>
@@ -454,7 +457,6 @@ 
    <dimen name="keyguard_clock_notifications_margin">30dp</dimen>

    <!-- Minimum margin between clock and status bar -->

    <dimen name="keyguard_clock_top_margin">36dp</dimen>

    <dimen name="heads_up_scrim_height">250dp</dimen>



    <item name="scrim_behind_alpha" format="float" type="dimen">0.62</item>

packages/SystemUI/src/com/android/systemui/SystemUIFactory.java

+4 −4
Original line number Diff line number Diff line
@@ -100,10 +100,10 @@ public class SystemUIFactory { 
    }



    public ScrimController createScrimController(LightBarController lightBarController,

            ScrimView scrimBehind, ScrimView scrimInFront, View headsUpScrim,

            LockscreenWallpaper lockscreenWallpaper, Consumer<Integer> scrimVisibleListener,

            DozeParameters dozeParameters, AlarmManager alarmManager) {

        return new ScrimController(lightBarController, scrimBehind, scrimInFront, headsUpScrim,

            ScrimView scrimBehind, ScrimView scrimInFront, LockscreenWallpaper lockscreenWallpaper,

            Consumer<Integer> scrimVisibleListener, DozeParameters dozeParameters,

            AlarmManager alarmManager) {

        return new ScrimController(lightBarController, scrimBehind, scrimInFront,

                scrimVisibleListener, dozeParameters, alarmManager);

    }

packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java

+1 −1
Original line number Diff line number Diff line
@@ -552,7 +552,7 @@ public class ExpandableNotificationRow extends ActivatableNotificationView 
        }

    }



    @VisibleForTesting

    @Override

    public float getHeaderVisibleAmount() {

        return mHeaderVisibleAmount;

    }