diff options
| author | Adam Powell <adamp@google.com> | 2010-06-29 17:58:20 -0700 |
|---|---|---|
| committer | Adam Powell <adamp@google.com> | 2010-06-29 19:00:15 -0700 |
| commit | 0e94b5151d817e600a888448a662208b29b5ef46 (patch) | |
| tree | 59111e6981d37824e1482858bd6d2ccc6847032f /core/res | |
| parent | bd800f40ace12e2a218e93255411dc1d4c3f5266 (diff) | |
| download | frameworks_base-0e94b5151d817e600a888448a662208b29b5ef46.zip frameworks_base-0e94b5151d817e600a888448a662208b29b5ef46.tar.gz frameworks_base-0e94b5151d817e600a888448a662208b29b5ef46.tar.bz2 | |
Add subtitles for action bars and context modes.
Fix an issue where context mode content was cleared before animating out.
Change-Id: Ie7a065e65bc18e3da32de07543d0f71d2a2d648c
Diffstat (limited to 'core/res')
| -rw-r--r-- | core/res/res/layout/action_bar_title_item.xml | 23 |
1 files changed, 17 insertions, 6 deletions
diff --git a/core/res/res/layout/action_bar_title_item.xml b/core/res/res/layout/action_bar_title_item.xml index d7f7c13..3c046fe 100644 --- a/core/res/res/layout/action_bar_title_item.xml +++ b/core/res/res/layout/action_bar_title_item.xml @@ -14,9 +14,20 @@ limitations under the License. --> -<TextView - xmlns:android="http://schemas.android.com/apk/res/android" - - android:singleLine="true" - android:ellipsize="end" - android:textAppearance="?android:attr/textAppearanceMediumInverse" /> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:orientation="vertical" > + <TextView android:id="@+id/action_bar_title" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:singleLine="true" + android:ellipsize="end" + android:textAppearance="?android:attr/textAppearanceMediumInverse" /> + <TextView android:id="@+id/action_bar_subtitle" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:singleLine="true" + android:ellipsize="end" + android:textAppearance="?android:attr/textAppearanceSmallInverse" /> +</LinearLayout> |