diff options
| author | Wei Huang <weih@google.com> | 2011-09-20 12:02:36 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-09-20 12:02:36 -0700 |
| commit | 494c4065b52bd58faa29307ccdb60dd425a843eb (patch) | |
| tree | 1a4fad62b28d94f110493c8fb788520962bdb6b3 /res/layout | |
| parent | 0c1d51499a69817cdbda599de12c629f296a2100 (diff) | |
| parent | b7d0a0704e437a1892fbf2a6e5138cf36df9fde8 (diff) | |
| download | LegacyCamera-494c4065b52bd58faa29307ccdb60dd425a843eb.zip LegacyCamera-494c4065b52bd58faa29307ccdb60dd425a843eb.tar.gz LegacyCamera-494c4065b52bd58faa29307ccdb60dd425a843eb.tar.bz2 | |
Merge "New zoom control for phone." into ics-factoryrom
Diffstat (limited to 'res/layout')
| -rw-r--r-- | res/layout/indicator_bar.xml | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/res/layout/indicator_bar.xml b/res/layout/indicator_bar.xml index 0422e68..c39fb93 100644 --- a/res/layout/indicator_bar.xml +++ b/res/layout/indicator_bar.xml @@ -45,12 +45,11 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:layout_centerHorizontal="true"> - <com.android.camera.ui.ColorFilterImageView - android:id="@+id/zoom_control_icon" + <com.android.camera.ui.ZoomControlBar + android:id="@+id/zoom_control" android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_centerInParent="true" - android:src="@drawable/btn_zoom_control" + android:layout_height="match_parent" + android:layout_centerHorizontal="true" android:visibility="gone" /> <com.android.camera.ui.RotateImageView android:id="@+id/second_level_indicator_bar_icon" @@ -60,12 +59,6 @@ android:src="@drawable/ic_settings_holo_light" /> </com.android.camera.ui.IndicatorControlBar> - <com.android.camera.ui.ZoomControlBar - android:id="@+id/zoom_control" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:layout_centerHorizontal="true" - android:visibility="gone" /> <com.android.camera.ui.SecondLevelIndicatorControlBar android:id="@+id/second_level_indicator_bar" android:padding="8dp" |