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

Related to bug #2464545

Change-Id: I08f5cce5b0df623fc62683bd9c9d4a1aa0694240

35 files changed, 46 insertions, 44 deletions

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index bf6f4783..9cdd7794 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,10 +1,10 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-        package="com.google.android.camera"
+        package="com.android.camera"
         android:versionCode="1"
         android:versionName="1"
         >
 
-    <original-package android:name="com.google.android.camera" />
+    <original-package android:name="com.android.camera" />
 
     <uses-permission android:name="android.permission.CAMERA" />
     <uses-feature android:name="android.hardware.camera" />
diff --git a/CleanSpec.mk b/CleanSpec.mk
index b84e1b65..970660c9 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -43,6 +43,8 @@
 #$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/core_intermediates)
 #$(call add-clean-step, find $(OUT_DIR) -type f -name "IGTalkSession*" -print0 | xargs -0 rm -f)
 #$(call add-clean-step, rm -rf $(PRODUCT_OUT)/data/*)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/APPS/Camera*)
+$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/Camera*)
 
 # ************************************************
 # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
diff --git a/res/layout/attach_camera_control.xml b/res/layout/attach_camera_control.xml
index d01b9d31..76537236 100644
--- a/res/layout/attach_camera_control.xml
+++ b/res/layout/attach_camera_control.xml
@@ -15,7 +15,7 @@
 -->
 
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:camera="http://schemas.android.com/apk/res/com.google.android.camera"
+        xmlns:camera="http://schemas.android.com/apk/res/com.android.camera"
         android:id="@+id/control_bar"
         android:layout_height="match_parent"
         android:layout_width="76dp"
diff --git a/res/layout/camera.xml b/res/layout/camera.xml
index 46f916c6..1a451f42 100644
--- a/res/layout/camera.xml
+++ b/res/layout/camera.xml
@@ -15,7 +15,7 @@
 -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:camera="http://schemas.android.com/apk/res/com.google.android.camera"
+        xmlns:camera="http://schemas.android.com/apk/res/com.android.camera"
         android:background="@drawable/camera_background"
         android:id="@+id/camera"
         android:orientation="horizontal"
diff --git a/res/layout/video_camera.xml b/res/layout/video_camera.xml
index 839472a7..780d4f50 100644
--- a/res/layout/video_camera.xml
+++ b/res/layout/video_camera.xml
@@ -15,7 +15,7 @@
 -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:camera="http://schemas.android.com/apk/res/com.google.android.camera"
+        xmlns:camera="http://schemas.android.com/apk/res/com.android.camera"
         android:id="@+id/video_camera"
         android:background="@drawable/camera_background"
         android:orientation="horizontal"
diff --git a/res/xml/camera_preferences.xml b/res/xml/camera_preferences.xml
index 8b5b089b..c70c2539 100644
--- a/res/xml/camera_preferences.xml
+++ b/res/xml/camera_preferences.xml
@@ -15,7 +15,7 @@
 -->
 
 <PreferenceGroup
-        xmlns:camera="http://schemas.android.com/apk/res/com.google.android.camera" >
+        xmlns:camera="http://schemas.android.com/apk/res/com.android.camera" >
     <PreferenceGroup
             camera:title="@string/pref_camera_settings_category">
         <IconListPreference
diff --git a/res/xml/video_preferences.xml b/res/xml/video_preferences.xml
index 6edfbb8e..677a9b94 100644
--- a/res/xml/video_preferences.xml
+++ b/res/xml/video_preferences.xml
@@ -15,7 +15,7 @@
 -->
 
 <PreferenceGroup
-        xmlns:camera="http://schemas.android.com/apk/res/com.google.android.camera" >
+        xmlns:camera="http://schemas.android.com/apk/res/com.android.camera" >
     <PreferenceGroup
         camera:title="@string/pref_camcorder_settings_category">
         <ListPreference
diff --git a/src/com/android/camera/Camera.java b/src/com/android/camera/Camera.java
index a2dce08b..91319931 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 807aa298..607d9c2f 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 7010c9d6..56feb2a5 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 80ef59c9..c0325020 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 89746bf5..d4ffca0f 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 0ed3ce06..1402cd98 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 574003a7..a16bf222 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 d7610f2d..65b82725 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 5a4ec7f6..e4710318 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 c7704f76..54d5d108 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 0020efec..09081bb6 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 54c1e4db..a71ea246 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 fb4f4781..e103d413 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 e6c9ccb2..ed2d06af 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 bc943af6..a11935c3 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 64948836..9d2deeeb 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 f34fcf42..955b3ae7 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 0f77336e..34c8d201 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 64294e27..2833cfe6 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 69861bf3..e49b36a3 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 ab2f2125..b8f03ab2 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;
 
