diff options
| author | Selim Cinek <cinek@google.com> | 2014-04-29 20:50:03 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-04-29 20:50:03 +0000 |
| commit | 61168c716237451202b3db3d480cdc524a050ab9 (patch) | |
| tree | 4e0491085f2cf50781ed8b42b87c2357bd2ced12 /packages/SystemUI/res | |
| parent | f43d8237c8a165ae7405ea0b24b687e963928a2b (diff) | |
| parent | d0b12fe4a2deadd78141ada10818c531226ac9d2 (diff) | |
| download | frameworks_base-61168c716237451202b3db3d480cdc524a050ab9.zip frameworks_base-61168c716237451202b3db3d480cdc524a050ab9.tar.gz frameworks_base-61168c716237451202b3db3d480cdc524a050ab9.tar.bz2 | |
am 80284e2e: Merge "Refactored the layout of a notifications"
* commit '80284e2e40f28cad1315f57388db999f69edd972':
Refactored the layout of a notifications
Diffstat (limited to 'packages/SystemUI/res')
| -rw-r--r-- | packages/SystemUI/res/layout/status_bar_notification_keyguard_overflow.xml | 3 | ||||
| -rw-r--r-- | packages/SystemUI/res/layout/status_bar_notification_row.xml | 5 |
2 files changed, 3 insertions, 5 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 d81e525..2e08bff 100644 --- a/packages/SystemUI/res/layout/status_bar_notification_keyguard_overflow.xml +++ b/packages/SystemUI/res/layout/status_bar_notification_keyguard_overflow.xml @@ -18,10 +18,9 @@ <com.android.systemui.statusbar.NotificationOverflowContainer xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" - android:layout_height="wrap_content" + android:layout_height="32dp" android:focusable="true" android:clickable="true" - android:background="@*android:drawable/notification_quantum_bg_dim" > <TextView android:id="@+id/more_text" diff --git a/packages/SystemUI/res/layout/status_bar_notification_row.xml b/packages/SystemUI/res/layout/status_bar_notification_row.xml index 41e7dac..8959a5b 100644 --- a/packages/SystemUI/res/layout/status_bar_notification_row.xml +++ b/packages/SystemUI/res/layout/status_bar_notification_row.xml @@ -4,14 +4,13 @@ android:layout_height="wrap_content" android:focusable="true" android:clickable="true" - android:background="@*android:drawable/notification_quantum_bg" > - <com.android.internal.widget.SizeAdaptiveLayout android:id="@+id/expanded" + <com.android.systemui.statusbar.NotificationContentView android:id="@+id/expanded" android:layout_width="match_parent" android:layout_height="wrap_content" /> - <com.android.internal.widget.SizeAdaptiveLayout android:id="@+id/expandedPublic" + <com.android.systemui.statusbar.NotificationContentView android:id="@+id/expandedPublic" android:layout_width="match_parent" android:layout_height="wrap_content" /> |