diff options
| author | Sascha Haeberling <haeberling@google.com> | 2013-11-22 11:55:32 -0800 |
|---|---|---|
| committer | Sascha Haeberling <haeberling@google.com> | 2013-12-11 16:52:02 -0800 |
| commit | a63dbb6231f06031204fe20b19a87d0440bd1661 (patch) | |
| tree | 5d0052b87cc070476eb9c4fa9b4332dbe01fc082 /res/layout/camera_filmstrip.xml | |
| parent | b2510252fb020f3ccb88787c870930427377b9df (diff) | |
| download | android_packages_apps_Camera2-a63dbb6231f06031204fe20b19a87d0440bd1661.tar.gz android_packages_apps_Camera2-a63dbb6231f06031204fe20b19a87d0440bd1661.tar.bz2 android_packages_apps_Camera2-a63dbb6231f06031204fe20b19a87d0440bd1661.zip | |
Add a capture-session API to be used by all modules.
Bug: 11747284
This refactors the way we think of sessions. Instead of
having multiple session and notification APIs being used
by different modules, we create on central capture session
API to be used by all modules.
This also adds a first implementation of a Memory API which
tells modules about the current memory situation.
Change-Id: I7f030e32fc2f70f4007825ba7bbbdce9521a2bd9
Diffstat (limited to 'res/layout/camera_filmstrip.xml')
| -rw-r--r-- | res/layout/camera_filmstrip.xml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/res/layout/camera_filmstrip.xml b/res/layout/camera_filmstrip.xml index 2ea4f416e..176c86f88 100644 --- a/res/layout/camera_filmstrip.xml +++ b/res/layout/camera_filmstrip.xml @@ -34,7 +34,7 @@ <include layout="@layout/filmstrip_bottom_controls" /> <LinearLayout - android:id="@+id/pano_stitching_progress_panel" + android:id="@+id/pano_session_progress_panel" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_gravity="bottom|center_horizontal" @@ -46,7 +46,7 @@ android:orientation="vertical"> <TextView - android:id="@+id/pano_stitching_progress_text" + android:id="@+id/pano_session_progress_text" android:text="@string/rendering_photo_sphere" android:textColor="#ffffffff" android:textSize="14sp" @@ -60,7 +60,7 @@ android:layout_gravity="right"/> <ProgressBar - android:id="@+id/pano_stitching_progress_bar" + android:id="@+id/pano_session_progress_bar" style="@android:style/Widget.Holo.Light.ProgressBar.Horizontal" android:layout_width="match_parent" android:layout_height="wrap_content" |