diff options
| author | Chih-yu Huang <akahuang@google.com> | 2011-08-18 20:12:27 +0800 |
|---|---|---|
| committer | Chih-yu Huang <akahuang@google.com> | 2011-08-22 16:23:39 +0800 |
| commit | b0c6bcf47a8ca1c096d98ebebd33a821dd483585 (patch) | |
| tree | b55ec657811ceb7885981348bb03398a5b14b8da /res/layout | |
| parent | 43b0b2ccd5949ee8fc377c37e7e2b82a26c88ca8 (diff) | |
| download | packages_apps_LegacyCamera-b0c6bcf47a8ca1c096d98ebebd33a821dd483585.zip packages_apps_LegacyCamera-b0c6bcf47a8ca1c096d98ebebd33a821dd483585.tar.gz packages_apps_LegacyCamera-b0c6bcf47a8ca1c096d98ebebd33a821dd483585.tar.bz2 | |
Add exposure indicator on screen.
bug:5141528
Change-Id: Ib63c24b52c4b4bc67e88c1ec6a8ac41b9e4c09e5
Diffstat (limited to 'res/layout')
| -rw-r--r-- | res/layout/preview_frame.xml | 15 | ||||
| -rw-r--r-- | res/layout/priority_indicators.xml | 34 |
2 files changed, 35 insertions, 14 deletions
diff --git a/res/layout/preview_frame.xml b/res/layout/preview_frame.xml index 1bf621a..b7685bf 100644 --- a/res/layout/preview_frame.xml +++ b/res/layout/preview_frame.xml @@ -39,20 +39,7 @@ android:layout_width="120dp" android:layout_height="120dp" android:layout_centerInParent="true"/> - <ImageView style="@style/OnScreenGpsIndicator" - android:id="@+id/onscreen_gps_indicator_no_signal" - android:src="@drawable/ic_viewfinder_gps_no_signal" - android:layout_alignParentLeft="true" - android:layout_alignParentBottom="true" - android:layout_margin="5dp" - android:visibility="gone"/> - <ImageView style="@style/OnScreenGpsIndicator" - android:id="@+id/onscreen_gps_indicator_on" - android:src="@drawable/ic_viewfinder_gps_on" - android:layout_alignParentLeft="true" - android:layout_alignParentBottom="true" - android:layout_margin="5dp" - android:visibility="gone"/> + <include layout="@layout/priority_indicators"/> <include layout="@layout/tap_to_focus_toast"/> <include layout="@layout/indicator_bar" /> </RelativeLayout> diff --git a/res/layout/priority_indicators.xml b/res/layout/priority_indicators.xml new file mode 100644 index 0000000..4926484 --- /dev/null +++ b/res/layout/priority_indicators.xml @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2011 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. +--> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:orientation="horizontal" + android:layout_alignParentLeft="true" + android:layout_alignParentTop="true" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:padding="8dp"> + <ImageView style="@style/OnScreenIndicator" + android:id="@+id/onscreen_gps_indicator_no_signal" + android:src="@drawable/ic_viewfinder_gps_no_signal"/> + <ImageView style="@style/OnScreenIndicator" + android:id="@+id/onscreen_gps_indicator_on" + android:src="@drawable/ic_viewfinder_gps_on"/> + <TextView style="@style/OnScreenIndicator" + android:id="@+id/onscreen_exposure_indicator" + android:gravity="center_vertical" + android:textSize="15dp" + android:textColor="@android:color/white"/> +</LinearLayout> |