diff options
| author | Doris Liu <tianliu@google.com> | 2014-05-19 22:25:10 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-05-19 22:25:10 +0000 |
| commit | 4245502e9bba736e425c190894cfc928ae0b5e48 (patch) | |
| tree | 9b09c769832e9c8f0fd2504fefee3db3ac2ba480 /res/layout-land | |
| parent | e811b29f6707a6ea8f066e6f5b9cb0fc99d2dcd6 (diff) | |
| parent | 6c75164c89f3bbd4f894b9c49a7914a24268a999 (diff) | |
| download | android_packages_apps_Camera2-4245502e9bba736e425c190894cfc928ae0b5e48.tar.gz android_packages_apps_Camera2-4245502e9bba736e425c190894cfc928ae0b5e48.tar.bz2 android_packages_apps_Camera2-4245502e9bba736e425c190894cfc928ae0b5e48.zip | |
Merge "Add back countdown timer" into ub-camera-everglades
Diffstat (limited to 'res/layout-land')
| -rw-r--r-- | res/layout-land/indicators.xml | 3 | ||||
| -rw-r--r-- | res/layout-land/mode_options.xml | 5 |
2 files changed, 8 insertions, 0 deletions
diff --git a/res/layout-land/indicators.xml b/res/layout-land/indicators.xml index e2632fa5a..fa83e8f42 100644 --- a/res/layout-land/indicators.xml +++ b/res/layout-land/indicators.xml @@ -48,6 +48,9 @@ android:id="@+id/hdr_indicator" style="@style/IndicatorIcon" /> <ImageView + android:id="@+id/countdown_timer_indicator" + style="@style/IndicatorIcon" /> + <ImageView android:id="@+id/flash_indicator" style="@style/IndicatorIcon" /> <ImageView diff --git a/res/layout-land/mode_options.xml b/res/layout-land/mode_options.xml index d2ffcde9a..d8a69ceac 100644 --- a/res/layout-land/mode_options.xml +++ b/res/layout-land/mode_options.xml @@ -118,5 +118,10 @@ android:background="@null" android:src="@drawable/ic_exposure" android:contentDescription="@string/manual_exposure_compensation_desc" /> + <com.android.camera.MultiToggleImageButton + android:id="@+id/countdown_toggle_button" + style="@style/ModeOption" + camera:imageIds="@array/countdown_duration_icons" + camera:contentDescriptionIds="@array/countdown_duration_descriptions" /> </com.android.camera.ui.TopRightWeightedLayout> </com.android.camera.widget.ModeOptions> |