diff --git a/tests/AndroidManifest.xml b/tests/AndroidManifest.xml
index 4096b918..d31bb6a5 100644
--- a/tests/AndroidManifest.xml
+++ b/tests/AndroidManifest.xml
@@ -15,18 +15,18 @@
 -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.google.android.camera.tests">
+    package="com.android.camera.tests">
 
     <application>
         <uses-library android:name="android.test.runner" />
     </application>
 
     <instrumentation android:name="com.android.camera.CameraLaunchPerformance"
-            android:targetPackage="com.google.android.camera"
+            android:targetPackage="com.android.camera"
             android:label="Camera Launch Performance">
     </instrumentation>
 
     <instrumentation android:name="android.test.InstrumentationTestRunner"
-             android:targetPackage="com.google.android.camera"
+             android:targetPackage="com.android.camera"
              android:label="Tests for Camera application."/>
 </manifest>
diff --git a/tests/src/com/android/camera/StressTests.java b/tests/src/com/android/camera/StressTests.java
index 4f4a375c..60120a97 100755
--- a/tests/src/com/android/camera/StressTests.java
+++ b/tests/src/com/android/camera/StressTests.java
@@ -31,7 +31,7 @@ import junit.framework.TestSuite;
  * Running all tests:
  *
  * adb shell am instrument -w \
