diff options
author | Jeff Sharkey <jsharkey@android.com> | 2013-09-21 15:11:19 -0700 |
---|---|---|
committer | Jeff Sharkey <jsharkey@android.com> | 2013-09-21 15:26:37 -0700 |
commit | 1feeddf518d31a7ff5d28000a631857442cd7161 (patch) | |
tree | aa3fe4cbf1ee0546838193479f17fe8f7ac8ea68 /packages/DocumentsUI/res/layout | |
parent | 5545f56f7561810187545a1817b6001dd1f9931b (diff) | |
download | frameworks_base-1feeddf518d31a7ff5d28000a631857442cd7161.zip frameworks_base-1feeddf518d31a7ff5d28000a631857442cd7161.tar.gz frameworks_base-1feeddf518d31a7ff5d28000a631857442cd7161.tar.bz2 |
Latest UX asset drop, grid padding.
Bring in latest asset drop. Apply grid padding programmatically
instead of waiting for asset. Remove alpha from directory animation.
Update save footer background to match spec.
Bug: 10700025
Change-Id: I8eef08f36d04767b78e91b23f72bdbebfbb02f58
Diffstat (limited to 'packages/DocumentsUI/res/layout')
-rw-r--r-- | packages/DocumentsUI/res/layout/fragment_backend.xml | 29 | ||||
-rw-r--r-- | packages/DocumentsUI/res/layout/fragment_directory.xml | 5 | ||||
-rw-r--r-- | packages/DocumentsUI/res/layout/fragment_save.xml | 73 |
3 files changed, 48 insertions, 59 deletions
diff --git a/packages/DocumentsUI/res/layout/fragment_backend.xml b/packages/DocumentsUI/res/layout/fragment_backend.xml deleted file mode 100644 index 2648de2..0000000 --- a/packages/DocumentsUI/res/layout/fragment_backend.xml +++ /dev/null @@ -1,29 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2013 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> - -<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="match_parent"> - - <GridView - android:id="@+id/grid" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:listSelector="@android:color/transparent" - android:paddingTop="?android:attr/listPreferredItemPaddingStart" - android:paddingStart="?android:attr/listPreferredItemPaddingStart" /> - -</FrameLayout> diff --git a/packages/DocumentsUI/res/layout/fragment_directory.xml b/packages/DocumentsUI/res/layout/fragment_directory.xml index 07bf127..98ded34 100644 --- a/packages/DocumentsUI/res/layout/fragment_directory.xml +++ b/packages/DocumentsUI/res/layout/fragment_directory.xml @@ -38,6 +38,11 @@ android:id="@+id/grid" android:layout_width="match_parent" android:layout_height="match_parent" + android:paddingStart="@dimen/grid_padding_horiz" + android:paddingEnd="@dimen/grid_padding_horiz" + android:paddingTop="@dimen/grid_padding" + android:paddingBottom="@dimen/grid_padding" + android:scrollbarStyle="outsideOverlay" android:listSelector="@android:color/transparent" android:visibility="gone" /> diff --git a/packages/DocumentsUI/res/layout/fragment_save.xml b/packages/DocumentsUI/res/layout/fragment_save.xml index 49038bc..570b517 100644 --- a/packages/DocumentsUI/res/layout/fragment_save.xml +++ b/packages/DocumentsUI/res/layout/fragment_save.xml @@ -17,36 +17,49 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="wrap_content" - android:orientation="horizontal" - android:gravity="center_vertical" - android:background="@color/chip" - android:minHeight="?android:attr/listPreferredItemHeightSmall"> - - <ImageView - android:id="@android:id/icon" - android:layout_width="24dp" - android:layout_height="24dp" - android:layout_marginStart="8dp" - android:layout_marginEnd="8dp" - android:scaleType="centerInside" - android:contentDescription="@null" /> - - <EditText - android:id="@android:id/title" - android:layout_width="0dip" + android:orientation="vertical"> + + <!-- Le sigh, this really should be an asset --> + <View + android:layout_width="match_parent" + android:layout_height="1dp" + android:background="#ccc" /> + + <LinearLayout + android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_weight="1" - android:singleLine="true" - android:selectAllOnFocus="true" /> - - <Button - android:id="@android:id/button1" - android:layout_width="wrap_content" - android:layout_height="match_parent" - android:background="?android:attr/selectableItemBackground" - android:text="@string/menu_save" - android:textAllCaps="true" - android:textAppearance="?android:attr/textAppearanceSmall" - android:padding="8dp" /> + android:orientation="horizontal" + android:gravity="center_vertical" + android:background="#ddd" + android:minHeight="?android:attr/listPreferredItemHeightSmall"> + + <ImageView + android:id="@android:id/icon" + android:layout_width="24dp" + android:layout_height="24dp" + android:layout_marginStart="8dp" + android:layout_marginEnd="8dp" + android:scaleType="centerInside" + android:contentDescription="@null" /> + + <EditText + android:id="@android:id/title" + android:layout_width="0dip" + android:layout_height="wrap_content" + android:layout_weight="1" + android:singleLine="true" + android:selectAllOnFocus="true" /> + + <Button + android:id="@android:id/button1" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:background="?android:attr/selectableItemBackground" + android:text="@string/menu_save" + android:textAllCaps="true" + android:textAppearance="?android:attr/textAppearanceSmall" + android:padding="8dp" /> + + </LinearLayout> </LinearLayout> |