diff options
| author | Daniel Sandler <dsandler@android.com> | 2012-07-27 11:19:52 -0400 |
|---|---|---|
| committer | Daniel Sandler <dsandler@android.com> | 2012-07-27 11:19:54 -0400 |
| commit | dd4ef49f4545dad2a6503d29e129472aba5392fc (patch) | |
| tree | 12c0bca2fd41b31a3b4a586dffa54e6f1b5f2bab /packages/SystemUI/res | |
| parent | cdd0c59a0108036895796dcb2bea69ff5eef26ca (diff) | |
| download | frameworks_base-dd4ef49f4545dad2a6503d29e129472aba5392fc.zip frameworks_base-dd4ef49f4545dad2a6503d29e129472aba5392fc.tar.gz frameworks_base-dd4ef49f4545dad2a6503d29e129472aba5392fc.tar.bz2 | |
Persistent 'emergency calls' banner in the notification panel.
While carrier info (or SSID for devices without mobile data)
will still be shown in a floating text view at the bottom of
the notification shade, emergency-calls-only mode will now
be shown in the notification panel header so that it cannot
be obscured by notifications.
Change-Id: I714b6801be2b9b631b86b51d229440445eff5e76
Diffstat (limited to 'packages/SystemUI/res')
| -rw-r--r-- | packages/SystemUI/res/layout/status_bar_expanded.xml | 20 | ||||
| -rw-r--r-- | packages/SystemUI/res/values/styles.xml | 3 |
2 files changed, 18 insertions, 5 deletions
diff --git a/packages/SystemUI/res/layout/status_bar_expanded.xml b/packages/SystemUI/res/layout/status_bar_expanded.xml index 47e5b71..5841978 100644 --- a/packages/SystemUI/res/layout/status_bar_expanded.xml +++ b/packages/SystemUI/res/layout/status_bar_expanded.xml @@ -40,24 +40,34 @@ android:visibility="invisible" /> - <FrameLayout + <LinearLayout android:layout_width="match_parent" android:layout_height="match_parent" android:layout_marginBottom="@dimen/close_handle_underlap" + android:orientation="vertical" > <include layout="@layout/status_bar_expanded_header" android:layout_width="match_parent" android:layout_height="@dimen/notification_panel_header_height" /> - + + <TextView + android:id="@+id/emergency_calls_only" + android:textAppearance="@style/TextAppearance.StatusBar.Expanded.Network.EmergencyOnly" + android:layout_height="wrap_content" + android:layout_width="match_parent" + android:paddingBottom="4dp" + android:gravity="center" + android:visibility="gone" + /> + <ScrollView android:id="@+id/scroll" android:layout_width="match_parent" android:layout_height="match_parent" android:fadingEdge="none" - android:overScrollMode="ifContentScrolls" - android:layout_marginTop="@dimen/notification_panel_header_height" + android:overScrollMode="always" > <com.android.systemui.statusbar.policy.NotificationRowLayout android:id="@+id/latestItems" @@ -66,7 +76,7 @@ systemui:rowHeight="@dimen/notification_row_min_height" /> </ScrollView> - </FrameLayout> + </LinearLayout> <com.android.systemui.statusbar.phone.CloseDragHandle android:id="@+id/close" android:layout_width="match_parent" diff --git a/packages/SystemUI/res/values/styles.xml b/packages/SystemUI/res/values/styles.xml index 1d5bf3c..2564003 100644 --- a/packages/SystemUI/res/values/styles.xml +++ b/packages/SystemUI/res/values/styles.xml @@ -67,6 +67,9 @@ <item name="android:textColor">#999999</item> </style> + <style name="TextAppearance.StatusBar.Expanded.Network.EmergencyOnly"> + </style> + <style name="Animation" /> <style name="Animation.ShirtPocketPanel"> |