diff options
Diffstat (limited to 'src/com/android/camera/ui')
20 files changed, 43 insertions, 53 deletions
diff --git a/src/com/android/camera/ui/AbstractSettingPopup.java b/src/com/android/camera/ui/AbstractSettingPopup.java index 783b6c771..a3cf298b5 100644 --- a/src/com/android/camera/ui/AbstractSettingPopup.java +++ b/src/com/android/camera/ui/AbstractSettingPopup.java @@ -21,7 +21,7 @@ import android.util.AttributeSet; import android.view.ViewGroup; import android.widget.TextView; -import com.android.gallery3d.R; +import com.android.camera2.R; // A popup window that shows one or more camera settings. abstract public class AbstractSettingPopup extends RotateLayout { diff --git a/src/com/android/camera/ui/CameraControls.java b/src/com/android/camera/ui/CameraControls.java index 7fa6890a7..ed281398b 100644 --- a/src/com/android/camera/ui/CameraControls.java +++ b/src/com/android/camera/ui/CameraControls.java @@ -16,17 +16,13 @@ package com.android.camera.ui; -import android.app.Activity; import android.content.Context; -import android.content.res.Configuration; import android.graphics.Rect; import android.util.AttributeSet; import android.view.View; import android.widget.FrameLayout; -import com.android.camera.Util; -import com.android.gallery3d.R; -import com.android.gallery3d.common.ApiHelper; +import com.android.camera2.R; public class CameraControls extends RotatableLayout { diff --git a/src/com/android/camera/ui/CameraRootView.java b/src/com/android/camera/ui/CameraRootView.java index adda70697..5186ea24c 100644 --- a/src/com/android/camera/ui/CameraRootView.java +++ b/src/com/android/camera/ui/CameraRootView.java @@ -16,6 +16,7 @@ package com.android.camera.ui; +import android.annotation.SuppressLint; import android.app.Activity; import android.content.Context; import android.content.res.Configuration; @@ -27,8 +28,9 @@ import android.view.View; import android.widget.FrameLayout; import com.android.camera.Util; -import com.android.gallery3d.common.ApiHelper; +import com.android.camera.support.common.ApiHelper; +@SuppressLint("NewApi") public class CameraRootView extends FrameLayout { private int mTopMargin = 0; diff --git a/src/com/android/camera/ui/CameraSwitcher.java b/src/com/android/camera/ui/CameraSwitcher.java index 6e4321571..f9e78f069 100644 --- a/src/com/android/camera/ui/CameraSwitcher.java +++ b/src/com/android/camera/ui/CameraSwitcher.java @@ -35,10 +35,10 @@ import android.widget.FrameLayout.LayoutParams; import android.widget.LinearLayout; import com.android.camera.Util; -import com.android.gallery3d.R; +import com.android.camera.util.PhotoSphereHelper; +import com.android.camera.util.UsageStatistics; +import com.android.camera2.R; import com.android.gallery3d.common.ApiHelper; -import com.android.gallery3d.util.LightCycleHelper; -import com.android.gallery3d.util.UsageStatistics; public class CameraSwitcher extends RotateImageView implements OnClickListener, OnTouchListener { @@ -96,14 +96,14 @@ public class CameraSwitcher extends RotateImageView } public void initializeDrawables(Context context) { - int totaldrawid = (LightCycleHelper.hasLightCycleCapture(context) + int totaldrawid = (PhotoSphereHelper.hasLightCycleCapture(context) ? DRAW_IDS.length : DRAW_IDS.length - 1); int[] drawids = new int[totaldrawid]; int[] moduleids = new int[totaldrawid]; int ix = 0; for (int i = 0; i < DRAW_IDS.length; i++) { - if (i == LIGHTCYCLE_MODULE_INDEX && !LightCycleHelper.hasLightCycleCapture(context)) { + if (i == LIGHTCYCLE_MODULE_INDEX && !PhotoSphereHelper.hasLightCycleCapture(context)) { continue; // not enabled, so don't add to UI } moduleids[ix] = i; diff --git a/src/com/android/camera/ui/CountDownView.java b/src/com/android/camera/ui/CountDownView.java index 907d33508..6f4ae8cda 100644 --- a/src/com/android/camera/ui/CountDownView.java +++ b/src/com/android/camera/ui/CountDownView.java @@ -31,7 +31,7 @@ import android.view.animation.AnimationUtils; import android.widget.FrameLayout; import android.widget.TextView; -import com.android.gallery3d.R; +import com.android.camera2.R; public class CountDownView extends FrameLayout { diff --git a/src/com/android/camera/ui/CountdownTimerPopup.java b/src/com/android/camera/ui/CountdownTimerPopup.java index 7c3572b55..3f3a1ac7d 100644 --- a/src/com/android/camera/ui/CountdownTimerPopup.java +++ b/src/com/android/camera/ui/CountdownTimerPopup.java @@ -16,6 +16,8 @@ package com.android.camera.ui; +import java.util.Locale; + import android.content.Context; import android.util.AttributeSet; import android.util.Log; @@ -26,9 +28,7 @@ import android.widget.NumberPicker; import android.widget.NumberPicker.OnValueChangeListener; import com.android.camera.ListPreference; -import com.android.gallery3d.R; - -import java.util.Locale; +import com.android.camera2.R; /** * This is a popup window that allows users to specify a countdown timer diff --git a/src/com/android/camera/ui/EffectSettingPopup.java b/src/com/android/camera/ui/EffectSettingPopup.java index 568781a01..d51803a83 100644 --- a/src/com/android/camera/ui/EffectSettingPopup.java +++ b/src/com/android/camera/ui/EffectSettingPopup.java @@ -16,6 +16,9 @@ package com.android.camera.ui; +import java.util.ArrayList; +import java.util.HashMap; + import android.annotation.TargetApi; import android.content.Context; import android.util.AttributeSet; @@ -26,13 +29,9 @@ import android.widget.GridView; import android.widget.SimpleAdapter; import com.android.camera.IconListPreference; - -import com.android.gallery3d.R; +import com.android.camera2.R; import com.android.gallery3d.common.ApiHelper; -import java.util.ArrayList; -import java.util.HashMap; - // 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 // effects. diff --git a/src/com/android/camera/ui/FaceView.java b/src/com/android/camera/ui/FaceView.java index 7d66dc079..1a539665e 100644 --- a/src/com/android/camera/ui/FaceView.java +++ b/src/com/android/camera/ui/FaceView.java @@ -33,7 +33,7 @@ import android.view.View; import com.android.camera.PhotoUI; import com.android.camera.Util; -import com.android.gallery3d.R; +import com.android.camera2.R; import com.android.gallery3d.common.ApiHelper; @TargetApi(ApiHelper.VERSION_CODES.ICE_CREAM_SANDWICH) diff --git a/src/com/android/camera/ui/FilmStripView.java b/src/com/android/camera/ui/FilmStripView.java index 8a1a85a55..79f58c7be 100644 --- a/src/com/android/camera/ui/FilmStripView.java +++ b/src/com/android/camera/ui/FilmStripView.java @@ -33,8 +33,8 @@ import android.widget.ImageButton; import android.widget.Scroller; import com.android.camera.ui.FilmStripView.ImageData.PanoramaSupportCallback; -import com.android.gallery3d.R; -import com.android.gallery3d.util.LightCycleHelper.PanoramaViewHelper; +import com.android.camera.util.PhotoSphereHelper.PanoramaViewHelper; +import com.android.camera2.R; public class FilmStripView extends ViewGroup { @SuppressWarnings("unused") diff --git a/src/com/android/camera/ui/InLineSettingCheckBox.java b/src/com/android/camera/ui/InLineSettingCheckBox.java index c1aa5a91c..c3cd1979d 100644 --- a/src/com/android/camera/ui/InLineSettingCheckBox.java +++ b/src/com/android/camera/ui/InLineSettingCheckBox.java @@ -23,9 +23,8 @@ import android.widget.CheckBox; import android.widget.CompoundButton; import android.widget.CompoundButton.OnCheckedChangeListener; - import com.android.camera.ListPreference; -import com.android.gallery3d.R; +import com.android.camera2.R; /* A check box setting control which turns on/off the setting. */ public class InLineSettingCheckBox extends InLineSettingItem { diff --git a/src/com/android/camera/ui/InLineSettingItem.java b/src/com/android/camera/ui/InLineSettingItem.java index 839a77fd0..288781fda 100644 --- a/src/com/android/camera/ui/InLineSettingItem.java +++ b/src/com/android/camera/ui/InLineSettingItem.java @@ -23,7 +23,7 @@ import android.widget.LinearLayout; import android.widget.TextView; import com.android.camera.ListPreference; -import com.android.gallery3d.R; +import com.android.camera2.R; /** * A one-line camera setting could be one of three types: knob, switch or restore diff --git a/src/com/android/camera/ui/InLineSettingMenu.java b/src/com/android/camera/ui/InLineSettingMenu.java index 8e45c3e38..1d80741b5 100644 --- a/src/com/android/camera/ui/InLineSettingMenu.java +++ b/src/com/android/camera/ui/InLineSettingMenu.java @@ -23,7 +23,7 @@ import android.view.accessibility.AccessibilityEvent; import android.widget.TextView; import com.android.camera.ListPreference; -import com.android.gallery3d.R; +import com.android.camera2.R; /* Setting menu item that will bring up a menu when you click on it. */ public class InLineSettingMenu extends InLineSettingItem { diff --git a/src/com/android/camera/ui/ListPrefSettingPopup.java b/src/com/android/camera/ui/ListPrefSettingPopup.java index cfef73f49..ff4d995a0 100644 --- a/src/com/android/camera/ui/ListPrefSettingPopup.java +++ b/src/com/android/camera/ui/ListPrefSettingPopup.java @@ -16,23 +16,23 @@ package com.android.camera.ui; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + import android.content.Context; import android.util.AttributeSet; import android.util.Log; import android.view.View; -import android.widget.ListView; import android.widget.AdapterView; import android.widget.ImageView; +import android.widget.ListView; import android.widget.SimpleAdapter; import com.android.camera.IconListPreference; import com.android.camera.ListPreference; -import com.android.gallery3d.R; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import com.android.camera2.R; // A popup window that shows one camera setting. The title is the name of the // setting (ex: white-balance). The entries are the supported values (ex: diff --git a/src/com/android/camera/ui/MoreSettingPopup.java b/src/com/android/camera/ui/MoreSettingPopup.java index 5900058df..8da26c946 100644 --- a/src/com/android/camera/ui/MoreSettingPopup.java +++ b/src/com/android/camera/ui/MoreSettingPopup.java @@ -16,6 +16,8 @@ package com.android.camera.ui; +import java.util.ArrayList; + import android.content.Context; import android.util.AttributeSet; import android.util.Log; @@ -28,9 +30,7 @@ import android.widget.ListView; import com.android.camera.ListPreference; import com.android.camera.PreferenceGroup; -import com.android.gallery3d.R; - -import java.util.ArrayList; +import com.android.camera2.R; /* A popup window that contains several camera settings. */ public class MoreSettingPopup extends AbstractSettingPopup diff --git a/src/com/android/camera/ui/PieRenderer.java b/src/com/android/camera/ui/PieRenderer.java index c78107ce9..666fa13b1 100644 --- a/src/com/android/camera/ui/PieRenderer.java +++ b/src/com/android/camera/ui/PieRenderer.java @@ -16,6 +16,9 @@ package com.android.camera.ui; +import java.util.ArrayList; +import java.util.List; + import android.animation.Animator; import android.animation.Animator.AnimatorListener; import android.animation.ValueAnimator; @@ -37,10 +40,7 @@ import android.view.animation.Animation; import android.view.animation.Transformation; import com.android.camera.drawable.TextDrawable; -import com.android.gallery3d.R; - -import java.util.ArrayList; -import java.util.List; +import com.android.camera2.R; public class PieRenderer extends OverlayRenderer implements FocusIndicator { diff --git a/src/com/android/camera/ui/RotateLayout.java b/src/com/android/camera/ui/RotateLayout.java index 86f5c814d..5d6debb17 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.gallery3d.util.MotionEventHelper; // 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 c78a258b0..16382442e 100644 --- a/src/com/android/camera/ui/RotateTextToast.java +++ b/src/com/android/camera/ui/RotateTextToast.java @@ -24,7 +24,7 @@ import android.view.ViewGroup; import android.widget.TextView; import com.android.camera.Util; -import com.android.gallery3d.R; +import com.android.camera2.R; public class RotateTextToast { private static final int TOAST_DURATION = 5000; // milliseconds diff --git a/src/com/android/camera/ui/Switch.java b/src/com/android/camera/ui/Switch.java index ac21758a7..9191242f6 100644 --- a/src/com/android/camera/ui/Switch.java +++ b/src/com/android/camera/ui/Switch.java @@ -20,11 +20,9 @@ import android.annotation.TargetApi; import android.content.Context; import android.content.res.ColorStateList; import android.content.res.Resources; -import android.content.res.TypedArray; import android.graphics.Canvas; import android.graphics.Paint; import android.graphics.Rect; -import android.graphics.Typeface; import android.graphics.drawable.Drawable; import android.text.Layout; import android.text.StaticLayout; @@ -32,8 +30,6 @@ import android.text.TextPaint; import android.text.TextUtils; import android.util.AttributeSet; import android.util.DisplayMetrics; -import android.util.Log; -import android.util.TypedValue; import android.view.Gravity; import android.view.MotionEvent; import android.view.VelocityTracker; @@ -42,11 +38,9 @@ import android.view.accessibility.AccessibilityEvent; import android.view.accessibility.AccessibilityNodeInfo; import android.widget.CompoundButton; -import com.android.gallery3d.R; +import com.android.camera2.R; import com.android.gallery3d.common.ApiHelper; -import java.util.Arrays; - /** * A Switch is a two-state toggle switch widget that can select between two * options. The user may drag the "thumb" back and forth to choose the selected option, diff --git a/src/com/android/camera/ui/TimeIntervalPopup.java b/src/com/android/camera/ui/TimeIntervalPopup.java index 18ad9f5da..f35f24193 100644 --- a/src/com/android/camera/ui/TimeIntervalPopup.java +++ b/src/com/android/camera/ui/TimeIntervalPopup.java @@ -28,7 +28,7 @@ import android.widget.TextView; import com.android.camera.IconListPreference; import com.android.camera.ListPreference; -import com.android.gallery3d.R; +import com.android.camera2.R; /** * This is a popup window that allows users to turn on/off time lapse feature, diff --git a/src/com/android/camera/ui/ZoomRenderer.java b/src/com/android/camera/ui/ZoomRenderer.java index 86b82b459..e708d3eea 100644 --- a/src/com/android/camera/ui/ZoomRenderer.java +++ b/src/com/android/camera/ui/ZoomRenderer.java @@ -24,7 +24,7 @@ import android.graphics.Paint; import android.graphics.Rect; import android.view.ScaleGestureDetector; -import com.android.gallery3d.R; +import com.android.camera2.R; public class ZoomRenderer extends OverlayRenderer implements ScaleGestureDetector.OnScaleGestureListener { |