diff options
| author | Wei-Ta Chen <weita@google.com> | 2011-09-11 10:13:04 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-09-11 10:13:04 -0700 |
| commit | 452b0dae881f1ed6db431dae2936b4a8115af289 (patch) | |
| tree | 1b2a1e381595c5db7cd452cf46219615d3f98173 /res | |
| parent | 6bffa99880bb5e26c38d9c577463ad415de86bd5 (diff) | |
| parent | 85dedb803016feea39a78efc4bfc07b4f436cc6c (diff) | |
| download | LegacyCamera-452b0dae881f1ed6db431dae2936b4a8115af289.zip LegacyCamera-452b0dae881f1ed6db431dae2936b4a8115af289.tar.gz LegacyCamera-452b0dae881f1ed6db431dae2936b4a8115af289.tar.bz2 | |
Merge "Make the preview mosaic leave a margin."
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout/pano_capture.xml | 2 | ||||
| -rw-r--r-- | res/values-w1024dp/dimens.xml | 3 | ||||
| -rw-r--r-- | res/values/dimens.xml | 1 |
3 files changed, 2 insertions, 4 deletions
diff --git a/res/layout/pano_capture.xml b/res/layout/pano_capture.xml index 7cf6c01..16145fd 100644 --- a/res/layout/pano_capture.xml +++ b/res/layout/pano_capture.xml @@ -36,7 +36,7 @@ <com.android.camera.panorama.MosaicRendererSurfaceView android:id="@+id/pano_renderer" android:layout_gravity="center" - android:layout_width="@dimen/pano_mosaic_surface_width" + android:layout_width="match_parent" android:layout_height="@dimen/pano_mosaic_surface_height" /> <ImageView style="@style/PanoViewHorizontalGrayBar"/> diff --git a/res/values-w1024dp/dimens.xml b/res/values-w1024dp/dimens.xml index 1ca3218..374c14b 100644 --- a/res/values-w1024dp/dimens.xml +++ b/res/values-w1024dp/dimens.xml @@ -28,8 +28,7 @@ <dimen name="share_item_height">90dp</dimen> <dimen name="pano_control_layout_min_width">260dp</dimen> <dimen name="pano_control_start_button_size">180dp</dimen> - <dimen name="pano_mosaic_surface_width">960dp</dimen> - <dimen name="pano_mosaic_surface_height">360dp</dimen> + <dimen name="pano_mosaic_surface_height">480dp</dimen> <dimen name="pano_review_button_width">180dp</dimen> <dimen name="pano_review_button_height">180dp</dimen> <dimen name="pano_capture_too_fast_text_height">160dp</dimen> diff --git a/res/values/dimens.xml b/res/values/dimens.xml index b1e3db4..b9ca511 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -24,7 +24,6 @@ <dimen name="share_item_height">60dp</dimen> <dimen name="pano_control_layout_min_width">76dp</dimen> <dimen name="pano_control_start_button_size">70dp</dimen> - <dimen name="pano_mosaic_surface_width">640dp</dimen> <dimen name="pano_mosaic_surface_height">240dp</dimen> <dimen name="pano_review_button_width">70dp</dimen> <dimen name="pano_review_button_height">70dp</dimen> |