diff options
author | Angus Kong <shkong@google.com> | 2011-09-12 21:54:21 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-09-12 21:54:21 -0700 |
commit | c184284b13c6b5c1981a43f5415ca83aba130652 (patch) | |
tree | 47ca82b71b8975a29390b3e283bab5ba77941086 /res | |
parent | da44ccb31dd6ad03741b3ba1b343c290db808fcd (diff) | |
parent | 8df38bbe67338a1f5dc58996bd8866f4c1fe264d (diff) | |
download | packages_apps_LegacyCamera-c184284b13c6b5c1981a43f5415ca83aba130652.zip packages_apps_LegacyCamera-c184284b13c6b5c1981a43f5415ca83aba130652.tar.gz packages_apps_LegacyCamera-c184284b13c6b5c1981a43f5415ca83aba130652.tar.bz2 |
Merge "Show capture indication for panorama."
Diffstat (limited to 'res')
-rw-r--r-- | res/drawable-hdpi/ic_pan_recording_indicator.png | bin | 0 -> 628 bytes | |||
-rw-r--r-- | res/drawable-mdpi/ic_pan_recording_indicator.png | bin | 0 -> 492 bytes | |||
-rw-r--r-- | res/drawable-xhdpi/ic_pan_recording_indicator.png | bin | 0 -> 725 bytes | |||
-rw-r--r-- | res/layout/pano_capture.xml | 19 | ||||
-rw-r--r-- | res/layout/pano_review.xml | 4 | ||||
-rw-r--r-- | res/values/strings.xml | 3 | ||||
-rw-r--r-- | res/values/styles.xml | 2 |
7 files changed, 23 insertions, 5 deletions
diff --git a/res/drawable-hdpi/ic_pan_recording_indicator.png b/res/drawable-hdpi/ic_pan_recording_indicator.png Binary files differnew file mode 100644 index 0000000..011d1e2 --- /dev/null +++ b/res/drawable-hdpi/ic_pan_recording_indicator.png diff --git a/res/drawable-mdpi/ic_pan_recording_indicator.png b/res/drawable-mdpi/ic_pan_recording_indicator.png Binary files differnew file mode 100644 index 0000000..1fc9578 --- /dev/null +++ b/res/drawable-mdpi/ic_pan_recording_indicator.png diff --git a/res/drawable-xhdpi/ic_pan_recording_indicator.png b/res/drawable-xhdpi/ic_pan_recording_indicator.png Binary files differnew file mode 100644 index 0000000..17fc574 --- /dev/null +++ b/res/drawable-xhdpi/ic_pan_recording_indicator.png diff --git a/res/layout/pano_capture.xml b/res/layout/pano_capture.xml index 00af551..5988196 100644 --- a/res/layout/pano_capture.xml +++ b/res/layout/pano_capture.xml @@ -30,7 +30,22 @@ android:layout_height="match_parent" android:orientation="vertical"> - <ImageView style="@style/PanoViewHorizontalGrayBar"/> + <FrameLayout android:id="@+id/pano_capture_indicator_layout" + style="@style/PanoViewHorizontalBar"> + + <TextView + android:id="@+id/pano_capture_indicator" + android:text="@string/pano_capture_indication" + android:paddingTop="0dp" + android:drawablePadding="5sp" + android:drawableLeft="@drawable/ic_pan_recording_indicator" + android:visibility="gone" + android:layout_marginLeft="16dp" + android:layout_marginTop="16dp" + android:layout_gravity="top|left" + android:layout_width="wrap_content" + android:layout_height="wrap_content" /> + </FrameLayout> <com.android.camera.panorama.MosaicRendererSurfaceView android:id="@+id/pano_renderer" @@ -39,7 +54,7 @@ android:layout_height="@dimen/pano_mosaic_surface_height" /> <FrameLayout - style="@style/PanoViewHorizontalGrayBar"> + style="@style/PanoViewHorizontalBar"> <com.android.camera.panorama.PanoProgressBar android:id="@+id/pano_pan_progress_bar" android:visibility="gone" diff --git a/res/layout/pano_review.xml b/res/layout/pano_review.xml index 51ae880..9e0b750 100644 --- a/res/layout/pano_review.xml +++ b/res/layout/pano_review.xml @@ -22,7 +22,7 @@ android:layout_height="match_parent"> <LinearLayout android:id="@+id/pano_review_control" - style="@style/PanoViewHorizontalGrayBar" + style="@style/PanoViewHorizontalBar" android:gravity="right" android:orientation="horizontal" android:layout_alignParentBottom="true" @@ -42,7 +42,7 @@ android:layout_width="match_parent" android:layout_height="@dimen/pano_mosaic_surface_height" /> - <RelativeLayout style="@style/PanoViewHorizontalGrayBar"> + <RelativeLayout style="@style/PanoViewHorizontalBar"> <com.android.camera.panorama.PanoProgressBar android:id="@+id/pano_saving_progress_bar" android:src="@drawable/ic_pan_progression" diff --git a/res/values/strings.xml b/res/values/strings.xml index 90e87c1..c679013 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -277,6 +277,9 @@ <!-- The text shown on the dialog title in the dialogs for Panorama [CHAR LIMIT=12] --> <string name="pano_dialog_title">Panorama</string> + <!-- The text shown on the top-left corner of the screen to indicate the capturing is on going [CHAR LIMIT=27] --> + <string name="pano_capture_indication">Capturing Panorama</string> + <!-- Toast telling users tapping on the viewfinder will trigger autofocus [CHAR LIMIT=28] --> <string name="tap_to_focus">Tap to focus</string> diff --git a/res/values/styles.xml b/res/values/styles.xml index 78e7ba6..bd46fc3 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -148,7 +148,7 @@ <item name="android:textSize">16dp</item> <item name="android:background">@drawable/bg_text_on_preview</item> </style> - <style name="PanoViewHorizontalGrayBar"> + <style name="PanoViewHorizontalBar"> <item name="android:background">#000000</item> <item name="android:alpha">1.0</item> <item name="android:layout_width">match_parent</item> |