diff options
| author | Jorim Jaggi <jjaggi@google.com> | 2014-04-03 21:07:39 +0200 |
|---|---|---|
| committer | Jorim Jaggi <jjaggi@google.com> | 2014-04-03 21:07:39 +0200 |
| commit | 18d084698c805fea57c2808d1729c0f62df5573d (patch) | |
| tree | 94660643517079f0979715495c9e896c5d3fea3e /packages/SystemUI/res | |
| parent | a66a735dc6bbec1dbf942fe392ba3dacd5035302 (diff) | |
| parent | 9316082809196acd126a1e502d4b26d7b5f98216 (diff) | |
| download | frameworks_base-18d084698c805fea57c2808d1729c0f62df5573d.zip frameworks_base-18d084698c805fea57c2808d1729c0f62df5573d.tar.gz frameworks_base-18d084698c805fea57c2808d1729c0f62df5573d.tar.bz2 | |
resolved conflicts for merge of 93160828 to master-lockscreen-dev
Change-Id: Ief6d6b8b8cc9ae2eb38442a3ba9ecae4637b75d6
Diffstat (limited to 'packages/SystemUI/res')
| -rw-r--r-- | packages/SystemUI/res/layout/status_bar_expanded.xml | 25 |
1 files changed, 1 insertions, 24 deletions
diff --git a/packages/SystemUI/res/layout/status_bar_expanded.xml b/packages/SystemUI/res/layout/status_bar_expanded.xml index 1da66bb..a7ec064 100644 --- a/packages/SystemUI/res/layout/status_bar_expanded.xml +++ b/packages/SystemUI/res/layout/status_bar_expanded.xml @@ -24,19 +24,10 @@ android:id="@+id/notification_panel" android:layout_width="0dp" android:layout_height="wrap_content" - android:background="@drawable/notification_panel_bg" android:paddingTop="@dimen/notification_panel_padding_top" android:layout_marginStart="@dimen/notification_panel_margin_left" > - <View - android:id="@+id/handle" - android:layout_width="match_parent" - android:layout_height="@dimen/close_handle_height" - android:background="@drawable/status_bar_close" - android:visibility="invisible" - /> - <include layout="@layout/carrier_label" android:layout_height="@dimen/carrier_label_height" @@ -69,6 +60,7 @@ /> <FrameLayout + android:id="@+id/notification_container_parent" android:layout_width="match_parent" android:layout_height="wrap_content" > @@ -77,21 +69,6 @@ android:layout_width="match_parent" android:layout_height="wrap_content" /> - - <ScrollView - android:id="@+id/scroll" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:fadingEdge="none" - android:overScrollMode="ifContentScrolls" - > - <com.android.systemui.statusbar.policy.NotificationRowLayout - android:id="@+id/latestItems" - android:layout_width="match_parent" - android:layout_height="wrap_content" - systemui:rowHeight="@dimen/notification_row_min_height" - /> - </ScrollView> <com.android.systemui.statusbar.stack.NotificationStackScrollLayout android:id="@+id/notification_stack_scroller" |