diff options
| author | Senpo Hu <senpo@google.com> | 2014-12-16 11:56:39 -0800 |
|---|---|---|
| committer | Senpo Hu <senpo@google.com> | 2014-12-18 14:26:47 -0800 |
| commit | 2272f8a6bfc8adca8ada7a215bef038d45256085 (patch) | |
| tree | a4a02fb7f228db7ab84fe2fc61d9f5129cdcdf05 /res | |
| parent | 01d56038a53487a9b7989bd17c732b8919da64f1 (diff) | |
| download | android_packages_apps_Camera2-2272f8a6bfc8adca8ada7a215bef038d45256085.tar.gz android_packages_apps_Camera2-2272f8a6bfc8adca8ada7a215bef038d45256085.tar.bz2 android_packages_apps_Camera2-2272f8a6bfc8adca8ada7a215bef038d45256085.zip | |
CaptureModule first run dialog.
* Introduce FirstRunDialog.
* Add OneCameraCharacteristics so we can query camera properties without
opening the camera.
* Refactor AspectRatioDialogLayout and LocationDialogLayout to clean up.
* Refactor to move away from portability/Size class in Camera2.
Bug: 18623223
Change-Id: I05f4eefe3ee2feeaa47b6296f8926f6be8e83051
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout-land/aspect_ratio_selector.xml | 4 | ||||
| -rw-r--r-- | res/layout-port/aspect_ratio_selector.xml | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/res/layout-land/aspect_ratio_selector.xml b/res/layout-land/aspect_ratio_selector.xml index 5b8ea7c2c..6d32f58b0 100644 --- a/res/layout-land/aspect_ratio_selector.xml +++ b/res/layout-land/aspect_ratio_selector.xml @@ -14,7 +14,7 @@ limitations under the License. --> -<com.android.camera.widget.AspectRatioSelector +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/aspect_ratio_selector" android:orientation="vertical" @@ -67,4 +67,4 @@ android:gravity="center" android:layout_weight="1"/> </LinearLayout> -</com.android.camera.widget.AspectRatioSelector> +</LinearLayout> diff --git a/res/layout-port/aspect_ratio_selector.xml b/res/layout-port/aspect_ratio_selector.xml index 69f0d8052..96e8aa6ae 100644 --- a/res/layout-port/aspect_ratio_selector.xml +++ b/res/layout-port/aspect_ratio_selector.xml @@ -14,7 +14,7 @@ limitations under the License. --> -<com.android.camera.widget.AspectRatioSelector +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/aspect_ratio_selector" android:orientation="vertical" > @@ -38,4 +38,4 @@ android:src="@drawable/aspect_ratio_16x9" android:layout_marginLeft="28dp"/> </LinearLayout> -</com.android.camera.widget.AspectRatioSelector> +</LinearLayout> |