diff options
| author | Daichi Hirono <hirono@google.com> | 2015-06-11 05:39:19 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-06-11 05:39:19 +0000 |
| commit | 0d53e4d1c0831d2aa0e9622ea9f3470ab59c534a (patch) | |
| tree | 1f36219464cfd696c1ad9cdc67138dbc25ca0cf2 /packages/DocumentsUI/res | |
| parent | ac114ae071fac3693e4694f338f5e5612f11a730 (diff) | |
| parent | 4ba81a0878d058734e9eb2c298d7fc4df7e597ed (diff) | |
| download | frameworks_base-0d53e4d1c0831d2aa0e9622ea9f3470ab59c534a.zip frameworks_base-0d53e4d1c0831d2aa0e9622ea9f3470ab59c534a.tar.gz frameworks_base-0d53e4d1c0831d2aa0e9622ea9f3470ab59c534a.tar.bz2 | |
am 4ba81a08: Merge "Update visibility of the stack dropdown list after the search view is collapsed." into mnc-dev
* commit '4ba81a0878d058734e9eb2c298d7fc4df7e597ed':
Update visibility of the stack dropdown list after the search view is collapsed.
Diffstat (limited to 'packages/DocumentsUI/res')
| -rw-r--r-- | packages/DocumentsUI/res/layout-sw720dp/activity.xml | 4 | ||||
| -rw-r--r-- | packages/DocumentsUI/res/layout/activity.xml | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/packages/DocumentsUI/res/layout-sw720dp/activity.xml b/packages/DocumentsUI/res/layout-sw720dp/activity.xml index a9f1b3c..2a273f4 100644 --- a/packages/DocumentsUI/res/layout-sw720dp/activity.xml +++ b/packages/DocumentsUI/res/layout-sw720dp/activity.xml @@ -19,7 +19,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - <Toolbar + <com.android.documentsui.DocumentsToolBar android:id="@+id/toolbar" android:layout_width="match_parent" android:layout_height="?android:attr/actionBarSize" @@ -34,7 +34,7 @@ android:layout_marginStart="4dp" android:overlapAnchor="true" /> - </Toolbar> + </com.android.documentsui.DocumentsToolBar> <LinearLayout android:layout_width="match_parent" diff --git a/packages/DocumentsUI/res/layout/activity.xml b/packages/DocumentsUI/res/layout/activity.xml index b549cd3..43fdaf2 100644 --- a/packages/DocumentsUI/res/layout/activity.xml +++ b/packages/DocumentsUI/res/layout/activity.xml @@ -24,7 +24,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - <Toolbar + <com.android.documentsui.DocumentsToolBar android:id="@+id/toolbar" android:layout_width="match_parent" android:layout_height="?android:attr/actionBarSize" @@ -39,7 +39,7 @@ android:layout_marginStart="4dp" android:overlapAnchor="true" /> - </Toolbar> + </com.android.documentsui.DocumentsToolBar> <com.android.documentsui.DirectoryContainerView android:id="@+id/container_directory" |