diff options
| author | Wu-cheng Li <wuchengli@google.com> | 2011-06-30 17:27:21 +0800 |
|---|---|---|
| committer | Wu-cheng Li <wuchengli@google.com> | 2011-07-05 12:03:07 +0800 |
| commit | c5e37cbb96b8284203560c51dd5f41c705a21f58 (patch) | |
| tree | bf543e16a64dfde9925c469ed96db85de3b0caf1 /res/layout | |
| parent | 95fd7f77171155a087b685ca405ac3891332f638 (diff) | |
| download | LegacyCamera-c5e37cbb96b8284203560c51dd5f41c705a21f58.zip LegacyCamera-c5e37cbb96b8284203560c51dd5f41c705a21f58.tar.gz LegacyCamera-c5e37cbb96b8284203560c51dd5f41c705a21f58.tar.bz2 | |
Add expanded thumbnail in phone UI.
bug:4725968
Change-Id: I2a59a3714b93bc96f2a1689d948c9e4e0edd14cb
Diffstat (limited to 'res/layout')
| -rw-r--r-- | res/layout/preview_frame.xml | 5 | ||||
| -rw-r--r-- | res/layout/share_popup.xml | 36 |
2 files changed, 36 insertions, 5 deletions
diff --git a/res/layout/preview_frame.xml b/res/layout/preview_frame.xml index 6cf4dfe..4e95882 100644 --- a/res/layout/preview_frame.xml +++ b/res/layout/preview_frame.xml @@ -49,10 +49,5 @@ android:layout_alignParentBottom="true" android:layout_margin="5dp" android:visibility="invisible"/> - <ImageView android:id="@+id/review_image" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:visibility="gone" - android:background="@android:color/black"/> </RelativeLayout> </com.android.camera.PreviewFrameLayout> diff --git a/res/layout/share_popup.xml b/res/layout/share_popup.xml new file mode 100644 index 0000000..93ffd4b --- /dev/null +++ b/res/layout/share_popup.xml @@ -0,0 +1,36 @@ +<?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. +--> + +<RelativeLayout + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:camera="http://schemas.android.com/apk/res/com.android.camera" + android:layout_width="match_parent" + android:layout_height="match_parent"> + <com.android.camera.ui.RotateLayout + android:id="@+id/rotate_layout" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentTop="true" + android:layout_alignParentRight="true"> + <!-- The size of the thumbnail is calculated in SharePopup.java --> + <ImageView + android:id="@+id/expanded_thumbnail" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:adjustViewBounds="true" + android:scaleType="fitCenter" /> + </com.android.camera.ui.RotateLayout> +</RelativeLayout> |