diff options
| author | Alok Kediya <kediya@codeaurora.org> | 2013-09-27 20:22:45 +0530 |
|---|---|---|
| committer | Linux Build Service Account <lnxbuild@localhost> | 2013-10-31 19:39:18 -0600 |
| commit | 0dc64ffddb06d0b41e65f10c742caec52e8b0436 (patch) | |
| tree | 43344ecae06fa3aa8b2384d6208175f514965017 /res/layout | |
| parent | 5213f27da56b6b1ff989ea9eda28bac7dce720b5 (diff) | |
| download | android_packages_apps_Snap-0dc64ffddb06d0b41e65f10c742caec52e8b0436.tar.gz android_packages_apps_Snap-0dc64ffddb06d0b41e65f10c742caec52e8b0436.tar.bz2 android_packages_apps_Snap-0dc64ffddb06d0b41e65f10c742caec52e8b0436.zip | |
Camera : Enable camera and camcorder UI features..
Added keys and APIs for enabling QC features from UI.
(cherry picked from commit a0fdd6924374635711ea6a554f3a59a087cf4b21)
Change-Id: Id50b7cebe2d33eaf7bb6a8e51fecded50ac6dcf8
Conflicts:
src/com/android/camera/CameraSettings.java
src/com/android/camera/PhotoMenu.java
src/com/android/camera/PhotoModule.java
src/com/android/camera/VideoModule.java
Conflicts:
src/com/android/camera/CameraSettings.java
src/com/android/camera/VideoModule.java
(cherry picked from commit 93cd1cdb59449ccb2b9594c9d8e3978a25d7f376)
(cherry picked from commit af04f9d621183addee0f7cdd7c1a41c8d0e65cfe)
Diffstat (limited to 'res/layout')
| -rw-r--r-- | res/layout/photo_module.xml | 61 |
1 files changed, 61 insertions, 0 deletions
diff --git a/res/layout/photo_module.xml b/res/layout/photo_module.xml index b63d53662..78cf72a81 100644 --- a/res/layout/photo_module.xml +++ b/res/layout/photo_module.xml @@ -24,6 +24,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:layout_gravity="center"> + <include layout="@layout/count_down_to_capture"/> <!-- Wrap a frame layout around texture view so that when scaled, texture view will not draw outside its unscaled bounds --> <FrameLayout @@ -33,7 +34,67 @@ android:id="@+id/preview_content" android:layout_width="match_parent" android:layout_height="match_parent" /> + <RelativeLayout android:id="@+id/linear" + android:orientation="vertical" + android:layout_width="match_parent" + android:layout_height="match_parent"> + <ProgressBar + style="?android:attr/progressBarStyleHorizontal" + android:id="@+id/progress" + android:orientation="vertical" + android:layout_width="200dip" + android:layout_height="wrap_content" + android:layout_marginTop="14dip" + android:layout_marginBottom="14dip" + android:layout_marginLeft="30dip" + android:layout_marginRight="30dip" /> + <TableLayout + android:id="@+id/relative_seek" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_marginTop="20px" + android:layout_marginRight="20px" + android:layout_marginLeft="20px" + android:stretchColumns="1"> + <TableRow> <TextView + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:id="@+id/skintonetitle" + android:layout_gravity="center" + android:textSize="22.0sp" + android:textStyle="bold" /> + </TableRow> + <TableRow> <SeekBar + android:id="@+id/skintoneseek" + android:layout_below="@+id/skintonetitle" + android:layout_width="400px" + android:layout_height="33dip" + android:layout_marginLeft="25px" + android:layout_marginTop="2dip"/> + </TableRow> + <TableRow> + <TextView + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:id="@+id/skintoneleft" + android:textSize="22.0sp" + android:textStyle="bold" /> + <TextView + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:id="@+id/skintoneright" + android:textSize="22.0sp" + android:textStyle="bold"/> + </TableRow> + </TableLayout> + </RelativeLayout> </FrameLayout> + <com.android.camera.GraphView + android:id="@+id/graph_view" + android:layout_width="200dip" + android:layout_height="200dip" + android:layout_marginTop="15dip" + android:layout_marginLeft="15dip" /> <ImageView android:id="@+id/review_image" android:layout_width="match_parent" |