Camera should have the com.android.camera package name.

Related to bug #2464545

Change-Id: I08f5cce5b0df623fc62683bd9c9d4a1aa0694240

21 files changed, 21 insertions, 21 deletions

diff --git a/src/com/android/camera/Camera.java b/src/com/android/camera/Camera.java
index a2dce08..9131993 100644
--- a/src/com/android/camera/Camera.java
+++ b/src/com/android/camera/Camera.java
@@ -68,7 +68,7 @@ import android.view.WindowManager;
 import android.view.MenuItem.OnMenuItemClickListener;
 import android.widget.ImageView;
 
-import com.google.android.camera.R;
+import com.android.camera.R;
 
 import com.android.camera.gallery.IImage;
 import com.android.camera.gallery.IImageList;
diff --git a/src/com/android/camera/CameraPreference.java b/src/com/android/camera/CameraPreference.java
index 807aa29..607d9c2 100644
--- a/src/com/android/camera/CameraPreference.java
+++ b/src/com/android/camera/CameraPreference.java
@@ -22,7 +22,7 @@ import android.content.res.TypedArray;
 import android.preference.PreferenceManager;
 import android.util.AttributeSet;
 
-import com.google.android.camera.R;
+import com.android.camera.R;
 
 /**
  * The base class of all Preferences used in Camera. The preferences can be
diff --git a/src/com/android/camera/CameraSettings.java b/src/com/android/camera/CameraSettings.java
index 7010c9d..56feb2a 100644
--- a/src/com/android/camera/CameraSettings.java
+++ b/src/com/android/camera/CameraSettings.java
@@ -26,7 +26,7 @@ import android.media.CamcorderProfile;
 import android.preference.PreferenceManager;
 import android.util.Log;
 
-import com.google.android.camera.R;
+import com.android.camera.R;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/com/android/camera/IconIndicator.java b/src/com/android/camera/IconIndicator.java
index 80ef59c..c032502 100644
--- a/src/com/android/camera/IconIndicator.java
+++ b/src/com/android/camera/IconIndicator.java
@@ -23,7 +23,7 @@ import android.graphics.drawable.Drawable;
 import android.util.AttributeSet;
 import android.widget.ImageView;
 
-import com.google.android.camera.R;
+import com.android.camera.R;
 
 /**
  * This class draws an icon which changes according to the mode. For example,
diff --git a/src/com/android/camera/IconListPreference.java b/src/com/android/camera/IconListPreference.java
index 89746bf..d4ffca0 100644
--- a/src/com/android/camera/IconListPreference.java
+++ b/src/com/android/camera/IconListPreference.java
@@ -22,7 +22,7 @@ import android.content.res.TypedArray;
 import android.graphics.drawable.Drawable;
 import android.util.AttributeSet;
 
-import com.google.android.camera.R;
+import com.android.camera.R;
 
 /** A {@code ListPreference} where each entry has a corresponding icon. */
 public class IconListPreference extends ListPreference {
diff --git a/src/com/android/camera/ListPreference.java b/src/com/android/camera/ListPreference.java
index 0ed3ce0..1402cd9 100644
--- a/src/com/android/camera/ListPreference.java
+++ b/src/com/android/camera/ListPreference.java
@@ -21,7 +21,7 @@ import android.content.SharedPreferences;
 import android.content.res.TypedArray;
 import android.util.AttributeSet;
 
-import com.google.android.camera.R;
+import com.android.camera.R;
 
 /**
  * A type of <code>CameraPreference</code> whose number of possible values
diff --git a/src/com/android/camera/Menu3DTest.java b/src/com/android/camera/Menu3DTest.java
index 574003a..a16bf22 100644
--- a/src/com/android/camera/Menu3DTest.java
+++ b/src/com/android/camera/Menu3DTest.java
@@ -5,7 +5,7 @@ import android.os.Bundle;
 import android.view.OrientationEventListener;
 import android.widget.FrameLayout;
 
-import com.google.android.camera.R;
+import com.android.camera.R;
 
 import com.android.camera.ui.GLRootView;
 import com.android.camera.ui.HeadUpDisplay;
diff --git a/src/com/android/camera/MenuHelper.java b/src/com/android/camera/MenuHelper.java
index d7610f2..65b8272 100644
--- a/src/com/android/camera/MenuHelper.java
+++ b/src/com/android/camera/MenuHelper.java
@@ -30,7 +30,7 @@ import android.provider.MediaStore;
 import android.provider.MediaStore.Images;
 import android.util.Log;
 
-import com.google.android.camera.R;
+import com.android.camera.R;
 
 import java.io.Closeable;
 
diff --git a/src/com/android/camera/OnScreenHint.java b/src/com/android/camera/OnScreenHint.java
index 5a4ec7f..e471031 100644
--- a/src/com/android/camera/OnScreenHint.java
+++ b/src/com/android/camera/OnScreenHint.java
@@ -25,7 +25,7 @@ import android.view.View;
 import android.view.WindowManager;
 import android.widget.TextView;
 
-import com.google.android.camera.R;
+import com.android.camera.R;
 
 /**
  * A on-screen hint is a view containing a little message for the user and will
diff --git a/src/com/android/camera/OnScreenSettings.java b/src/com/android/camera/OnScreenSettings.java
index c7704f7..54d5d10 100644
--- a/src/com/android/camera/OnScreenSettings.java
+++ b/src/com/android/camera/OnScreenSettings.java
@@ -41,7 +41,7 @@ import android.widget.RadioButton;
 import android.widget.TextView;
 import android.widget.AdapterView.OnItemClickListener;
 
-import com.google.android.camera.R;
+import com.android.camera.R;
 
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/src/com/android/camera/PreviewFrameLayout.java b/src/com/android/camera/PreviewFrameLayout.java
index 0020efe..09081bb 100644
--- a/src/com/android/camera/PreviewFrameLayout.java
+++ b/src/com/android/camera/PreviewFrameLayout.java
@@ -25,7 +25,7 @@ import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.FrameLayout;
 
-import com.google.android.camera.R;
+import com.android.camera.R;
 
 /**
  * A layout which handles the preview aspect ratio and the position of
diff --git a/src/com/android/camera/Util.java b/src/com/android/camera/Util.java
index 54c1e4d..a71ea24 100644
--- a/src/com/android/camera/Util.java
+++ b/src/com/android/camera/Util.java
@@ -28,7 +28,7 @@ import android.view.animation.Animation;
 import android.view.animation.TranslateAnimation;
 
 import com.android.camera.gallery.IImage;
-import com.google.android.camera.R;
+import com.android.camera.R;
 
 import java.io.Closeable;
 
diff --git a/src/com/android/camera/VideoCamera.java b/src/com/android/camera/VideoCamera.java
index fb4f478..e103d41 100644
--- a/src/com/android/camera/VideoCamera.java
+++ b/src/com/android/camera/VideoCamera.java
@@ -66,7 +66,7 @@ import android.widget.Toast;
 
 import com.android.camera.gallery.IImage;
 import com.android.camera.gallery.IImageList;
-import com.google.android.camera.R;
+import com.android.camera.R;
 
 import java.io.File;
 import java.io.FileDescriptor;
diff --git a/src/com/android/camera/ui/BasicIndicator.java b/src/com/android/camera/ui/BasicIndicator.java
index e6c9ccb..ed2d06a 100644
--- a/src/com/android/camera/ui/BasicIndicator.java
+++ b/src/com/android/camera/ui/BasicIndicator.java
@@ -2,7 +2,7 @@ package com.android.camera.ui;
 
 import android.content.Context;
 
-import com.google.android.camera.R;
+import com.android.camera.R;
 
 import com.android.camera.IconListPreference;
 import com.android.camera.Util;
diff --git a/src/com/android/camera/ui/GLOptionHeader.java b/src/com/android/camera/ui/GLOptionHeader.java
index bc943af..a11935c 100644
--- a/src/com/android/camera/ui/GLOptionHeader.java
+++ b/src/com/android/camera/ui/GLOptionHeader.java
@@ -4,7 +4,7 @@ import static com.android.camera.ui.GLRootView.dpToPixel;
 import android.content.Context;
 import android.graphics.Rect;
 
-import com.google.android.camera.R;
+import com.android.camera.R;
 
 import javax.microedition.khronos.opengles.GL11;
 
diff --git a/src/com/android/camera/ui/GLOptionItem.java b/src/com/android/camera/ui/GLOptionItem.java
index 6494883..9d2deee 100644
--- a/src/com/android/camera/ui/GLOptionItem.java
+++ b/src/com/android/camera/ui/GLOptionItem.java
@@ -6,7 +6,7 @@ import android.graphics.Color;
 import android.graphics.Rect;
 import android.view.animation.Transformation;
 
-import com.google.android.camera.R;
+import com.android.camera.R;
 
 import javax.microedition.khronos.opengles.GL11;
 
diff --git a/src/com/android/camera/ui/GpsIndicator.java b/src/com/android/camera/ui/GpsIndicator.java
index f34fcf4..955b3ae 100644
--- a/src/com/android/camera/ui/GpsIndicator.java
+++ b/src/com/android/camera/ui/GpsIndicator.java
@@ -3,7 +3,7 @@ package com.android.camera.ui;
 import android.content.Context;
 
 import com.android.camera.IconListPreference;
-import com.google.android.camera.R;
+import com.android.camera.R;
 
 public class GpsIndicator extends BasicIndicator {
 
diff --git a/src/com/android/camera/ui/HeadUpDisplay.java b/src/com/android/camera/ui/HeadUpDisplay.java
index 0f77336..34c8d20 100644
--- a/src/com/android/camera/ui/HeadUpDisplay.java
+++ b/src/com/android/camera/ui/HeadUpDisplay.java
@@ -13,7 +13,7 @@ import android.view.View.MeasureSpec;
 import android.view.animation.AlphaAnimation;
 import android.view.animation.Animation;
 
-import com.google.android.camera.R;
+import com.android.camera.R;
 
 import com.android.camera.CameraSettings;
 import com.android.camera.IconListPreference;
diff --git a/src/com/android/camera/ui/OtherSettingsIndicator.java b/src/com/android/camera/ui/OtherSettingsIndicator.java
index 64294e2..2833cfe 100644
--- a/src/com/android/camera/ui/OtherSettingsIndicator.java
+++ b/src/com/android/camera/ui/OtherSettingsIndicator.java
@@ -3,7 +3,7 @@ package com.android.camera.ui;
 import android.content.Context;
 
 import com.android.camera.ListPreference;
-import com.google.android.camera.R;
+import com.android.camera.R;
 
 import java.util.HashMap;
 
diff --git a/src/com/android/camera/ui/ZoomController.java b/src/com/android/camera/ui/ZoomController.java
index 69861bf..e49b36a 100644
--- a/src/com/android/camera/ui/ZoomController.java
+++ b/src/com/android/camera/ui/ZoomController.java
@@ -6,7 +6,7 @@ import android.graphics.Color;
 import android.graphics.Rect;
 import android.view.MotionEvent;
 
-import com.google.android.camera.R;
+import com.android.camera.R;
 
 import com.android.camera.Util;
 
diff --git a/src/com/android/camera/ui/ZoomIndicator.java b/src/com/android/camera/ui/ZoomIndicator.java
index ab2f212..b8f03ab 100644
--- a/src/com/android/camera/ui/ZoomIndicator.java
+++ b/src/com/android/camera/ui/ZoomIndicator.java
@@ -3,7 +3,7 @@ package com.android.camera.ui;
 import android.content.Context;
 import android.graphics.Color;
 
-import com.google.android.camera.R;
+import com.android.camera.R;
 
 import com.android.camera.ui.ZoomController.ZoomListener;