diff options
Diffstat (limited to 'packages/SystemUI/res')
3 files changed, 33 insertions, 71 deletions
diff --git a/packages/SystemUI/res/layout/status_bar_notification_keyguard_overflow.xml b/packages/SystemUI/res/layout/status_bar_notification_keyguard_overflow.xml index 5d2f330..d81e525 100644 --- a/packages/SystemUI/res/layout/status_bar_notification_keyguard_overflow.xml +++ b/packages/SystemUI/res/layout/status_bar_notification_keyguard_overflow.xml @@ -19,34 +19,27 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="wrap_content" + android:focusable="true" + android:clickable="true" + android:background="@*android:drawable/notification_quantum_bg_dim" > - <com.android.systemui.statusbar.LatestItemView - android:id="@+id/container" + <TextView + android:id="@+id/more_text" android:layout_width="match_parent" - android:layout_height="40dp" - android:layout_marginTop="@dimen/notification_divider_height" - android:focusable="true" - android:clickable="true" - android:background="@*android:drawable/notification_quantum_bg_dim" - > - <TextView - android:id="@+id/more_text" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:gravity="center_horizontal" - android:textColor="@color/keyguard_overflow_content_color" - android:textAllCaps="true" - android:textAppearance="?android:attr/textAppearanceMedium" - /> - <com.android.systemui.statusbar.NotificationOverflowIconsView - android:id="@+id/overflow_icons_view" - android:layout_gravity="end|center_vertical" - android:gravity="end" - android:paddingLeft="8dp" - android:paddingRight="8dp" - android:layout_width="120dp" - android:layout_height="wrap_content" - /> - </com.android.systemui.statusbar.LatestItemView> + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:gravity="center_horizontal" + android:textColor="@color/keyguard_overflow_content_color" + android:textAllCaps="true" + android:textAppearance="?android:attr/textAppearanceMedium" + /> + <com.android.systemui.statusbar.NotificationOverflowIconsView + android:id="@+id/overflow_icons_view" + android:layout_gravity="end|center_vertical" + android:gravity="end" + android:paddingLeft="8dp" + android:paddingRight="8dp" + android:layout_width="120dp" + android:layout_height="wrap_content" + /> </com.android.systemui.statusbar.NotificationOverflowContainer> diff --git a/packages/SystemUI/res/layout/status_bar_notification_row.xml b/packages/SystemUI/res/layout/status_bar_notification_row.xml index d61d8b9..41e7dac 100644 --- a/packages/SystemUI/res/layout/status_bar_notification_row.xml +++ b/packages/SystemUI/res/layout/status_bar_notification_row.xml @@ -2,17 +2,18 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="wrap_content" + android:focusable="true" + android:clickable="true" + android:background="@*android:drawable/notification_quantum_bg" > - <View - android:id="@+id/top_glow" - android:alpha="0" - android:visibility="invisible" + <com.android.internal.widget.SizeAdaptiveLayout android:id="@+id/expanded" + android:layout_width="match_parent" + android:layout_height="wrap_content" /> + + <com.android.internal.widget.SizeAdaptiveLayout android:id="@+id/expandedPublic" android:layout_width="match_parent" - android:layout_height="@dimen/notification_divider_height" - android:layout_gravity="top|center_horizontal" - android:background="@drawable/top_divider_glow" - /> + android:layout_height="wrap_content" /> <Button android:id="@+id/veto" @@ -25,35 +26,6 @@ android:paddingStart="8dp" /> - <com.android.systemui.statusbar.LatestItemView android:id="@+id/container" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginBottom="@dimen/notification_divider_height" - android:layout_marginTop="@dimen/notification_divider_height" - android:focusable="true" - android:clickable="true" - android:background="@*android:drawable/notification_quantum_bg" - > - - <com.android.internal.widget.SizeAdaptiveLayout android:id="@+id/expanded" - android:layout_width="match_parent" - android:layout_height="wrap_content" /> - - <com.android.internal.widget.SizeAdaptiveLayout android:id="@+id/expandedPublic" - android:layout_width="match_parent" - android:layout_height="wrap_content" /> - </com.android.systemui.statusbar.LatestItemView> - - <View - android:id="@+id/bottom_glow" - android:alpha="0" - android:visibility="invisible" - android:layout_width="match_parent" - android:layout_height="@dimen/notification_divider_height" - android:layout_gravity="bottom|center_horizontal" - android:background="@drawable/bottom_divider_glow" - /> - <TextView android:id="@+id/debug_info" android:visibility="invisible" diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml index 0604817..176879e 100644 --- a/packages/SystemUI/res/values/dimens.xml +++ b/packages/SystemUI/res/values/dimens.xml @@ -82,12 +82,6 @@ <!-- Height of a medium notification in the status bar --> <dimen name="notification_mid_height">128dp</dimen> - <!-- Height of a small notification in the status bar plus glow, padding, etc --> - <dimen name="notification_row_min_height">68dp</dimen> - - <!-- Height of a large notification in the status bar plus glow, padding, etc --> - <dimen name="notification_row_max_height">260dp</dimen> - <!-- size at which Notification icons will be drawn in the status bar --> <dimen name="status_bar_icon_drawing_size">18dip</dimen> @@ -261,6 +255,9 @@ <!-- Z distance between notifications if they are in the stack --> <dimen name="z_distance_between_notifications">2dp</dimen> + <!-- The padding between the individual notification cards. --> + <dimen name="notification_padding">3dp</dimen> + <!-- Width of the zen mode interstitial dialog. --> <dimen name="zen_mode_dialog_width">320dp</dimen> |