diff options
| author | Daichi Hirono <hirono@google.com> | 2015-05-19 22:34:38 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-05-19 22:34:38 +0000 |
| commit | 15a55933095c2be3a5744d278f7ba17d59a6792f (patch) | |
| tree | b9d7ecca21e61fca2b8895301f06e587e6c315b6 /packages/DocumentsUI/res | |
| parent | 78011ba9db257e7ae0bc06d49104c6f4bebc799e (diff) | |
| parent | b7d072f42fd4fcb2e6e2d7a88ede2d4cee05127c (diff) | |
| download | frameworks_base-15a55933095c2be3a5744d278f7ba17d59a6792f.zip frameworks_base-15a55933095c2be3a5744d278f7ba17d59a6792f.tar.gz frameworks_base-15a55933095c2be3a5744d278f7ba17d59a6792f.tar.bz2 | |
am b7d072f4: Merge "DocumentUI: Plish the design of footer bottons." into mnc-dev
* commit 'b7d072f42fd4fcb2e6e2d7a88ede2d4cee05127c':
DocumentUI: Plish the design of footer bottons.
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] --> |