diff options
| author | Daniel Sandler <dsandler@android.com> | 2012-08-15 21:08:19 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-08-15 21:08:19 -0700 |
| commit | cca3295f3ec980b82078c3cf8135606a60408da3 (patch) | |
| tree | aa2c004bb7e1a57498bf597ba9b94c22b89e25ca /packages/SystemUI/res | |
| parent | 528baa90f929e806918a661ba50e13112721dd49 (diff) | |
| parent | b409323fd5a68f5699644dc6373842524ace7752 (diff) | |
| download | frameworks_base-cca3295f3ec980b82078c3cf8135606a60408da3.zip frameworks_base-cca3295f3ec980b82078c3cf8135606a60408da3.tar.gz frameworks_base-cca3295f3ec980b82078c3cf8135606a60408da3.tar.bz2 | |
am b409323f: am 22891671: Merge "Multiuser support for notifications, take 1." into jb-mr1-dev
* commit 'b409323fd5a68f5699644dc6373842524ace7752':
Multiuser support for notifications, take 1.
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> |