diff options
author | Daniel Sandler <dsandler@android.com> | 2012-08-15 21:03:25 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-08-15 21:03:26 -0700 |
commit | 228916713db16dd536a8f3d7256b5726a2eaeb2b (patch) | |
tree | cfaa8b24000a1c76e352fa47074a647768b49bed /packages/SystemUI/res | |
parent | 2b197db7868ef756eef455184ea7eed1a2145264 (diff) | |
parent | b9301c3a686df05950710ec80e2cd691c3082871 (diff) | |
download | frameworks_base-228916713db16dd536a8f3d7256b5726a2eaeb2b.zip frameworks_base-228916713db16dd536a8f3d7256b5726a2eaeb2b.tar.gz frameworks_base-228916713db16dd536a8f3d7256b5726a2eaeb2b.tar.bz2 |
Merge "Multiuser support for notifications, take 1." into jb-mr1-dev
Diffstat (limited to 'packages/SystemUI/res')
-rw-r--r-- | packages/SystemUI/res/layout/status_bar_expanded_header.xml | 17 | ||||
-rw-r--r-- | packages/SystemUI/res/layout/status_bar_notification_row.xml | 13 |
2 files changed, 28 insertions, 2 deletions
diff --git a/packages/SystemUI/res/layout/status_bar_expanded_header.xml b/packages/SystemUI/res/layout/status_bar_expanded_header.xml index 7f598b6..60896c3 100644 --- a/packages/SystemUI/res/layout/status_bar_expanded_header.xml +++ b/packages/SystemUI/res/layout/status_bar_expanded_header.xml @@ -65,11 +65,24 @@ android:layout_weight="1" /> + <TextView + android:id="@+id/header_debug_info" + android:visibility="invisible" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:fontFamily="sans-serif-condensed" + android:textSize="11dp" + android:textStyle="bold" + android:textColor="#00A040" + android:padding="2dp" + /> + <ImageView android:id="@+id/clear_all_button" android:layout_width="48dp" android:layout_height="48dp" android:scaleType="center" android:src="@drawable/ic_notify_clear" android:contentDescription="@string/accessibility_clear_all" - /> -</LinearLayout>
\ No newline at end of file + /> +</LinearLayout> diff --git a/packages/SystemUI/res/layout/status_bar_notification_row.xml b/packages/SystemUI/res/layout/status_bar_notification_row.xml index dd70166..3dcdae8 100644 --- a/packages/SystemUI/res/layout/status_bar_notification_row.xml +++ b/packages/SystemUI/res/layout/status_bar_notification_row.xml @@ -49,4 +49,17 @@ android:background="@drawable/bottom_divider_glow" /> + <TextView + android:id="@+id/debug_info" + android:visibility="invisible" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="bottom|right" + android:fontFamily="sans-serif-condensed" + android:textSize="9dp" + android:textStyle="bold" + android:textColor="#00A040" + android:padding="2dp" + /> + </FrameLayout> |