diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2014-07-28 16:38:52 -0700 |
|---|---|---|
| committer | Jeff Sharkey <jsharkey@google.com> | 2014-07-29 23:19:45 +0000 |
| commit | f52773fd62fc2fec40c2e17230b644dfbee6cf2d (patch) | |
| tree | f1cfd567aa9ae0639f962e7c3d23dd7e728775b2 /packages/DocumentsUI/res/layout/fragment_pick.xml | |
| parent | 1561fd3b066bef822dce69e26bdd7aaa41ca3a84 (diff) | |
| download | frameworks_base-f52773fd62fc2fec40c2e17230b644dfbee6cf2d.zip frameworks_base-f52773fd62fc2fec40c2e17230b644dfbee6cf2d.tar.gz frameworks_base-f52773fd62fc2fec40c2e17230b644dfbee6cf2d.tar.bz2 | |
More DocumentsUI material iteration.
Move to using Toolbar for all actions. Drawer contains its own
Toolbar with separate title, and hamburger is always visible. Change
drawer items to match spec. Switching to Toolbar allows us to remove
nasty dialog-on-tablet hacks, yay! This also means we can finally
get real IME resizing support.
Move to using elevation for all shadows; this removes more nasty
hacks around drawing directory shadows.
Bug: 15836082
Change-Id: Iba70b898f385a7debd8aabfc98ff39d20bca860d
Diffstat (limited to 'packages/DocumentsUI/res/layout/fragment_pick.xml')
| -rw-r--r-- | packages/DocumentsUI/res/layout/fragment_pick.xml | 34 |
1 files changed, 9 insertions, 25 deletions
diff --git a/packages/DocumentsUI/res/layout/fragment_pick.xml b/packages/DocumentsUI/res/layout/fragment_pick.xml index 4a2fd03..5735871 100644 --- a/packages/DocumentsUI/res/layout/fragment_pick.xml +++ b/packages/DocumentsUI/res/layout/fragment_pick.xml @@ -17,32 +17,16 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="wrap_content" - android:orientation="vertical"> + android:orientation="horizontal" + android:baselineAligned="false" + android:gravity="center_vertical" + android:minHeight="?android:attr/listPreferredItemHeightSmall"> - <!-- Le sigh, this really should be an asset --> - <View + <Button + android:id="@android:id/button1" android:layout_width="match_parent" - android:layout_height="1dp" - android:background="#ccc" /> - - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="horizontal" - android:baselineAligned="false" - android:gravity="center_vertical" - android:background="#ddd" - android:minHeight="?android:attr/listPreferredItemHeightSmall"> - - <Button - android:id="@android:id/button1" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:background="?android:attr/selectableItemBackground" - android:textAppearance="?android:attr/textAppearanceSmall" - android:textAllCaps="false" - android:padding="8dp" /> - - </LinearLayout> + android:layout_height="match_parent" + android:textAllCaps="false" + style="?android:attr/buttonBarPositiveButtonStyle" /> </LinearLayout> |