diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2015-01-23 22:40:29 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2015-01-23 22:40:29 -0800 |
| commit | cb55a7c4f4a4cda67fbb4d9c85eed46e2c40fa17 (patch) | |
| tree | e32b7a8e7bc8eaf4d3752c2aafe09e3d90c217b4 /res/layout-port | |
| parent | be86a06bfd8ccc0b3a6f597903ba1181a9b8f875 (diff) | |
| parent | 5ffb42bb05ccb667ef52017faf925a385c9bd7a1 (diff) | |
| download | android_packages_apps_Snap-cb55a7c4f4a4cda67fbb4d9c85eed46e2c40fa17.tar.gz android_packages_apps_Snap-cb55a7c4f4a4cda67fbb4d9c85eed46e2c40fa17.tar.bz2 android_packages_apps_Snap-cb55a7c4f4a4cda67fbb4d9c85eed46e2c40fa17.zip | |
Merge "SnapdragonCamera: New shutter Icons"
Diffstat (limited to 'res/layout-port')
| -rw-r--r-- | res/layout-port/camera_controls.xml | 30 |
1 files changed, 22 insertions, 8 deletions
diff --git a/res/layout-port/camera_controls.xml b/res/layout-port/camera_controls.xml index 52be755dd..ee24cfef2 100644 --- a/res/layout-port/camera_controls.xml +++ b/res/layout-port/camera_controls.xml @@ -54,14 +54,14 @@ <com.android.camera.ShutterButton android:id="@+id/shutter_button" - android:layout_width="wrap_content" - android:layout_height="wrap_content" + android:layout_width="@dimen/shutter_size" + android:layout_height="@dimen/shutter_size" android:layout_gravity="bottom|center_horizontal" android:layout_marginBottom="@dimen/shutter_offset" android:clickable="true" android:contentDescription="@string/accessibility_shutter_button" android:focusable="true" - android:scaleType="center" + android:scaleType="fitCenter" android:src="@drawable/btn_new_shutter" /> <com.android.camera.ui.RotateImageView @@ -109,12 +109,26 @@ android:layout_gravity="center" /> </com.android.camera.ui.RotatableLayout> - <TextView + <LinearLayout android:id="@+id/remaining_photos" - android:background="@android:color/transparent" - android:textColor="@android:color/white" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:visibility="gone" /> + android:background="@android:color/transparent" + android:orientation="horizontal" + android:visibility="gone" > + + <TextView + android:id="@+id/remaining_photos_text" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:background="@android:color/transparent" + android:textColor="@android:color/white" /> + + <ImageView + android:id="@+id/remaining_photos_image" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:src="@drawable/remaining_sheets" /> + </LinearLayout> -</com.android.camera.ui.CameraControls> +</com.android.camera.ui.CameraControls>
\ No newline at end of file |