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

Commit 16f334e5 authored by Selim Cinek's avatar Selim Cinek
Browse files

Fixed the layout of media heads up notifications 

Previously the heads up layout was strangely clipped
because we were using the expanded layout.
We're now using the collapsed layout instead. In order to allow this,
the media notification needs to wrap it's height properly.

Fixes: 136507638
Test: show heads up media notification
Change-Id: Ib091b0e776b5cd1a615c9ea0121a3115817b7f64
parent b7098f9d

core/java/android/app/Notification.java

+1 −2
Original line number Diff line number Diff line
@@ -8101,8 +8101,7 @@ public class Notification implements Parcelable 
         */

        @Override

        public RemoteViews makeHeadsUpContentView(boolean increasedHeight) {

            RemoteViews expanded = makeMediaBigContentView();

            return expanded != null ? expanded : makeMediaContentView();

            return makeMediaContentView();

        }



        /** @hide */

core/res/res/layout/notification_template_material_media.xml

+4 −4
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
  ~ limitations under the License

  -->



<FrameLayout

<com.android.internal.widget.MediaNotificationView

    android:id="@+id/status_bar_latest_event_content"

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

    android:layout_width="match_parent"
@@ -24,8 +24,8 @@ 
    android:tag="media"

    >

    <ImageView android:id="@+id/right_icon"

        android:layout_width="wrap_content"

        android:layout_height="match_parent"

        android:layout_width="0dp"

        android:layout_height="0dp"

        android:adjustViewBounds="true"

        android:layout_gravity="top|end"

        android:scaleType="centerCrop"
@@ -91,4 +91,4 @@ 
            android:layout_alignParentBottom="true"

        />

    </LinearLayout>

</FrameLayout>
 
</com.android.internal.widget.MediaNotificationView>

core/res/res/values/dimens.xml

+1 −1
Original line number Diff line number Diff line
@@ -279,7 +279,7 @@ 
    <dimen name="notification_expand_button_padding_top">1dp</dimen>



    <!-- Height of a small notification in the status bar -->

    <dimen name="notification_min_height">92dp</dimen>

    <dimen name="notification_min_height">106dp</dimen>



    <!-- The width of the big icons in notifications. -->

    <dimen name="notification_large_icon_width">64dp</dimen>

core/res/res/values/symbols.xml

+1 −0
Original line number Diff line number Diff line
@@ -3797,6 +3797,7 @@ 
  <java-symbol type="string" name="config_displayLightSensorType" />



  <java-symbol type="drawable" name="iconfactory_adaptive_icon_drawable_wrapper"/>

  <java-symbol type="dimen" name="notification_min_height" />

  <java-symbol type="dimen" name="resolver_icon_size"/>

  <java-symbol type="dimen" name="resolver_badge_size"/>

  <java-symbol type="dimen" name="resolver_button_bar_spacing"/>

packages/SystemUI/res/values/dimens.xml

+1 −1
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ 
    <dimen name="status_bar_connected_device_bt_indicator_size">17dp</dimen>



    <!-- Height of a small notification in the status bar-->

    <dimen name="notification_min_height">106dp</dimen>

    <dimen name="notification_min_height">@*android:dimen/notification_min_height</dimen>



    <!-- Increased height of a small notification in the status bar -->

    <dimen name="notification_min_height_increased">146dp</dimen>