diff options
| author | Wu-cheng Li <wuchengli@google.com> | 2011-11-16 17:18:12 +0800 |
|---|---|---|
| committer | Wu-cheng Li <wuchengli@google.com> | 2011-11-17 19:48:39 +0800 |
| commit | 0ca031ca9fef394f27b7cc9722ffc5a198cb964e (patch) | |
| tree | 27e459276721e2d26018b8ef25c22792617848e1 /res/layout | |
| parent | 948e75e8e3fd2ec98a08e65efdb6e5eb6d02c33b (diff) | |
| download | LegacyCamera-0ca031ca9fef394f27b7cc9722ffc5a198cb964e.zip LegacyCamera-0ca031ca9fef394f27b7cc9722ffc5a198cb964e.tar.gz LegacyCamera-0ca031ca9fef394f27b7cc9722ffc5a198cb964e.tar.bz2 | |
Rotate priority indicators according to the device orientation.
+ Do not show flash indicator if it is off.
bug:5039279
Change-Id: I329b63d04f46fbe23f5ade3e4cacf446ce41f98c
Diffstat (limited to 'res/layout')
| -rw-r--r-- | res/layout/priority_indicators.xml | 64 |
1 files changed, 37 insertions, 27 deletions
diff --git a/res/layout/priority_indicators.xml b/res/layout/priority_indicators.xml index a8318e0..ef4f36c 100644 --- a/res/layout/priority_indicators.xml +++ b/res/layout/priority_indicators.xml @@ -13,30 +13,40 @@ See the License for the specific language governing permissions and limitations under the License. --> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:orientation="vertical" - android:layout_alignParentRight="true" - android:layout_alignParentTop="true" - android:layout_height="wrap_content" - android:layout_width="wrap_content" - android:padding="8dp"> - <ImageView android:id="@+id/onscreen_flash_indicator" - style="@style/OnScreenIndicator" - android:visibility="visible"/> - <ImageView android:id="@+id/onscreen_white_balance_indicator" - style="@style/OnScreenIndicator"/> - <TextView android:id="@+id/onscreen_exposure_indicator" - style="@style/OnScreenIndicator" - android:layout_marginTop="6dp" - android:layout_marginBottom="6dp" - android:gravity="center_vertical" - android:textSize="15dp" - android:textColor="@android:color/white"/> - <ImageView android:id="@+id/onscreen_scene_indicator" - style="@style/OnScreenIndicator" - android:src="@drawable/ic_indicators_scn"/> - <ImageView android:id="@+id/onscreen_gps_indicator" - style="@style/OnScreenIndicator"/> - <ImageView android:id="@+id/onscreen_focus_indicator" - style="@style/OnScreenIndicator"/> -</LinearLayout> +<com.android.camera.ui.RotateLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/on_screen_indicators" + android:layout_height="match_parent" + android:layout_width="match_parent" + style="@style/OnScreenIndicators"> + <RelativeLayout + android:layout_height="match_parent" + android:layout_width="match_parent"> + <LinearLayout + android:orientation="horizontal" + android:layout_height="@dimen/onscreen_indicators_height" + android:layout_width="wrap_content" + android:layout_alignParentTop="true" + android:layout_alignParentLeft="true" + android:gravity="center_vertical"> + <ImageView android:id="@+id/onscreen_flash_indicator" + style="@style/OnScreenIndicator" + android:visibility="visible"/> + <ImageView android:id="@+id/onscreen_white_balance_indicator" + style="@style/OnScreenIndicator"/> + <TextView android:id="@+id/onscreen_exposure_indicator" + style="@style/OnScreenIndicator" + android:paddingLeft="3dp" + android:paddingRight="3dp" + android:gravity="center_vertical" + android:textSize="@dimen/onscreen_exposure_indicator_text_size" + android:textColor="@android:color/white"/> + <ImageView android:id="@+id/onscreen_scene_indicator" + style="@style/OnScreenIndicator" + android:src="@drawable/ic_indicators_scn"/> + <ImageView android:id="@+id/onscreen_gps_indicator" + style="@style/OnScreenIndicator"/> + <ImageView android:id="@+id/onscreen_focus_indicator" + style="@style/OnScreenIndicator"/> + </LinearLayout> + </RelativeLayout> +</com.android.camera.ui.RotateLayout>
\ No newline at end of file |