summaryrefslogtreecommitdiffstats
path: root/packages/SystemUI/res
diff options
context:
space:
mode:
authorSelim Cinek <cinek@google.com>2014-03-28 20:21:01 +0100
committerSelim Cinek <cinek@google.com>2014-04-03 18:59:37 +0200
commitb6d85ebfe4f9f5d3b7d7ab7b6123af02a0deb516 (patch)
tree1be4ffe55781f9fa02602f97d856e84af11abc14 /packages/SystemUI/res
parent10a5ec230f41fcfba7bdd0acb32f7bb113eba3da (diff)
downloadframeworks_base-b6d85ebfe4f9f5d3b7d7ab7b6123af02a0deb516.zip
frameworks_base-b6d85ebfe4f9f5d3b7d7ab7b6123af02a0deb516.tar.gz
frameworks_base-b6d85ebfe4f9f5d3b7d7ab7b6123af02a0deb516.tar.bz2
Enabled the new notification shade and improved expanding logic
Made the NotificationStackScroller now the default and only shade. When the notification shade is expanded, the NotificationStackScroller now also expands revealing the notifications. Change-Id: If989ed848f684b3ac4e687d9642289db4599553b
Diffstat (limited to 'packages/SystemUI/res')
-rw-r--r--packages/SystemUI/res/layout/status_bar_expanded.xml25
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"