diff options
| author | Chung-yih Wang <cywang@google.com> | 2011-09-19 17:49:19 +0800 |
|---|---|---|
| committer | Chung-yih Wang <cywang@google.com> | 2011-09-19 22:21:17 +0800 |
| commit | db3556078a75be0bd4a08195d90f060724034e88 (patch) | |
| tree | 9dd6fc20ac6ef48f1cb4b9dcfc8a1f5bbda91c68 /res/layout-w1024dp | |
| parent | 440bb1665b8288a6e94340d1f37b5b3e6bc0e79c (diff) | |
| download | LegacyCamera-db3556078a75be0bd4a08195d90f060724034e88.zip LegacyCamera-db3556078a75be0bd4a08195d90f060724034e88.tar.gz LegacyCamera-db3556078a75be0bd4a08195d90f060724034e88.tar.bz2 | |
Fix indicator bar height in video mode.
bug:5287560
Change-Id: I000d11aa3974e1d48d18f4dcf6ec31166f6ef8ec
Diffstat (limited to 'res/layout-w1024dp')
| -rw-r--r-- | res/layout-w1024dp/preview_frame.xml | 10 | ||||
| -rw-r--r-- | res/layout-w1024dp/preview_frame_video.xml | 19 |
2 files changed, 13 insertions, 16 deletions
diff --git a/res/layout-w1024dp/preview_frame.xml b/res/layout-w1024dp/preview_frame.xml index 762fef5..961a407 100644 --- a/res/layout-w1024dp/preview_frame.xml +++ b/res/layout-w1024dp/preview_frame.xml @@ -13,13 +13,13 @@ See the License for the specific language governing permissions and limitations under the License. --> - -<com.android.camera.PreviewFrameLayout xmlns:android="http://schemas.android.com/apk/res/android" +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/frame_layout" android:layout_width="match_parent" android:layout_height="match_parent" android:layout_weight="1"> - <RelativeLayout android:id="@+id/frame" + <com.android.camera.PreviewFrameLayout android:id="@+id/frame" + android:layout_centerInParent="true" android:layout_width="match_parent" android:layout_height="match_parent"> <SurfaceView android:id="@+id/camera_preview" @@ -32,5 +32,5 @@ <include layout="@layout/focus_indicator"/> <include layout="@layout/priority_indicators"/> <include layout="@layout/tap_to_focus_toast"/> - </RelativeLayout> -</com.android.camera.PreviewFrameLayout> + </com.android.camera.PreviewFrameLayout> +</RelativeLayout> diff --git a/res/layout-w1024dp/preview_frame_video.xml b/res/layout-w1024dp/preview_frame_video.xml index 8a5ecd5..8099d89 100644 --- a/res/layout-w1024dp/preview_frame_video.xml +++ b/res/layout-w1024dp/preview_frame_video.xml @@ -14,14 +14,16 @@ limitations under the License. --> -<com.android.camera.PreviewFrameLayout xmlns:android="http://schemas.android.com/apk/res/android" +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/frame_layout" android:layout_width="match_parent" android:layout_height="match_parent" android:layout_weight="1"> - <RelativeLayout android:id="@+id/frame" + <com.android.camera.PreviewFrameLayout android:id="@+id/frame" android:layout_width="match_parent" - android:layout_height="match_parent"> + android:layout_height="match_parent" + android:layout_centerInParent="true" + android:background="@drawable/border_preview"> <SurfaceView android:id="@+id/camera_preview" android:layout_width="match_parent" android:layout_height="match_parent" /> @@ -59,11 +61,6 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:visibility="gone" - android:background="@android:color/black" /> - </RelativeLayout> - <!-- Border for video snapshot. --> - <View android:id="@+id/preview_border" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:visibility="gone" /> -</com.android.camera.PreviewFrameLayout> + android:background="@android:color/black"/> + </com.android.camera.PreviewFrameLayout> +</RelativeLayout> |