summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/ui
diff options
context:
space:
mode:
authorSachin Shah <sachins@codeaurora.org>2014-08-15 18:36:44 -0700
committerSachin Shah <sachins@codeaurora.org>2014-08-16 12:27:05 -0700
commit89d153ba5666f76bb603198fe175fa92aa75431f (patch)
tree97b6e0b748d9440b358fa2c34b5ae8bf2e368a39 /src/com/android/camera/ui
parent7ec9d242fd268ab698b665a894bbb7368e9a1776 (diff)
downloadandroid_packages_apps_Snap-89d153ba5666f76bb603198fe175fa92aa75431f.tar.gz
android_packages_apps_Snap-89d153ba5666f76bb603198fe175fa92aa75431f.tar.bz2
android_packages_apps_Snap-89d153ba5666f76bb603198fe175fa92aa75431f.zip
Rename module and package name to co-exist with AOSP app
Rename package from com.android.camera2 to org.codeaurora.snapcam, module name from Camera2 to SnapdragonCamera and app name from "Camera" to "Snapdragon Camera" Change-Id: I2800070e72631e119a15fe0132424d1047be9f0c
Diffstat (limited to 'src/com/android/camera/ui')
-rw-r--r--src/com/android/camera/ui/AbstractSettingPopup.java2
-rw-r--r--src/com/android/camera/ui/CameraControls.java2
-rw-r--r--src/com/android/camera/ui/CountDownView.java2
-rw-r--r--src/com/android/camera/ui/CountdownTimerPopup.java2
-rw-r--r--src/com/android/camera/ui/DetailsDialog.java2
-rw-r--r--src/com/android/camera/ui/FaceView.java2
-rw-r--r--src/com/android/camera/ui/FilmStripView.java2
-rw-r--r--src/com/android/camera/ui/FilmstripBottomControls.java2
-rw-r--r--src/com/android/camera/ui/InLineSettingCheckBox.java2
-rw-r--r--src/com/android/camera/ui/InLineSettingItem.java2
-rw-r--r--src/com/android/camera/ui/InLineSettingMenu.java2
-rw-r--r--src/com/android/camera/ui/ListPrefSettingPopup.java2
-rw-r--r--src/com/android/camera/ui/ModuleSwitcher.java2
-rw-r--r--src/com/android/camera/ui/MoreSettingPopup.java2
-rw-r--r--src/com/android/camera/ui/PieRenderer.java2
-rw-r--r--src/com/android/camera/ui/ProgressRenderer.java2
-rw-r--r--src/com/android/camera/ui/RotateTextToast.java2
-rw-r--r--src/com/android/camera/ui/Switch.java2
-rw-r--r--src/com/android/camera/ui/TimeIntervalPopup.java2
-rw-r--r--src/com/android/camera/ui/ZoomRenderer.java2
20 files changed, 20 insertions, 20 deletions
diff --git a/src/com/android/camera/ui/AbstractSettingPopup.java b/src/com/android/camera/ui/AbstractSettingPopup.java
index a3cf298b5..e4c7aa9fb 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.camera2.R;
+import org.codeaurora.snapcam.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 d211f4eef..9e0964b4f 100644
--- a/src/com/android/camera/ui/CameraControls.java
+++ b/src/com/android/camera/ui/CameraControls.java
@@ -22,7 +22,7 @@ import android.util.AttributeSet;
import android.view.View;
import android.widget.FrameLayout;
-import com.android.camera2.R;
+import org.codeaurora.snapcam.R;
public class CameraControls extends RotatableLayout {
diff --git a/src/com/android/camera/ui/CountDownView.java b/src/com/android/camera/ui/CountDownView.java
index 9cfe3f9b0..75cdf5e8a 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.camera2.R;
+import org.codeaurora.snapcam.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 3f3a1ac7d..aa1219481 100644
--- a/src/com/android/camera/ui/CountdownTimerPopup.java
+++ b/src/com/android/camera/ui/CountdownTimerPopup.java
@@ -28,7 +28,7 @@ import android.widget.NumberPicker;
import android.widget.NumberPicker.OnValueChangeListener;
import com.android.camera.ListPreference;
-import com.android.camera2.R;
+import org.codeaurora.snapcam.R;
/**
* This is a popup window that allows users to specify a countdown timer
diff --git a/src/com/android/camera/ui/DetailsDialog.java b/src/com/android/camera/ui/DetailsDialog.java
index 9561ef542..18428c0f2 100644
--- a/src/com/android/camera/ui/DetailsDialog.java
+++ b/src/com/android/camera/ui/DetailsDialog.java
@@ -31,7 +31,7 @@ import android.widget.ListView;
import android.widget.TextView;
import com.android.camera.data.MediaDetails;
-import com.android.camera2.R;
+import org.codeaurora.snapcam.R;
import java.text.DecimalFormat;
import java.text.NumberFormat;
diff --git a/src/com/android/camera/ui/FaceView.java b/src/com/android/camera/ui/FaceView.java
index 1868e0a38..9e50f166a 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.CameraUtil;
-import com.android.camera2.R;
+import org.codeaurora.snapcam.R;
import org.codeaurora.camera.ExtendedFace;
public class FaceView extends View
diff --git a/src/com/android/camera/ui/FilmStripView.java b/src/com/android/camera/ui/FilmStripView.java
index d0bcdfcc2..f892934e2 100644
--- a/src/com/android/camera/ui/FilmStripView.java
+++ b/src/com/android/camera/ui/FilmStripView.java
@@ -44,7 +44,7 @@ import com.android.camera.ui.FilmstripBottomControls.BottomControlsListener;
import com.android.camera.util.CameraUtil;
import com.android.camera.util.PhotoSphereHelper.PanoramaViewHelper;
import com.android.camera.util.UsageStatistics;
-import com.android.camera2.R;
+import org.codeaurora.snapcam.R;
import java.util.Arrays;
diff --git a/src/com/android/camera/ui/FilmstripBottomControls.java b/src/com/android/camera/ui/FilmstripBottomControls.java
index 451bc928a..521fd50e2 100644
--- a/src/com/android/camera/ui/FilmstripBottomControls.java
+++ b/src/com/android/camera/ui/FilmstripBottomControls.java
@@ -23,7 +23,7 @@ import android.widget.ImageButton;
import android.widget.RelativeLayout;
import com.android.camera.CameraActivity;
-import com.android.camera2.R;
+import org.codeaurora.snapcam.R;
/**
* Shows controls at the bottom of the screen for editing, viewing a photo
diff --git a/src/com/android/camera/ui/InLineSettingCheckBox.java b/src/com/android/camera/ui/InLineSettingCheckBox.java
index c3cd1979d..556cbb7c8 100644
--- a/src/com/android/camera/ui/InLineSettingCheckBox.java
+++ b/src/com/android/camera/ui/InLineSettingCheckBox.java
@@ -24,7 +24,7 @@ import android.widget.CompoundButton;
import android.widget.CompoundButton.OnCheckedChangeListener;
import com.android.camera.ListPreference;
-import com.android.camera2.R;
+import org.codeaurora.snapcam.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 288781fda..cdbe2fe6e 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.camera2.R;
+import org.codeaurora.snapcam.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 1d80741b5..94daa7914 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.camera2.R;
+import org.codeaurora.snapcam.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 ff4d995a0..d66eb58d3 100644
--- a/src/com/android/camera/ui/ListPrefSettingPopup.java
+++ b/src/com/android/camera/ui/ListPrefSettingPopup.java
@@ -32,7 +32,7 @@ import android.widget.SimpleAdapter;
import com.android.camera.IconListPreference;
import com.android.camera.ListPreference;
-import com.android.camera2.R;
+import org.codeaurora.snapcam.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/ModuleSwitcher.java b/src/com/android/camera/ui/ModuleSwitcher.java
index df76bbde2..60fed24ad 100644
--- a/src/com/android/camera/ui/ModuleSwitcher.java
+++ b/src/com/android/camera/ui/ModuleSwitcher.java
@@ -38,7 +38,7 @@ import com.android.camera.util.CameraUtil;
import com.android.camera.util.GcamHelper;
import com.android.camera.util.PhotoSphereHelper;
import com.android.camera.util.UsageStatistics;
-import com.android.camera2.R;
+import org.codeaurora.snapcam.R;
public class ModuleSwitcher extends RotateImageView
implements OnClickListener, OnTouchListener {
diff --git a/src/com/android/camera/ui/MoreSettingPopup.java b/src/com/android/camera/ui/MoreSettingPopup.java
index ad8ed7721..2e0626e74 100644
--- a/src/com/android/camera/ui/MoreSettingPopup.java
+++ b/src/com/android/camera/ui/MoreSettingPopup.java
@@ -30,7 +30,7 @@ import android.widget.ListView;
import com.android.camera.ListPreference;
import com.android.camera.PreferenceGroup;
-import com.android.camera2.R;
+import org.codeaurora.snapcam.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 0039aa22c..13ead421e 100644
--- a/src/com/android/camera/ui/PieRenderer.java
+++ b/src/com/android/camera/ui/PieRenderer.java
@@ -38,7 +38,7 @@ import android.view.animation.Transformation;
import com.android.camera.drawable.TextDrawable;
import com.android.camera.ui.ProgressRenderer.VisibilityListener;
-import com.android.camera2.R;
+import org.codeaurora.snapcam.R;
import java.util.ArrayList;
import java.util.List;
diff --git a/src/com/android/camera/ui/ProgressRenderer.java b/src/com/android/camera/ui/ProgressRenderer.java
index 500293133..f7cb386fb 100644
--- a/src/com/android/camera/ui/ProgressRenderer.java
+++ b/src/com/android/camera/ui/ProgressRenderer.java
@@ -22,7 +22,7 @@ import android.graphics.Color;
import android.graphics.Paint;
import android.graphics.RectF;
-import com.android.camera2.R;
+import org.codeaurora.snapcam.R;
/**
* Renders a circular progress bar on the screen.
diff --git a/src/com/android/camera/ui/RotateTextToast.java b/src/com/android/camera/ui/RotateTextToast.java
index ea1268218..10d97bf73 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.CameraUtil;
-import com.android.camera2.R;
+import org.codeaurora.snapcam.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 6c3399775..3e7b9bfb9 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.AccessibilityEvent;
import android.view.accessibility.AccessibilityNodeInfo;
import android.widget.CompoundButton;
-import com.android.camera2.R;
+import org.codeaurora.snapcam.R;
/**
* A Switch is a two-state toggle switch widget that can select between two
diff --git a/src/com/android/camera/ui/TimeIntervalPopup.java b/src/com/android/camera/ui/TimeIntervalPopup.java
index 10e256ad1..95fc18a53 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.camera2.R;
+import org.codeaurora.snapcam.R;
import java.text.NumberFormat;
import java.util.Locale;
diff --git a/src/com/android/camera/ui/ZoomRenderer.java b/src/com/android/camera/ui/ZoomRenderer.java
index e708d3eea..c1f4c6c98 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.camera2.R;
+import org.codeaurora.snapcam.R;
public class ZoomRenderer extends OverlayRenderer
implements ScaleGestureDetector.OnScaleGestureListener {