summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/ui
diff options
context:
space:
mode:
Diffstat (limited to 'src/com/android/camera/ui')
-rw-r--r--src/com/android/camera/ui/CameraRootView.java6
-rw-r--r--src/com/android/camera/ui/CameraSwitcher.java6
-rw-r--r--src/com/android/camera/ui/EffectSettingPopup.java2
-rw-r--r--src/com/android/camera/ui/FaceView.java10
-rw-r--r--src/com/android/camera/ui/PreviewSurfaceView.java50
-rw-r--r--src/com/android/camera/ui/RotatableLayout.java10
-rw-r--r--src/com/android/camera/ui/RotateLayout.java4
-rw-r--r--src/com/android/camera/ui/RotateTextToast.java4
-rw-r--r--src/com/android/camera/ui/Switch.java2
9 files changed, 22 insertions, 72 deletions
diff --git a/src/com/android/camera/ui/CameraRootView.java b/src/com/android/camera/ui/CameraRootView.java
index 5186ea24c..48f24e4f2 100644
--- a/src/com/android/camera/ui/CameraRootView.java
+++ b/src/com/android/camera/ui/CameraRootView.java
@@ -27,8 +27,8 @@ import android.util.AttributeSet;
import android.view.View;
import android.widget.FrameLayout;
-import com.android.camera.Util;
-import com.android.camera.support.common.ApiHelper;
+import com.android.camera.util.CameraUtil;
+import com.android.camera.util.ApiHelper;
@SuppressLint("NewApi")
public class CameraRootView extends FrameLayout {
@@ -110,7 +110,7 @@ public class CameraRootView extends FrameLayout {
@Override
protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
- int rotation = Util.getDisplayRotation((Activity) getContext());
+ int rotation = CameraUtil.getDisplayRotation((Activity) getContext());
// all the layout code assumes camera device orientation to be portrait
// adjust rotation for landscape
int orientation = getResources().getConfiguration().orientation;
diff --git a/src/com/android/camera/ui/CameraSwitcher.java b/src/com/android/camera/ui/CameraSwitcher.java
index 4a05622bc..eee68a58c 100644
--- a/src/com/android/camera/ui/CameraSwitcher.java
+++ b/src/com/android/camera/ui/CameraSwitcher.java
@@ -34,12 +34,12 @@ import android.view.ViewGroup;
import android.widget.FrameLayout.LayoutParams;
import android.widget.LinearLayout;
-import com.android.camera.Util;
+import com.android.camera.util.CameraUtil;
import com.android.camera.util.PhotoSphereHelper;
import com.android.camera.util.RefocusHelper;
import com.android.camera.util.UsageStatistics;
import com.android.camera2.R;
-import com.android.gallery3d.common.ApiHelper;
+import com.android.camera.util.ApiHelper;
public class CameraSwitcher extends RotateImageView
implements OnClickListener, OnTouchListener {
@@ -292,7 +292,7 @@ public class CameraSwitcher extends RotateImageView
}
private void layoutPopup() {
- int orientation = Util.getDisplayRotation((Activity) getContext());
+ int orientation = CameraUtil.getDisplayRotation((Activity) getContext());
int w = mPopup.getMeasuredWidth();
int h = mPopup.getMeasuredHeight();
if (orientation == 0) {
diff --git a/src/com/android/camera/ui/EffectSettingPopup.java b/src/com/android/camera/ui/EffectSettingPopup.java
index d51803a83..1ee278d21 100644
--- a/src/com/android/camera/ui/EffectSettingPopup.java
+++ b/src/com/android/camera/ui/EffectSettingPopup.java
@@ -30,7 +30,7 @@ import android.widget.SimpleAdapter;
import com.android.camera.IconListPreference;
import com.android.camera2.R;
-import com.android.gallery3d.common.ApiHelper;
+import com.android.camera.util.ApiHelper;
// A popup window that shows video effect setting. It has two grid view.
// One shows the goofy face effects. The other shows the background replacer
diff --git a/src/com/android/camera/ui/FaceView.java b/src/com/android/camera/ui/FaceView.java
index 1a539665e..7ec9b7e54 100644
--- a/src/com/android/camera/ui/FaceView.java
+++ b/src/com/android/camera/ui/FaceView.java
@@ -31,10 +31,10 @@ import android.util.AttributeSet;
import android.util.Log;
import android.view.View;
+import com.android.camera.util.CameraUtil;
import com.android.camera.PhotoUI;
-import com.android.camera.Util;
import com.android.camera2.R;
-import com.android.gallery3d.common.ApiHelper;
+import com.android.camera.util.ApiHelper;
@TargetApi(ApiHelper.VERSION_CODES.ICE_CREAM_SANDWICH)
public class FaceView extends View
@@ -197,7 +197,7 @@ public class FaceView extends View
rw = rh;
rh = temp;
}
- Util.prepareMatrix(mMatrix, mMirror, mDisplayOrientation, rw, rh);
+ CameraUtil.prepareMatrix(mMatrix, mMirror, mDisplayOrientation, rw, rh);
int dx = (getWidth() - rw) / 2;
int dy = (getHeight() - rh) / 2;
@@ -212,9 +212,9 @@ public class FaceView extends View
// Transform the coordinates.
mRect.set(mFaces[i].rect);
- if (LOGV) Util.dumpRect(mRect, "Original rect");
+ if (LOGV) CameraUtil.dumpRect(mRect, "Original rect");
mMatrix.mapRect(mRect);
- if (LOGV) Util.dumpRect(mRect, "Transformed rect");
+ if (LOGV) CameraUtil.dumpRect(mRect, "Transformed rect");
mPaint.setColor(mColor);
mRect.offset(dx, dy);
canvas.drawOval(mRect, mPaint);
diff --git a/src/com/android/camera/ui/PreviewSurfaceView.java b/src/com/android/camera/ui/PreviewSurfaceView.java
deleted file mode 100644
index 9a428e23c..000000000
--- a/src/com/android/camera/ui/PreviewSurfaceView.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (C) 2012 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.camera.ui;
-
-import android.content.Context;
-import android.util.AttributeSet;
-import android.view.SurfaceHolder;
-import android.view.SurfaceView;
-import android.view.ViewGroup;
-
-import com.android.gallery3d.common.ApiHelper;
-
-public class PreviewSurfaceView extends SurfaceView {
- public PreviewSurfaceView(Context context, AttributeSet attrs) {
- super(context, attrs);
- setZOrderMediaOverlay(true);
- getHolder().setType(SurfaceHolder.SURFACE_TYPE_PUSH_BUFFERS);
- }
-
- public void shrink() {
- setLayoutSize(1);
- }
-
- public void expand() {
- setLayoutSize(ViewGroup.LayoutParams.MATCH_PARENT);
- }
-
- private void setLayoutSize(int size) {
- ViewGroup.LayoutParams p = getLayoutParams();
- if (p.width != size || p.height != size) {
- p.width = size;
- p.height = size;
- setLayoutParams(p);
- }
- }
-}
diff --git a/src/com/android/camera/ui/RotatableLayout.java b/src/com/android/camera/ui/RotatableLayout.java
index 965d62a90..e9ee0f358 100644
--- a/src/com/android/camera/ui/RotatableLayout.java
+++ b/src/com/android/camera/ui/RotatableLayout.java
@@ -25,7 +25,7 @@ import android.view.View;
import android.view.ViewGroup;
import android.widget.FrameLayout;
-import com.android.camera.Util;
+import com.android.camera.util.CameraUtil;
/* RotatableLayout rotates itself as well as all its children when orientation
* changes. Specifically, when going from portrait to landscape, camera
@@ -62,7 +62,7 @@ public class RotatableLayout extends FrameLayout {
@Override
public void onAttachedToWindow() {
- mPrevRotation = Util.getDisplayRotation((Activity) getContext());
+ mPrevRotation = CameraUtil.getDisplayRotation((Activity) getContext());
// check if there is any rotation before the view is attached to window
int currentOrientation = getResources().getConfiguration().orientation;
int orientation = getUnifiedRotation();
@@ -89,7 +89,7 @@ public class RotatableLayout extends FrameLayout {
// all the layout code assumes camera device orientation to be portrait
// adjust rotation for landscape
int orientation = getResources().getConfiguration().orientation;
- int rotation = Util.getDisplayRotation((Activity) getContext());
+ int rotation = CameraUtil.getDisplayRotation((Activity) getContext());
int camOrientation = (rotation % 180 == 0) ? Configuration.ORIENTATION_PORTRAIT
: Configuration.ORIENTATION_LANDSCAPE;
if (camOrientation != orientation) {
@@ -99,7 +99,7 @@ public class RotatableLayout extends FrameLayout {
}
public void checkLayoutFlip() {
- int currentRotation = Util.getDisplayRotation((Activity) getContext());
+ int currentRotation = CameraUtil.getDisplayRotation((Activity) getContext());
if ((currentRotation - mPrevRotation + 360) % 360 == 180) {
mPrevRotation = currentRotation;
flipChildren();
@@ -118,7 +118,7 @@ public class RotatableLayout extends FrameLayout {
@Override
public void onConfigurationChanged(Configuration config) {
super.onConfigurationChanged(config);
- int rotation = Util.getDisplayRotation((Activity) getContext());
+ int rotation = CameraUtil.getDisplayRotation((Activity) getContext());
int diff = (rotation - mPrevRotation + 360) % 360;
if ( diff == 0) {
// No rotation
diff --git a/src/com/android/camera/ui/RotateLayout.java b/src/com/android/camera/ui/RotateLayout.java
index 5d6debb17..044da1cee 100644
--- a/src/com/android/camera/ui/RotateLayout.java
+++ b/src/com/android/camera/ui/RotateLayout.java
@@ -27,8 +27,8 @@ import android.view.View;
import android.view.ViewGroup;
import android.view.ViewParent;
-import com.android.camera.support.util.MotionEventHelper;
-import com.android.gallery3d.common.ApiHelper;
+import com.android.camera.util.MotionEventHelper;
+import com.android.camera.util.ApiHelper;
// A RotateLayout is designed to display a single item and provides the
// capabilities to rotate the item.
diff --git a/src/com/android/camera/ui/RotateTextToast.java b/src/com/android/camera/ui/RotateTextToast.java
index 16382442e..ea1268218 100644
--- a/src/com/android/camera/ui/RotateTextToast.java
+++ b/src/com/android/camera/ui/RotateTextToast.java
@@ -23,7 +23,7 @@ import android.view.View;
import android.view.ViewGroup;
import android.widget.TextView;
-import com.android.camera.Util;
+import com.android.camera.util.CameraUtil;
import com.android.camera2.R;
public class RotateTextToast {
@@ -46,7 +46,7 @@ public class RotateTextToast {
private final Runnable mRunnable = new Runnable() {
@Override
public void run() {
- Util.fadeOut(mToast);
+ CameraUtil.fadeOut(mToast);
mLayoutRoot.removeView(mToast);
mToast = null;
}
diff --git a/src/com/android/camera/ui/Switch.java b/src/com/android/camera/ui/Switch.java
index 9191242f6..4518dedf4 100644
--- a/src/com/android/camera/ui/Switch.java
+++ b/src/com/android/camera/ui/Switch.java
@@ -39,7 +39,7 @@ import android.view.accessibility.AccessibilityNodeInfo;
import android.widget.CompoundButton;
import com.android.camera2.R;
-import com.android.gallery3d.common.ApiHelper;
+import com.android.camera.util.ApiHelper;
/**
* A Switch is a two-state toggle switch widget that can select between two
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-28 05:24:31 +0000