diff options
Diffstat (limited to 'res')
| -rw-r--r-- | res/anim/on_screen_hint_accelerate.xml | 21 | ||||
| -rw-r--r-- | res/anim/on_screen_hint_decelerate.xml | 20 | ||||
| -rw-r--r-- | res/anim/on_screen_hint_enter.xml | 5 | ||||
| -rw-r--r-- | res/anim/on_screen_hint_exit.xml | 2 | ||||
| -rw-r--r-- | res/drawable/ic_error_mms_video_overlay.png | bin | 0 -> 4362 bytes | |||
| -rw-r--r-- | res/layout/viewimage.xml | 2 | ||||
| -rw-r--r-- | res/raw/camera_click.ogg | bin | 5862 -> 5593 bytes | |||
| -rw-r--r-- | res/values/strings.xml | 6 | ||||
| -rw-r--r-- | res/xml/gadget_info.xml | 4 |
9 files changed, 14 insertions, 46 deletions
diff --git a/res/anim/on_screen_hint_accelerate.xml b/res/anim/on_screen_hint_accelerate.xml deleted file mode 100644 index ffbfc39..0000000 --- a/res/anim/on_screen_hint_accelerate.xml +++ /dev/null @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* -** -** Copyright 2009, 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. -*/ ---> - -<accelerateInterpolator xmlns:android="http://schemas.android.com/apk/res/android" factor="1" /> diff --git a/res/anim/on_screen_hint_decelerate.xml b/res/anim/on_screen_hint_decelerate.xml deleted file mode 100644 index e63421d..0000000 --- a/res/anim/on_screen_hint_decelerate.xml +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* -** Copyright 2009, 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. -*/ ---> - -<decelerateInterpolator xmlns:android="http://schemas.android.com/apk/res/android" factor="1" /> diff --git a/res/anim/on_screen_hint_enter.xml b/res/anim/on_screen_hint_enter.xml index c7ae9c3..0f00760 100644 --- a/res/anim/on_screen_hint_enter.xml +++ b/res/anim/on_screen_hint_enter.xml @@ -18,5 +18,6 @@ --> <alpha xmlns:android="http://schemas.android.com/apk/res/android" - android:interpolator="@+android:anim/on_screen_hint_decelerate" - android:fromAlpha="0.0" android:toAlpha="1.0" android:duration="400" /> + android:interpolator="@android:anim/decelerate_interpolator" + android:fromAlpha="0.0" android:toAlpha="1.0" android:duration="400" +/> diff --git a/res/anim/on_screen_hint_exit.xml b/res/anim/on_screen_hint_exit.xml index e1d1ff2..e9b38f8 100644 --- a/res/anim/on_screen_hint_exit.xml +++ b/res/anim/on_screen_hint_exit.xml @@ -18,6 +18,6 @@ --> <alpha xmlns:android="http://schemas.android.com/apk/res/android" - android:interpolator="@+android:anim/on_screen_hint_accelerate" + android:interpolator="@android:anim/accelerate_interpolator" android:fromAlpha="1.0" android:toAlpha="0.0" android:duration="400" /> diff --git a/res/drawable/ic_error_mms_video_overlay.png b/res/drawable/ic_error_mms_video_overlay.png Binary files differnew file mode 100644 index 0000000..4f50072 --- /dev/null +++ b/res/drawable/ic_error_mms_video_overlay.png diff --git a/res/layout/viewimage.xml b/res/layout/viewimage.xml index a1c9d4d..99d76b0 100644 --- a/res/layout/viewimage.xml +++ b/res/layout/viewimage.xml @@ -139,6 +139,7 @@ /> </LinearLayout> <ImageView android:id="@+id/prev_image" + android:clickable="true" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentLeft="true" android:layout_centerVertical="true" @@ -147,6 +148,7 @@ /> <ImageView android:id="@+id/next_image" + android:clickable="true" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentRight="true" android:layout_centerVertical="true" diff --git a/res/raw/camera_click.ogg b/res/raw/camera_click.ogg Binary files differindex be0a0d3..0a769ff 100644 --- a/res/raw/camera_click.ogg +++ b/res/raw/camera_click.ogg diff --git a/res/values/strings.xml b/res/values/strings.xml index 161f960..ab7d88e 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -448,5 +448,11 @@ <!-- Video Camera format string for new video files. Passed to java.text.SimpleDateFormat. Do not localize --> <string name="video_file_name_format">"'video'-yyyy-MM-dd-HH-mm-ss"</string> + + <!-- Title for the file information dialog --> + <string name="file_info_title">File info:</string> + + <!-- 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> </resources> diff --git a/res/xml/gadget_info.xml b/res/xml/gadget_info.xml index 05fb515..5efaddd 100644 --- a/res/xml/gadget_info.xml +++ b/res/xml/gadget_info.xml @@ -15,8 +15,8 @@ --> <gadget-provider xmlns:android="http://schemas.android.com/apk/res/android" - android:minWidth="148px" - android:minHeight="148px" + android:minWidth="146dip" + android:minHeight="146dip" android:updatePeriodMillis="0" android:initialLayout="@layout/photo_frame" android:configure="com.android.camera.PhotoGadgetConfigure" |
