From 8e963a5a6016d246184ed65906f9d103e92b17e2 Mon Sep 17 00:00:00 2001 From: Sascha Haeberling Date: Tue, 6 Aug 2013 11:43:02 -0700 Subject: This removes all non-Camera stuff from Camera2. Note: Camera2 is a clone of Gallery2 right now. Note 2: I will bring .mk files back later. Change-Id: Ida958654296f5ebaacb6bb0ff59d52a7c37ce6fc --- src/com/android/camera/PreviewFrameLayout.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/com/android/camera/PreviewFrameLayout.java') diff --git a/src/com/android/camera/PreviewFrameLayout.java b/src/com/android/camera/PreviewFrameLayout.java index 03ef91c60..cc2d28099 100644 --- a/src/com/android/camera/PreviewFrameLayout.java +++ b/src/com/android/camera/PreviewFrameLayout.java @@ -16,17 +16,15 @@ package com.android.camera; +import android.annotation.SuppressLint; import android.content.Context; -import android.content.res.Configuration; import android.util.AttributeSet; import android.view.View; -import android.view.ViewStub; import android.widget.RelativeLayout; - +import com.android.camera.support.common.ApiHelper; import com.android.camera.ui.LayoutChangeHelper; import com.android.camera.ui.LayoutChangeNotifier; -import com.android.gallery3d.R; -import com.android.gallery3d.common.ApiHelper; +import com.android.camera2.R; /** * A layout which handles the preview aspect ratio. @@ -128,9 +126,11 @@ public class PreviewFrameLayout extends RelativeLayout implements LayoutChangeNo mLayoutChangeHelper.setOnLayoutChangeListener(listener); } - @Override + @SuppressLint("WrongCall") + @Override protected void onLayout(boolean changed, int l, int t, int r, int b) { super.onLayout(changed, l, t, r, b); + // TODO: Suspicious call! mLayoutChangeHelper.onLayout(changed, l, t, r, b); } } -- cgit v1.2.3