- *    com.google.android.camera.tests/com.android.camera.CameraStressTestRunner
+ *    com.android.camera.tests/com.android.camera.CameraStressTestRunner
  */
 
 public class StressTests extends TestSuite {
diff --git a/tests/src/com/android/camera/power/ImageAndVideoCapture.java b/tests/src/com/android/camera/power/ImageAndVideoCapture.java
index 9f9a0061..01a6d15a 100755
--- a/tests/src/com/android/camera/power/ImageAndVideoCapture.java
+++ b/tests/src/com/android/camera/power/ImageAndVideoCapture.java
@@ -31,7 +31,7 @@ import android.content.Intent;
  *
  * adb shell am instrument \
  *    -e com.android.camera.power.ImageAndVideoCapture \
- *    -w com.google.android.camera.tests/android.test.InstrumentationTestRunner
+ *    -w com.android.camera.tests/android.test.InstrumentationTestRunner
  *
  */
 
@@ -45,7 +45,7 @@ public class ImageAndVideoCapture extends ActivityInstrumentationTestCase2 <Came
     private static final long WAIT_FOR_STABLE_STATE = 2000; //2 seconds
 
     public ImageAndVideoCapture() {
-        super("com.google.android.camera", Camera.class);
+        super("com.android.camera", Camera.class);
     }
 
     @Override
@@ -97,7 +97,7 @@ public class ImageAndVideoCapture extends ActivityInstrumentationTestCase2 <Came
         try {
             // Switch to the video mode
             Intent intent = new Intent();
-            intent.setClassName("com.google.android.camera",
+            intent.setClassName("com.android.camera",
                     "com.android.camera.VideoCamera");
             getActivity().startActivity(intent);
             for (int i = 0; i < TOTAL_NUMBER_OF_VIDEOCAPTURE; i++) {
diff --git a/tests/src/com/android/camera/stress/CameraLatency.java b/tests/src/com/android/camera/stress/CameraLatency.java
index 550d9381..f7684ed6 100755
--- a/tests/src/com/android/camera/stress/CameraLatency.java
+++ b/tests/src/com/android/camera/stress/CameraLatency.java
@@ -50,7 +50,7 @@ public class CameraLatency extends ActivityInstrumentationTestCase2 <Camera> {
     private long mAvgJpegCallbackToFirstFrameTime;
 
     public CameraLatency() {
-        super("com.google.android.camera", Camera.class);
+        super("com.android.camera", Camera.class);
     }
 
     @Override
diff --git a/tests/src/com/android/camera/stress/CameraStartUp.java b/tests/src/com/android/camera/stress/CameraStartUp.java
index a07b6baf..d8c785f3 100644
--- a/tests/src/com/android/camera/stress/CameraStartUp.java
+++ b/tests/src/com/android/camera/stress/CameraStartUp.java
@@ -19,7 +19,7 @@ public class CameraStartUp extends InstrumentationTestCase {
 
     private String TAG = "CameraStartUp";
     private static final String CAMERA_TEST_OUTPUT_FILE = "/sdcard/mediaStressOut.txt";
-    private static final String CAMERA_PACKAGE_NAME = "com.google.android.camera";
+    private static final String CAMERA_PACKAGE_NAME = "com.android.camera";
     private static final String CAMERA_ACTIVITY_NAME = "com.android.camera.Camera";
     private static final String VIDEORECORDER_ACTIVITY_NAME = "com.android.camera.VideoCamera";
     private static int WAIT_TIME_FOR_PREVIEW = 1500; //1.5 second
diff --git a/tests/src/com/android/camera/stress/ImageCapture.java b/tests/src/com/android/camera/stress/ImageCapture.java
index ad914da2..6978657a 100755
--- a/tests/src/com/android/camera/stress/ImageCapture.java
+++ b/tests/src/com/android/camera/stress/ImageCapture.java
@@ -38,7 +38,7 @@ import android.content.Intent;
  *
  * adb shell am instrument \
  *    -e class com.android.camera.stress.ImageCapture \
- *    -w com.google.android.camera.tests/com.android.camera.CameraStressTestRunner
+ *    -w com.android.camera.tests/com.android.camera.CameraStressTestRunner
  *
  */
 
@@ -66,7 +66,7 @@ public class ImageCapture extends ActivityInstrumentationTestCase2 <Camera> {
     private FileWriter mfstream;
 
     public ImageCapture() {
-        super("com.google.android.camera", Camera.class);
+        super("com.android.camera", Camera.class);
     }
 
     @Override
@@ -250,7 +250,7 @@ public class ImageCapture extends ActivityInstrumentationTestCase2 <Camera> {
             mOut.write("loop: ");
             // Switch to the video mode
             Intent intent = new Intent();
-            intent.setClassName("com.google.android.camera",
+            intent.setClassName("com.android.camera",
                     "com.android.camera.VideoCamera");
             getActivity().startActivity(intent);
             for (int i = 0; i < TOTAL_NUMBER_OF_VIDEOCAPTURE; i++) {
diff --git a/tests/src/com/android/camera/stress/SwitchPreview.java b/tests/src/com/android/camera/stress/SwitchPreview.java
index d269a11e..e03a563f 100755
--- a/tests/src/com/android/camera/stress/SwitchPreview.java
+++ b/tests/src/com/android/camera/stress/SwitchPreview.java
@@ -33,7 +33,7 @@ import android.util.Log;
  *
  * adb shell am instrument \
  *    -e class com.android.camera.stress.SwitchPreview \
- *    -w com.google.android.camera.tests/com.android.camera.CameraStressTestRunner
+ *    -w com.android.camera.tests/com.android.camera.CameraStressTestRunner
  *
  */
 public class SwitchPreview extends ActivityInstrumentationTestCase2 <VideoCamera>{
@@ -46,7 +46,7 @@ public class SwitchPreview extends ActivityInstrumentationTestCase2 <VideoCamera
     private FileWriter mfstream;
 
     public SwitchPreview() {
-        super("com.google.android.camera", VideoCamera.class);
+        super("com.android.camera", VideoCamera.class);
     }
 
     @Override
@@ -93,11 +93,11 @@ public class SwitchPreview extends ActivityInstrumentationTestCase2 <VideoCamera
             for (int i=0; i< TOTAL_NUMBER_OF_SWITCHING; i++) {
                 Thread.sleep(WAIT_FOR_PREVIEW);
                 Intent intent = new Intent();
-                intent.setClassName("com.google.android.camera",
+                intent.setClassName("com.android.camera",
                         "com.android.camera.VideoCamera");
                 getActivity().startActivity(intent);
                 Thread.sleep(WAIT_FOR_PREVIEW);
-                intent.setClassName("com.google.android.camera",
+                intent.setClassName("com.android.camera",
                 "com.android.camera.Camera");
                 getActivity().startActivity(intent);
                 mOut.write(" ," + i);