diff options
| author | Mike Lockwood <lockwood@android.com> | 2010-11-19 15:24:00 -0500 |
|---|---|---|
| committer | Mike Lockwood <lockwood@android.com> | 2010-11-19 15:28:36 -0500 |
| commit | 1d5dedc9e44fdccf0636cedac90529c0c5f6e166 (patch) | |
| tree | 660945c34b70138f2f334dc17f12c35fb6ec5e77 /media/tests/CameraBrowser/res | |
| parent | 929b3da2fcf061219a82dcced85ffa186c742cc4 (diff) | |
| download | frameworks_base-1d5dedc9e44fdccf0636cedac90529c0c5f6e166.zip frameworks_base-1d5dedc9e44fdccf0636cedac90529c0c5f6e166.tar.gz frameworks_base-1d5dedc9e44fdccf0636cedac90529c0c5f6e166.tar.bz2 | |
CameraBrowser improvements:
Replace menu for importing and deleting files with buttons.
Automatically close activities when camera is disconnected.
Change-Id: I88351e7c337c796057ce3f7da46fc287305f2220
Signed-off-by: Mike Lockwood <lockwood@android.com>
Diffstat (limited to 'media/tests/CameraBrowser/res')
| -rw-r--r-- | media/tests/CameraBrowser/res/layout/object_info.xml | 12 | ||||
| -rw-r--r-- | media/tests/CameraBrowser/res/menu/object_menu.xml | 23 | ||||
| -rw-r--r-- | media/tests/CameraBrowser/res/values/strings.xml | 6 |
3 files changed, 15 insertions, 26 deletions
diff --git a/media/tests/CameraBrowser/res/layout/object_info.xml b/media/tests/CameraBrowser/res/layout/object_info.xml index ac210b9..a0499f2 100644 --- a/media/tests/CameraBrowser/res/layout/object_info.xml +++ b/media/tests/CameraBrowser/res/layout/object_info.xml @@ -153,5 +153,17 @@ <TableRow> <ImageView android:id="@+id/thumbnail" /> </TableRow> + <TableRow> + <Button android:id="@+id/import_button" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/import_label"> + </Button> + <Button android:id="@+id/delete_button" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/delete_label"> + </Button> + </TableRow> </TableLayout> diff --git a/media/tests/CameraBrowser/res/menu/object_menu.xml b/media/tests/CameraBrowser/res/menu/object_menu.xml deleted file mode 100644 index a0865f0..0000000 --- a/media/tests/CameraBrowser/res/menu/object_menu.xml +++ /dev/null @@ -1,23 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2010 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. ---> - -<menu xmlns:android="http://schemas.android.com/apk/res/android"> - - <item android:id="@+id/save" - android:title="@string/save_item" /> - <item android:id="@+id/delete" - android:title="@string/delete_item" /> -</menu> diff --git a/media/tests/CameraBrowser/res/values/strings.xml b/media/tests/CameraBrowser/res/values/strings.xml index cd477f1..7955773 100644 --- a/media/tests/CameraBrowser/res/values/strings.xml +++ b/media/tests/CameraBrowser/res/values/strings.xml @@ -32,9 +32,9 @@ <string name="modified_label">Modified: </string> <string name="keywords_label">Keywords: </string> - <!-- menu items --> - <string name="save_item">Save</string> - <string name="delete_item">Delete</string> + <!-- button labels --> + <string name="import_label">Import</string> + <string name="delete_label">Delete</string> <!-- toasts --> <string name="object_saved_message">Object saved</string> |