Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fixed the layout of media heads up notifications" into qt-r1-dev

Browse Source
This commit is contained in:
Lucas Dupin
2019-07-19 18:50:28 +00:00
committed by Android (Google) Code Review
parent ceaa7d45d2 16f334e5c1
commit bddf774dd1
5 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/app/Notification.java
View File

@@ -8101,8 +8101,7 @@ public class Notification implements Parcelable
*/ */
@Override @Override
public RemoteViews makeHeadsUpContentView(boolean increasedHeight) { public RemoteViews makeHeadsUpContentView(boolean increasedHeight) {
RemoteViews expanded = makeMediaBigContentView(); return makeMediaContentView();
return expanded != null ? expanded : makeMediaContentView();
} }
/** @hide */ /** @hide */

8
core/res/res/layout/notification_template_material_media.xml
View File

@@ -15,7 +15,7 @@
~ limitations under the License ~ limitations under the License
--> -->
<FrameLayout <com.android.internal.widget.MediaNotificationView
android:id="@+id/status_bar_latest_event_content" android:id="@+id/status_bar_latest_event_content"
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
@@ -24,8 +24,8 @@
android:tag="media" android:tag="media"
> >
<ImageView android:id="@+id/right_icon" <ImageView android:id="@+id/right_icon"
android:layout_width="wrap_content" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="0dp"
android:adjustViewBounds="true" android:adjustViewBounds="true"
android:layout_gravity="top|end" android:layout_gravity="top|end"
android:scaleType="centerCrop" android:scaleType="centerCrop"
@@ -91,4 +91,4 @@
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
/> />
</LinearLayout> </LinearLayout>
</FrameLayout> </com.android.internal.widget.MediaNotificationView>

2
core/res/res/values/dimens.xml
View File

@@ -279,7 +279,7 @@
<dimen name="notification_expand_button_padding_top">1dp</dimen> <dimen name="notification_expand_button_padding_top">1dp</dimen>
<!-- Height of a small notification in the status bar --> <!-- 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. --> <!-- The width of the big icons in notifications. -->
<dimen name="notification_large_icon_width">64dp</dimen> <dimen name="notification_large_icon_width">64dp</dimen>

1
core/res/res/values/symbols.xml
View File

@@ -3797,6 +3797,7 @@
<java-symbol type="string" name="config_displayLightSensorType" /> <java-symbol type="string" name="config_displayLightSensorType" />
<java-symbol type="drawable" name="iconfactory_adaptive_icon_drawable_wrapper"/> <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_icon_size"/>
<java-symbol type="dimen" name="resolver_badge_size"/> <java-symbol type="dimen" name="resolver_badge_size"/>
<java-symbol type="dimen" name="resolver_button_bar_spacing"/> <java-symbol type="dimen" name="resolver_button_bar_spacing"/>

2
packages/SystemUI/res/values/dimens.xml
View File

@@ -112,7 +112,7 @@
<dimen name="status_bar_connected_device_bt_indicator_size">17dp</dimen> <dimen name="status_bar_connected_device_bt_indicator_size">17dp</dimen>
<!-- Height of a small notification in the status bar--> <!-- 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 --> <!-- Increased height of a small notification in the status bar -->
<dimen name="notification_min_height_increased">146dp</dimen> <dimen name="notification_min_height_increased">146dp</dimen>