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

Commit dc3e29c3 authored by Selim Cinek's avatar Selim Cinek Committed by Android (Google) Code Review
Browse files

Merge changes from topic 'headsup' 

* changes:
  Finishing up heads up changes
  Added the heads up scrim back
  Fixed a bug where a notification could not be collapsed
  Made ranking consistent with heads Up manager
  Fixed a bug where the intrinsic height was not updated
  Fixed more heads up bugs
  More Heads Up bug fixes
  Adapted the interpolator of the heads up appear motion
  Treating headsUpViews now as real notification citizen
  Handling a few more border cases with HUNs
  Integrate Heads-up notifications into the shade
  Fixed a bug with notification clipping
parents 95729c13 d8535869

packages/SystemUI/res/anim/heads_up_enter.xml

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

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

        >

    <translate

        android:interpolator="@android:interpolator/overshoot"

        android:fromYDelta="-50%" android:toYDelta="0"

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

    <alpha 

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

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

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

</set>

packages/SystemUI/res/anim/heads_up_exit.xml

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

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

        >

    <translate

            android:interpolator="@android:interpolator/overshoot"

            android:fromYDelta="0" android:toYDelta="-50%"

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

    <alpha

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

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

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

</set>

packages/SystemUI/res/layout/heads_up.xml

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

-->

<!-- extends FrameLayout -->

<com.android.systemui.statusbar.policy.HeadsUpNotificationView

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

        android:layout_height="match_parent"

        android:layout_width="match_parent"

        android:background="@drawable/heads_up_scrim">



        <FrameLayout

                android:layout_width="@dimen/notification_panel_width"

                android:layout_height="wrap_content"

                android:layout_gravity="@integer/notification_panel_layout_gravity"

                android:paddingStart="@dimen/notification_side_padding"

                android:paddingEnd="@dimen/notification_side_padding"

                android:elevation="8dp"

                android:id="@+id/content_holder" />



</com.android.systemui.statusbar.policy.HeadsUpNotificationView>
 
 No newline at end of file

packages/SystemUI/res/layout/super_status_bar.xml

+7 −0
Original line number Diff line number Diff line
@@ -46,6 +46,13 @@ 
        android:layout_height="match_parent"

        android:importantForAccessibility="no" />



    <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"

        android:importantForAccessibility="no"/>



    <include layout="@layout/status_bar"

        android:layout_width="match_parent"

        android:layout_height="@dimen/status_bar_height" />

packages/SystemUI/res/values/config.xml

+1 −1
Original line number Diff line number Diff line
@@ -147,7 +147,7 @@ 
    <integer name="heads_up_default_snooze_length_ms">60000</integer>



    <!-- Minimum display time for a heads up notification, in milliseconds. -->

    <integer name="heads_up_notification_minimum_time">3000</integer>

    <integer name="heads_up_notification_minimum_time">2000</integer>



    <!-- milliseconds before the heads up notification accepts touches. -->

    <integer name="heads_up_sensitivity_delay">700</integer>