diff options
| author | Daichi Hirono <hirono@google.com> | 2015-04-17 18:42:03 +0900 |
|---|---|---|
| committer | Daichi Hirono <hirono@google.com> | 2015-05-18 11:27:15 +0900 |
| commit | e9cbfe8e5adadfbe740836d46b8a52a066316697 (patch) | |
| tree | 12b7e24e971b2a6584b95e330a01d7b3a1bee81b /packages/DocumentsUI/res | |
| parent | 19877fa5f63de5d403e981c9d0025b237aea4306 (diff) | |
| download | frameworks_base-e9cbfe8e5adadfbe740836d46b8a52a066316697.zip frameworks_base-e9cbfe8e5adadfbe740836d46b8a52a066316697.tar.gz frameworks_base-e9cbfe8e5adadfbe740836d46b8a52a066316697.tar.bz2 | |
DocumentUI: Plish the design of footer bottons.
* Remove the directory name from "pick" button.
* Allign buttons at right.
* Fix bug that the pick button turns to be hidden after screen rotation.
BUG=20285152
Change-Id: I909d52f341bf67c5627431a354a9b0ccec152a05
Diffstat (limited to 'packages/DocumentsUI/res')
| -rw-r--r-- | packages/DocumentsUI/res/layout/fragment_pick.xml | 6 | ||||
| -rw-r--r-- | packages/DocumentsUI/res/values/strings.xml | 6 |
2 files changed, 5 insertions, 7 deletions
diff --git a/packages/DocumentsUI/res/layout/fragment_pick.xml b/packages/DocumentsUI/res/layout/fragment_pick.xml index 87dc4f8..40d4eb5 100644 --- a/packages/DocumentsUI/res/layout/fragment_pick.xml +++ b/packages/DocumentsUI/res/layout/fragment_pick.xml @@ -19,13 +19,13 @@ android:layout_height="wrap_content" android:orientation="horizontal" android:baselineAligned="false" - android:gravity="center_vertical" + android:gravity="end" + android:paddingEnd="8dp" android:minHeight="?android:attr/listPreferredItemHeightSmall"> <Button android:id="@android:id/button2" android:layout_width="wrap_content" android:layout_height="match_parent" - android:layout_weight="1" android:text="@android:string/cancel" android:visibility="gone" style="?android:attr/buttonBarNegativeButtonStyle" /> @@ -33,7 +33,5 @@ android:id="@android:id/button1" android:layout_width="wrap_content" android:layout_height="match_parent" - android:layout_weight="1" - android:textAllCaps="false" style="?android:attr/buttonBarPositiveButtonStyle" /> </LinearLayout> diff --git a/packages/DocumentsUI/res/values/strings.xml b/packages/DocumentsUI/res/values/strings.xml index 5281087..9794273 100644 --- a/packages/DocumentsUI/res/values/strings.xml +++ b/packages/DocumentsUI/res/values/strings.xml @@ -44,8 +44,6 @@ <string name="menu_share">Share</string> <!-- Menu item title that deletes the selected documents [CHAR LIMIT=24] --> <string name="menu_delete">Delete</string> - <!-- Menu item title that selects the current directory [CHAR LIMIT=48] --> - <string name="menu_select">Select \"<xliff:g id="directory" example="My Directory">^1</xliff:g>\"</string> <!-- Menu item title that selects all documents in the current directory [CHAR LIMIT=24] --> <string name="menu_select_all">Select All</string> <!-- Menu item title that copies the selected documents [CHAR LIMIT=24] --> @@ -65,7 +63,9 @@ <!-- Menu item that hides the sizes of displayed files [CHAR LIMIT=24] --> <string name="menu_file_size_hide">Hide file size</string> - <!-- Button label that copies files to the current directory [CHAR LIMIT=48] --> + <!-- Button label that select the current directory [CHAR LIMIT=24] --> + <string name="button_select">Select</string> + <!-- Button label that copies files to the current directory [CHAR LIMIT=24] --> <string name="button_copy">Copy</string> <!-- Action mode title summarizing the number of documents selected [CHAR LIMIT=32] --> |