diff options
Diffstat (limited to 'res/layout-port')
-rw-r--r-- | res/layout-port/camera_controls.xml | 58 | ||||
-rw-r--r-- | res/layout-port/pano_preview_progress.xml | 119 |
2 files changed, 17 insertions, 160 deletions
diff --git a/res/layout-port/camera_controls.xml b/res/layout-port/camera_controls.xml index ee24cfef2..121f25b6e 100644 --- a/res/layout-port/camera_controls.xml +++ b/res/layout-port/camera_controls.xml @@ -33,17 +33,11 @@ android:layout_marginRight="-8dip" layout="@layout/menu_indicators" /> - <com.android.camera.ui.RotatableLayout + <com.android.camera.ui.RotateImageView android:id="@+id/menu" - style="@style/MenuButtonOuter" - android:layout_marginRight="2dip" > - - <ImageView - style="@style/MenuButton" - android:layout_gravity="center" - android:contentDescription="@string/accessibility_menu_button" - android:src="@drawable/ic_settings" /> - </com.android.camera.ui.RotatableLayout> + style="@style/MenuButton" + android:contentDescription="@string/accessibility_menu_button" + android:src="@drawable/ic_settings" /> <com.android.camera.ui.ModuleSwitcher android:id="@+id/camera_switcher" @@ -73,41 +67,21 @@ android:contentDescription="@string/switch_photo_filmstrip" android:scaleType="fitCenter" /> - <com.android.camera.ui.RotatableLayout + <com.android.camera.ui.RotateImageView android:id="@+id/front_back_switcher" - style="@style/ToggleButtonOuter" > - - <com.android.camera.ui.RotateImageView - style="@style/ToggleButton" - android:layout_gravity="center" /> - </com.android.camera.ui.RotatableLayout> + style="@style/ToggleButton" /> - <com.android.camera.ui.RotatableLayout + <com.android.camera.ui.RotateImageView android:id="@+id/hdr_switcher" - style="@style/ToggleButtonOuter" > + style="@style/ToggleButton" /> - <com.android.camera.ui.RotateImageView - style="@style/ToggleButton" - android:layout_gravity="center" /> - </com.android.camera.ui.RotatableLayout> - - <com.android.camera.ui.RotatableLayout + <com.android.camera.ui.RotateImageView android:id="@+id/scene_mode_switcher" - style="@style/ToggleButtonOuter" > - - <com.android.camera.ui.RotateImageView - style="@style/ToggleButton" - android:layout_gravity="center" /> - </com.android.camera.ui.RotatableLayout> + style="@style/ToggleButton" /> - <com.android.camera.ui.RotatableLayout + <com.android.camera.ui.RotateImageView android:id="@+id/filter_mode_switcher" - style="@style/ToggleButtonOuter" > - - <com.android.camera.ui.RotateImageView - style="@style/ToggleButton" - android:layout_gravity="center" /> - </com.android.camera.ui.RotatableLayout> + style="@style/ToggleButton" /> <LinearLayout android:id="@+id/remaining_photos" @@ -122,13 +96,15 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:background="@android:color/transparent" - android:textColor="@android:color/white" /> + android:textColor="@android:color/white" + android:visibility="gone" /> <ImageView android:id="@+id/remaining_photos_image" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:src="@drawable/remaining_sheets" /> + android:src="@drawable/remaining_sheets" + android:visibility="gone" /> </LinearLayout> -</com.android.camera.ui.CameraControls>
\ No newline at end of file +</com.android.camera.ui.CameraControls> diff --git a/res/layout-port/pano_preview_progress.xml b/res/layout-port/pano_preview_progress.xml deleted file mode 100644 index c6c131741..000000000 --- a/res/layout-port/pano_preview_progress.xml +++ /dev/null @@ -1,119 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2012 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. ---> - -<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/panorama_capture_layout" - android:layout_height="match_parent" - android:layout_width="match_parent"> - - <LinearLayout - android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical"> - - <!-- The top bar with capture indication --> - <FrameLayout - style="@style/PanoViewHorizontalBar" - android:layout_width="match_parent" - android:layout_height="0dp" - android:layout_weight="1"> - - <TextView - android:id="@+id/pano_capture_indicator" - android:text="@string/pano_capture_indication" - android:textAppearance="?android:textAppearanceMedium" - android:layout_gravity="center" - android:visibility="gone" - android:layout_width="wrap_content" - android:layout_height="wrap_content" /> - </FrameLayout> - - <FrameLayout - android:layout_gravity="center" - android:id="@+id/pano_preview_layout" - android:layout_weight="@integer/SRI_pano_layout_weight" - android:layout_width="match_parent" - android:layout_height="0dp"> - - <TextureView - android:id="@+id/pano_preview_textureview" - android:layout_width="match_parent" - android:layout_height="match_parent" /> - - <View - android:id="@+id/pano_preview_area_border" - android:visibility="gone" - android:background="@drawable/ic_pan_border_fast" - android:layout_width="match_parent" - android:layout_height="match_parent" /> - </FrameLayout> - - <!-- The bottom bar with progress bar and direction indicators --> - <FrameLayout - style="@style/PanoViewHorizontalBar" - android:paddingTop="20dp" - android:gravity="top" - android:layout_width="match_parent" - android:layout_height="0dp" - android:layout_weight="1"> - - <RelativeLayout - android:layout_width="match_parent" - android:layout_height="wrap_content"> - - <com.android.camera.PanoProgressBar - android:id="@+id/pano_pan_progress_bar" - android:visibility="gone" - android:src="@drawable/ic_pan_progression" - android:layout_centerInParent="true" - android:layout_width="wrap_content" - android:layout_height="wrap_content" /> - - <ImageView - android:id="@+id/pano_pan_left_indicator" - android:src="@drawable/pano_direction_left_indicator" - android:visibility="gone" - android:layout_marginRight="5dp" - android:layout_toLeftOf="@id/pano_pan_progress_bar" - android:layout_centerVertical="true" - android:layout_width="wrap_content" - android:layout_height="wrap_content" /> - - <ImageView - android:id="@+id/pano_pan_right_indicator" - android:src="@drawable/pano_direction_right_indicator" - android:visibility="gone" - android:layout_marginLeft="5dp" - android:layout_toRightOf="@id/pano_pan_progress_bar" - android:layout_centerVertical="true" - android:layout_width="wrap_content" - android:layout_height="wrap_content" /> - </RelativeLayout> - </FrameLayout> - - - </LinearLayout> - - <!-- The hint for "Too fast" text view --> - <TextView - android:id="@+id/pano_capture_too_fast_textview" - android:text="@string/pano_too_fast_prompt" - android:textAppearance="?android:textAppearanceMedium" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center" - android:visibility="gone" /> -</FrameLayout> |