diff options
33 files changed, 56 insertions, 35 deletions
@@ -6,7 +6,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_PACKAGE_NAME := Camera -LOCAL_CERTIFICATE := media +LOCAL_SDK_VERSION := current LOCAL_PROGUARD_FLAGS := -include $(LOCAL_PATH)/proguard.flags diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 6051c7e..fa99c8b 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,8 +1,7 @@ <manifest xmlns:android="http://schemas.android.com/apk/res/android" - package="com.android.camera" - android:sharedUserId="android.media"> + package="com.google.android.camera"> - <original-package android:name="com.android.camera" /> + <original-package android:name="com.google.android.camera" /> <uses-permission android:name="android.permission.CAMERA" /> <uses-feature android:name="android.hardware.camera" /> @@ -18,12 +17,12 @@ <application android:icon="@drawable/ic_launcher_camera" android:label="@string/camera_label" android:taskAffinity=""> - <receiver android:name="CameraButtonIntentReceiver"> + <receiver android:name="com.android.camera.CameraButtonIntentReceiver"> <intent-filter> <action android:name="android.intent.action.CAMERA_BUTTON"/> </intent-filter> </receiver> - <activity android:name="Camera" + <activity android:name="com.android.camera.Camera" android:configChanges="orientation|keyboardHidden" android:theme="@android:style/Theme.Black.NoTitleBar.Fullscreen" android:screenOrientation="landscape" @@ -43,7 +42,7 @@ <category android:name="android.intent.category.DEFAULT" /> </intent-filter> </activity> - <activity android:name="VideoCamera" + <activity android:name="com.android.camera.VideoCamera" android:label="@string/video_camera_label" android:configChanges="orientation|keyboardHidden" android:icon="@drawable/ic_launcher_video_camera" diff --git a/res/layout/attach_camera_control.xml b/res/layout/attach_camera_control.xml index 7653723..d01b9d3 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.android.camera" + xmlns:camera="http://schemas.android.com/apk/res/com.google.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 1a451f4..46f916c 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.android.camera" + xmlns:camera="http://schemas.android.com/apk/res/com.google.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 780d4f5..839472a 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.android.camera" + xmlns:camera="http://schemas.android.com/apk/res/com.google.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 7bbab46..37fc9ff 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.android.camera" > + xmlns:camera="http://schemas.android.com/apk/res/com.google.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 677a9b9..6edfbb8 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.android.camera" > + xmlns:camera="http://schemas.android.com/apk/res/com.google.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 d3d44c4..93a6853 100644 --- a/src/com/android/camera/Camera.java +++ b/src/com/android/camera/Camera.java @@ -73,6 +73,7 @@ import com.android.camera.gallery.IImage; import com.android.camera.gallery.IImageList; import com.android.camera.ui.GLRootView; import com.android.camera.ui.HeadUpDisplay; +import com.google.android.camera.R; import java.io.File; import java.io.FileNotFoundException; diff --git a/src/com/android/camera/CameraPreference.java b/src/com/android/camera/CameraPreference.java index f71a6bb..807aa29 100644 --- a/src/com/android/camera/CameraPreference.java +++ b/src/com/android/camera/CameraPreference.java @@ -22,6 +22,8 @@ import android.content.res.TypedArray; import android.preference.PreferenceManager; import android.util.AttributeSet; +import com.google.android.camera.R; + /** * The base class of all Preferences used in Camera. The preferences can be * loaded from XML resource by <code>PreferenceInflater</code>. diff --git a/src/com/android/camera/CameraSettings.java b/src/com/android/camera/CameraSettings.java index b370883..2b824a3 100644 --- a/src/com/android/camera/CameraSettings.java +++ b/src/com/android/camera/CameraSettings.java @@ -26,6 +26,8 @@ import android.hardware.Camera.Size; import android.preference.PreferenceManager; import android.util.Log; +import com.google.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 6563513..80ef59c 100644 --- a/src/com/android/camera/IconIndicator.java +++ b/src/com/android/camera/IconIndicator.java @@ -23,6 +23,8 @@ import android.graphics.drawable.Drawable; import android.util.AttributeSet; import android.widget.ImageView; +import com.google.android.camera.R; + /** * This class draws an icon which changes according to the mode. For example, * The flash icon can have on, off, and auto modes. The user can use diff --git a/src/com/android/camera/IconListPreference.java b/src/com/android/camera/IconListPreference.java index 54a101f..89746bf 100644 --- a/src/com/android/camera/IconListPreference.java +++ b/src/com/android/camera/IconListPreference.java @@ -22,6 +22,8 @@ import android.content.res.TypedArray; import android.graphics.drawable.Drawable; import android.util.AttributeSet; +import com.google.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 ce2fb5a..6ae5c59 100644 --- a/src/com/android/camera/ListPreference.java +++ b/src/com/android/camera/ListPreference.java @@ -21,6 +21,8 @@ import android.content.SharedPreferences; import android.content.res.TypedArray; import android.util.AttributeSet; +import com.google.android.camera.R; + /** * A type of <code>CameraPreference</code> whose number of possible values * is limited. diff --git a/src/com/android/camera/Menu3DTest.java b/src/com/android/camera/Menu3DTest.java index c0adc6a..53ebbfe 100644 --- a/src/com/android/camera/Menu3DTest.java +++ b/src/com/android/camera/Menu3DTest.java @@ -7,6 +7,7 @@ import android.widget.FrameLayout; import com.android.camera.ui.GLRootView; import com.android.camera.ui.HeadUpDisplay; +import com.google.android.camera.R; public class Menu3DTest extends Activity { diff --git a/src/com/android/camera/MenuHelper.java b/src/com/android/camera/MenuHelper.java index 8e6fb22..d7610f2 100644 --- a/src/com/android/camera/MenuHelper.java +++ b/src/com/android/camera/MenuHelper.java @@ -30,6 +30,8 @@ import android.provider.MediaStore; import android.provider.MediaStore.Images; import android.util.Log; +import com.google.android.camera.R; + import java.io.Closeable; /** diff --git a/src/com/android/camera/OnScreenHint.java b/src/com/android/camera/OnScreenHint.java index 54a2f64..5a4ec7f 100644 --- a/src/com/android/camera/OnScreenHint.java +++ b/src/com/android/camera/OnScreenHint.java @@ -25,6 +25,8 @@ import android.view.View; import android.view.WindowManager; import android.widget.TextView; +import com.google.android.camera.R; + /** * A on-screen hint is a view containing a little message for the user and will * be shown on the screen continuously. This class helps you create and show diff --git a/src/com/android/camera/OnScreenSettings.java b/src/com/android/camera/OnScreenSettings.java index 6b09bf2..c7704f7 100644 --- a/src/com/android/camera/OnScreenSettings.java +++ b/src/com/android/camera/OnScreenSettings.java @@ -41,6 +41,8 @@ import android.widget.RadioButton; import android.widget.TextView; import android.widget.AdapterView.OnItemClickListener; +import com.google.android.camera.R; + import java.util.ArrayList; import java.util.HashMap; import java.util.regex.Pattern; diff --git a/src/com/android/camera/PreviewFrameLayout.java b/src/com/android/camera/PreviewFrameLayout.java index b153052..0020efe 100644 --- a/src/com/android/camera/PreviewFrameLayout.java +++ b/src/com/android/camera/PreviewFrameLayout.java @@ -25,6 +25,8 @@ import android.view.ViewGroup; import android.widget.ImageView; import android.widget.FrameLayout; +import com.google.android.camera.R; + /** * A layout which handles the preview aspect ratio and the position of * the gripper. diff --git a/src/com/android/camera/Util.java b/src/com/android/camera/Util.java index 2d28007..d2914f3 100644 --- a/src/com/android/camera/Util.java +++ b/src/com/android/camera/Util.java @@ -28,6 +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 java.io.Closeable; diff --git a/src/com/android/camera/VideoCamera.java b/src/com/android/camera/VideoCamera.java index 0ffe58c..fc8164e 100644 --- a/src/com/android/camera/VideoCamera.java +++ b/src/com/android/camera/VideoCamera.java @@ -66,6 +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 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 3a5b330..d507617 100644 --- a/src/com/android/camera/ui/BasicIndicator.java +++ b/src/com/android/camera/ui/BasicIndicator.java @@ -3,7 +3,7 @@ package com.android.camera.ui; import android.content.Context; import com.android.camera.IconListPreference; -import com.android.camera.R; +import com.google.android.camera.R; import com.android.camera.Util; import com.android.camera.ui.GLListView.OnItemSelectedListener; diff --git a/src/com/android/camera/ui/GLOptionItem.java b/src/com/android/camera/ui/GLOptionItem.java index 07794a4..57c99e2 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.android.camera.R; +import com.google.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 955b3ae..f34fcf4 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.android.camera.R; +import com.google.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 585884a..8e71178 100644 --- a/src/com/android/camera/ui/HeadUpDisplay.java +++ b/src/com/android/camera/ui/HeadUpDisplay.java @@ -17,7 +17,7 @@ import com.android.camera.CameraSettings; import com.android.camera.IconListPreference; import com.android.camera.ListPreference; import com.android.camera.PreferenceGroup; -import com.android.camera.R; +import com.google.android.camera.R; import java.util.ArrayList; import java.util.concurrent.Callable; diff --git a/src/com/android/camera/ui/OtherSettingsIndicator.java b/src/com/android/camera/ui/OtherSettingsIndicator.java index 2833cfe..64294e2 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.android.camera.R; +import com.google.android.camera.R; import java.util.HashMap; diff --git a/src/com/android/camera/ui/PreferenceAdapter.java b/src/com/android/camera/ui/PreferenceAdapter.java index de3cda9..d4f135d 100644 --- a/src/com/android/camera/ui/PreferenceAdapter.java +++ b/src/com/android/camera/ui/PreferenceAdapter.java @@ -5,7 +5,7 @@ import android.content.Context; import com.android.camera.IconListPreference; import com.android.camera.ListPreference; -import com.android.camera.R; +import com.google.android.camera.R; import com.android.camera.Util; import java.util.ArrayList; diff --git a/tests/AndroidManifest.xml b/tests/AndroidManifest.xml index dfe7c38..4096b91 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.android.camera.tests"> + package="com.google.android.camera.tests"> <application> <uses-library android:name="android.test.runner" /> </application> - <instrumentation android:name="CameraLaunchPerformance" - android:targetPackage="com.android.camera" + <instrumentation android:name="com.android.camera.CameraLaunchPerformance" + android:targetPackage="com.google.android.camera" android:label="Camera Launch Performance"> </instrumentation> <instrumentation android:name="android.test.InstrumentationTestRunner" - android:targetPackage="com.android.camera" + android:targetPackage="com.google.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 60120a9..4f4a375 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.android.camera.tests/com.android.camera.CameraStressTestRunner + * com.google.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 01a6d15..9f9a006 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.android.camera.tests/android.test.InstrumentationTestRunner + * -w com.google.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.android.camera", Camera.class); + super("com.google.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.android.camera", + intent.setClassName("com.google.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 f7684ed..550d938 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.android.camera", Camera.class); + super("com.google.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 d8c785f..a07b6ba 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.android.camera"; + private static final String CAMERA_PACKAGE_NAME = "com.google.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 6978657..ad914da 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.android.camera.tests/com.android.camera.CameraStressTestRunner + * -w com.google.android.camera.tests/com.android.camera.CameraStressTestRunner * */ @@ -66,7 +66,7 @@ public class ImageCapture extends ActivityInstrumentationTestCase2 <Camera> { private FileWriter mfstream; public ImageCapture() { - super("com.android.camera", Camera.class); + super("com.google.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.android.camera", + intent.setClassName("com.google.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 e03a563..d269a11 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.android.camera.tests/com.android.camera.CameraStressTestRunner + * -w com.google.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.android.camera", VideoCamera.class); + super("com.google.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.android.camera", + intent.setClassName("com.google.android.camera", "com.android.camera.VideoCamera"); getActivity().startActivity(intent); Thread.sleep(WAIT_FOR_PREVIEW); - intent.setClassName("com.android.camera", + intent.setClassName("com.google.android.camera", "com.android.camera.Camera"); getActivity().startActivity(intent); mOut.write(" ," + i); |