diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2009-03-11 12:11:58 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-03-11 12:11:58 -0700 |
| commit | e3f4516c2154539cb5778ef061abf8a0ccf90a5e (patch) | |
| tree | 79159ed7ec3dc97d6dc9f0499d5f95d46d6f195c /res | |
| parent | 9a379bd668227d3dcea30312025f304fd248f6e3 (diff) | |
| download | LegacyCamera-e3f4516c2154539cb5778ef061abf8a0ccf90a5e.zip LegacyCamera-e3f4516c2154539cb5778ef061abf8a0ccf90a5e.tar.gz LegacyCamera-e3f4516c2154539cb5778ef061abf8a0ccf90a5e.tar.bz2 | |
auto import from //branches/cupcake/...@137873
Diffstat (limited to 'res')
| -rw-r--r-- | res/drawable/ic_btn_actionmenu_attach_default.png | bin | 1504 -> 2659 bytes | |||
| -rw-r--r-- | res/drawable/ic_btn_actionmenu_attach_pressed.png | bin | 2889 -> 3264 bytes | |||
| -rw-r--r-- | res/drawable/ic_btn_actionmenu_attach_selected.png | bin | 2908 -> 3325 bytes | |||
| -rw-r--r-- | res/layout/camera.xml | 7 | ||||
| -rw-r--r-- | res/values/strings.xml | 4 | ||||
| -rw-r--r-- | res/xml/appwidget_info.xml (renamed from res/xml/gadget_info.xml) | 6 |
6 files changed, 7 insertions, 10 deletions
diff --git a/res/drawable/ic_btn_actionmenu_attach_default.png b/res/drawable/ic_btn_actionmenu_attach_default.png Binary files differindex f429206..043691d 100644 --- a/res/drawable/ic_btn_actionmenu_attach_default.png +++ b/res/drawable/ic_btn_actionmenu_attach_default.png diff --git a/res/drawable/ic_btn_actionmenu_attach_pressed.png b/res/drawable/ic_btn_actionmenu_attach_pressed.png Binary files differindex ee083a7..b092ac1 100644 --- a/res/drawable/ic_btn_actionmenu_attach_pressed.png +++ b/res/drawable/ic_btn_actionmenu_attach_pressed.png diff --git a/res/drawable/ic_btn_actionmenu_attach_selected.png b/res/drawable/ic_btn_actionmenu_attach_selected.png Binary files differindex 582c3b9..52a2ef0 100644 --- a/res/drawable/ic_btn_actionmenu_attach_selected.png +++ b/res/drawable/ic_btn_actionmenu_attach_selected.png diff --git a/res/layout/camera.xml b/res/layout/camera.xml index d23066e..a37a166 100644 --- a/res/layout/camera.xml +++ b/res/layout/camera.xml @@ -26,13 +26,6 @@ android:layout_height="fill_parent" android:layout_centerInParent="true" /> - <View - android:id="@+id/blackout" - android:background="#ff000000" - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:visibility="invisible" /> - <com.android.camera.ShutterButton android:id="@+id/shutter_button" android:layout_width="wrap_content" diff --git a/res/values/strings.xml b/res/values/strings.xml index ab7d88e..0121bd1 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -454,5 +454,9 @@ <!-- The video is execeed the size limit of a MMS, and suggest user to record a shorter length clip --> <string name="video_exceed_mms_limit">The video you recorded is too large to send via MMS. Try recording a shorter length clip.</string> + + <!-- Displayed as a toast when a video file is too large to attach + to a Gmail message. --> + <string name="too_large_to_attach">File too large to attach.</string> </resources> diff --git a/res/xml/gadget_info.xml b/res/xml/appwidget_info.xml index 5efaddd..92ec85b 100644 --- a/res/xml/gadget_info.xml +++ b/res/xml/appwidget_info.xml @@ -14,11 +14,11 @@ limitations under the License. --> -<gadget-provider xmlns:android="http://schemas.android.com/apk/res/android" +<appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android" android:minWidth="146dip" android:minHeight="146dip" android:updatePeriodMillis="0" android:initialLayout="@layout/photo_frame" - android:configure="com.android.camera.PhotoGadgetConfigure" + android:configure="com.android.camera.PhotoAppWidgetConfigure" > -</gadget-provider> +</appwidget-provider> |
