diff options
| author | Adam Powell <adamp@google.com> | 2013-06-19 11:33:28 -0700 |
|---|---|---|
| committer | Adam Powell <adamp@google.com> | 2013-09-10 18:09:03 -0700 |
| commit | ad79b90f21dcde6f741c47a251882c0a47c5f698 (patch) | |
| tree | e25c6b620cae46b7c8244400f937d89521566b74 /core/res | |
| parent | 2f1ef77c07da2ed7168f75551dd632026b20f8cc (diff) | |
| download | frameworks_base-ad79b90f21dcde6f741c47a251882c0a47c5f698.zip frameworks_base-ad79b90f21dcde6f741c47a251882c0a47c5f698.tar.gz frameworks_base-ad79b90f21dcde6f741c47a251882c0a47c5f698.tar.bz2 | |
Action bar refactoring and transitions
* Remove the extra occurrence of the Up caret view and reuse the
standard home view.
* Use new transition APIs to animate changes in action bar content.
Change-Id: I7af3bb580ef4bff7d8dec9e21649b856fe73c77b
Diffstat (limited to 'core/res')
| -rw-r--r-- | core/res/res/layout/action_bar_title_item.xml | 45 |
1 files changed, 16 insertions, 29 deletions
diff --git a/core/res/res/layout/action_bar_title_item.xml b/core/res/res/layout/action_bar_title_item.xml index ccc5b07..fecfded 100644 --- a/core/res/res/layout/action_bar_title_item.xml +++ b/core/res/res/layout/action_bar_title_item.xml @@ -16,33 +16,20 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="wrap_content" - android:layout_height="match_parent" - android:orientation="horizontal" - android:paddingEnd="8dip" - android:enabled="false"> - - <ImageView android:id="@android:id/up" - android:src="?android:attr/homeAsUpIndicator" - android:layout_gravity="center_vertical|start" - android:visibility="gone" - android:layout_width="wrap_content" - android:layout_height="wrap_content" /> - - <LinearLayout android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical|start" - 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" /> - <TextView android:id="@+id/action_bar_subtitle" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginTop="@dimen/action_bar_subtitle_top_margin" - android:singleLine="true" - android:ellipsize="end" - android:visibility="gone" /> - </LinearLayout> + android:layout_height="wrap_content" + android:layout_gravity="center_vertical|start" + android:orientation="vertical" + android:paddingEnd="8dp"> + <TextView android:id="@+id/action_bar_title" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:singleLine="true" + android:ellipsize="end" /> + <TextView android:id="@+id/action_bar_subtitle" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/action_bar_subtitle_top_margin" + android:singleLine="true" + android:ellipsize="end" + android:visibility="gone" /> </LinearLayout> |