Merge "SnapdragonCamera: Replace SurfaceView with AutoFitSurfaceView" into camera.lnx.1.0-dev.1.0

2 files changed, 9 insertions, 9 deletions

diff --git a/res/layout/capture_module.xml b/res/layout/capture_module.xml
index 02c32acab..a68af5e08 100644
--- a/res/layout/capture_module.xml
+++ b/res/layout/capture_module.xml
@@ -33,12 +33,12 @@
         android:layout_height="match_parent"
         android:layout_gravity="center_vertical|center_horizontal">
 
-        <SurfaceView
+        <com.android.camera.ui.AutoFitSurfaceView
             android:id="@+id/mdp_preview_content"
             android:layout_width="match_parent"
             android:layout_height="match_parent" />
 
-        <SurfaceView
+        <com.android.camera.ui.AutoFitSurfaceView
             android:id="@+id/mdp_preview_content2"
             android:layout_width="300dp"
             android:layout_height="300dp" />
diff --git a/src/com/android/camera/ui/AutoFitSurfaceView.java b/src/com/android/camera/ui/AutoFitSurfaceView.java
index f4903e19f..38be39cf9 100644
--- a/src/com/android/camera/ui/AutoFitSurfaceView.java
+++ b/src/com/android/camera/ui/AutoFitSurfaceView.java
@@ -14,29 +14,29 @@
  * limitations under the License.
  */
 
-package com.example.android.camera2basic;
+package com.android.camera.ui;
 
 import android.content.Context;
 import android.util.AttributeSet;
-import android.view.TextureView;
+import android.view.SurfaceView;
 
 /**
- * A {@link TextureView} that can be adjusted to a specified aspect ratio.
+ * A {@link SurfaceView} that can be adjusted to a specified aspect ratio.
  */
-public class AutoFitTextureView extends TextureView {
+public class AutoFitSurfaceView extends SurfaceView {
 
     private int mRatioWidth = 0;
     private int mRatioHeight = 0;
 
-    public AutoFitTextureView(Context context) {
+    public AutoFitSurfaceView(Context context) {
         this(context, null);
     }
 
-    public AutoFitTextureView(Context context, AttributeSet attrs) {
+    public AutoFitSurfaceView(Context context, AttributeSet attrs) {
         this(context, attrs, 0);
     }
 
-    public AutoFitTextureView(Context context, AttributeSet attrs, int defStyle) {
+    public AutoFitSurfaceView(Context context, AttributeSet attrs, int defStyle) {
         super(context, attrs, defStyle);
     }