Remove com.android.camera.R

Change-Id: I0bb03da1423401f872c3bf13caffb9c87d850449

diff --git a/Android.mk b/Android.mk
index 7789619..4388666 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -19,8 +19,7 @@ LOCAL_SRC_FILES += $(call all-java-files-under, src_pd)
 
 LOCAL_RESOURCE_DIR += $(LOCAL_PATH)/res
 
-LOCAL_AAPT_FLAGS := --auto-add-overlay \
-    --extra-packages com.android.camera
+LOCAL_AAPT_FLAGS := --auto-add-overlay
 
 LOCAL_PACKAGE_NAME := Gallery2
 

diff --git a/src/com/android/camera/ActivityBase.java b/src/com/android/camera/ActivityBase.java
index 4e4143e..dc866f0 100644 (file)
--- a/src/com/android/camera/ActivityBase.java
+++ b/src/com/android/camera/ActivityBase.java
@@ -38,6 +38,7 @@ import android.view.animation.DecelerateInterpolator;
 
 import com.android.camera.ui.LayoutChangeNotifier;
 import com.android.camera.ui.PopupManager;
+import com.android.gallery3d.R;
 import com.android.gallery3d.app.AbstractGalleryActivity;
 import com.android.gallery3d.app.AppBridge;
 import com.android.gallery3d.app.FilmstripPage;

diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java
index bf1ec24..e0a2a27 100644 (file)
--- a/src/com/android/camera/CameraActivity.java
+++ b/src/com/android/camera/CameraActivity.java
@@ -37,6 +37,7 @@ import android.view.ViewGroup;
 import android.widget.FrameLayout;
 
 import com.android.camera.ui.CameraSwitcher;
+import com.android.gallery3d.R;
 import com.android.gallery3d.app.PhotoPage;
 import com.android.gallery3d.common.ApiHelper;
 import com.android.gallery3d.util.LightCycleHelper;

diff --git a/src/com/android/camera/CameraPreference.java b/src/com/android/camera/CameraPreference.java
index 0a4e9b3..5ddd86d 100644 (file)
--- a/src/com/android/camera/CameraPreference.java
+++ b/src/com/android/camera/CameraPreference.java
@@ -21,6 +21,8 @@ import android.content.SharedPreferences;
 import android.content.res.TypedArray;
 import android.util.AttributeSet;
 
+import com.android.gallery3d.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 3bc58a0..31d31e1 100644 (file)
--- a/src/com/android/camera/CameraSettings.java
+++ b/src/com/android/camera/CameraSettings.java
@@ -30,6 +30,7 @@ import android.media.CamcorderProfile;
 import android.util.FloatMath;
 import android.util.Log;
 
+import com.android.gallery3d.R;
 import com.android.gallery3d.common.ApiHelper;
 
 import java.util.ArrayList;

diff --git a/src/com/android/camera/CountDownTimerPreference.java b/src/com/android/camera/CountDownTimerPreference.java
index 6c0f673..0bbf6bc 100644 (file)
--- a/src/com/android/camera/CountDownTimerPreference.java
+++ b/src/com/android/camera/CountDownTimerPreference.java
@@ -19,6 +19,8 @@ package com.android.camera;
 import android.content.Context;
 import android.util.AttributeSet;
 
+import com.android.gallery3d.R;
+
 import java.util.List;
 
 /* CountDownTimerPreference generates entries (i.e. what users see in the UI),

diff --git a/src/com/android/camera/EffectsRecorder.java b/src/com/android/camera/EffectsRecorder.java
index 4601ab9..2db44c7 100644 (file)
--- a/src/com/android/camera/EffectsRecorder.java
+++ b/src/com/android/camera/EffectsRecorder.java
@@ -26,6 +26,7 @@ import android.os.Handler;
 import android.os.Looper;
 import android.util.Log;
 
+import com.android.gallery3d.R;
 import com.android.gallery3d.common.ApiHelper;
 
 import java.io.FileDescriptor;

diff --git a/src/com/android/camera/IconListPreference.java b/src/com/android/camera/IconListPreference.java
index 6bcd59d..e5f75d3 100644 (file)
--- a/src/com/android/camera/IconListPreference.java
+++ b/src/com/android/camera/IconListPreference.java
@@ -21,6 +21,8 @@ import android.content.res.Resources;
 import android.content.res.TypedArray;
 import android.util.AttributeSet;
 
+import com.android.gallery3d.R;
+
 import java.util.List;
 
 /** A {@code ListPreference} where each entry has a corresponding icon. */

diff --git a/src/com/android/camera/ListPreference.java b/src/com/android/camera/ListPreference.java
index 17266ea..a29b197 100644 (file)
--- a/src/com/android/camera/ListPreference.java
+++ b/src/com/android/camera/ListPreference.java
@@ -23,6 +23,8 @@ import android.util.AttributeSet;
 import android.util.Log;
 import android.util.TypedValue;
 
+import com.android.gallery3d.R;
+
 import java.util.ArrayList;
 import java.util.List;
 

diff --git a/src/com/android/camera/OnScreenHint.java b/src/com/android/camera/OnScreenHint.java
index 80063e4..4d7fa70 100644 (file)
--- 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.android.gallery3d.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/PanoramaModule.java b/src/com/android/camera/PanoramaModule.java
index 6302158..4edc686 100644 (file)
--- a/src/com/android/camera/PanoramaModule.java
+++ b/src/com/android/camera/PanoramaModule.java
@@ -58,6 +58,7 @@ import com.android.camera.ui.LayoutChangeNotifier;
 import com.android.camera.ui.LayoutNotifyView;
 import com.android.camera.ui.PopupManager;
 import com.android.camera.ui.Rotatable;
+import com.android.gallery3d.R;
 import com.android.gallery3d.common.ApiHelper;
 import com.android.gallery3d.exif.ExifData;
 import com.android.gallery3d.exif.ExifInvalidFormatException;

diff --git a/src/com/android/camera/PhotoController.java b/src/com/android/camera/PhotoController.java
index ad8659e..c2501c7 100644 (file)
--- a/src/com/android/camera/PhotoController.java
+++ b/src/com/android/camera/PhotoController.java
@@ -27,6 +27,7 @@ import com.android.camera.ui.PieItem;
 import com.android.camera.ui.PieItem.OnClickListener;
 import com.android.camera.ui.PieRenderer;
 import com.android.camera.ui.TimerSettingPopup;
+import com.android.gallery3d.R;
 
 public class PhotoController extends PieController
         implements MoreSettingPopup.Listener,

diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java
index ec6dcab..aa77833 100644 (file)
--- a/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java
@@ -72,6 +72,7 @@ import com.android.camera.ui.Rotatable;
 import com.android.camera.ui.RotateTextToast;
 import com.android.camera.ui.TwoStateImageView;
 import com.android.camera.ui.ZoomRenderer;
+import com.android.gallery3d.R;
 import com.android.gallery3d.common.ApiHelper;
 import com.android.gallery3d.filtershow.CropExtras;
 import com.android.gallery3d.filtershow.FilterShowActivity;

diff --git a/src/com/android/camera/PreviewFrameLayout.java b/src/com/android/camera/PreviewFrameLayout.java
index 451a35a..87e3c8d 100644 (file)
--- a/src/com/android/camera/PreviewFrameLayout.java
+++ b/src/com/android/camera/PreviewFrameLayout.java
@@ -25,6 +25,7 @@ import android.widget.RelativeLayout;
 
 import com.android.camera.ui.LayoutChangeHelper;
 import com.android.camera.ui.LayoutChangeNotifier;
+import com.android.gallery3d.R;
 import com.android.gallery3d.common.ApiHelper;
 
 /**

diff --git a/src/com/android/camera/PreviewGestures.java b/src/com/android/camera/PreviewGestures.java
index 2dccc3e..cb7ca09 100644 (file)
--- a/src/com/android/camera/PreviewGestures.java
+++ b/src/com/android/camera/PreviewGestures.java
@@ -27,6 +27,7 @@ import android.view.ViewConfiguration;
 import com.android.camera.ui.PieRenderer;
 import com.android.camera.ui.RenderOverlay;
 import com.android.camera.ui.ZoomRenderer;
+import com.android.gallery3d.R;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/src/com/android/camera/RotateDialogController.java b/src/com/android/camera/RotateDialogController.java
index 700d354..5d5e5e7 100644 (file)
--- a/src/com/android/camera/RotateDialogController.java
+++ b/src/com/android/camera/RotateDialogController.java
@@ -28,6 +28,7 @@ import android.widget.TextView;
 
 import com.android.camera.ui.Rotatable;
 import com.android.camera.ui.RotateLayout;
+import com.android.gallery3d.R;
 
 public class RotateDialogController implements Rotatable {
 

diff --git a/src/com/android/camera/SoundClips.java b/src/com/android/camera/SoundClips.java
index b5e7831..6388fec 100644 (file)
--- a/src/com/android/camera/SoundClips.java
+++ b/src/com/android/camera/SoundClips.java
@@ -23,6 +23,7 @@ import android.media.MediaActionSound;
 import android.media.SoundPool;
 import android.util.Log;
 
+import com.android.gallery3d.R;
 import com.android.gallery3d.common.ApiHelper;
 
 /*

diff --git a/src/com/android/camera/Util.java b/src/com/android/camera/Util.java
index 2953d6a..ed42de8 100644 (file)
--- a/src/com/android/camera/Util.java
+++ b/src/com/android/camera/Util.java
@@ -52,6 +52,7 @@ import android.view.WindowManager;
 import android.view.animation.AlphaAnimation;
 import android.view.animation.Animation;
 
+import com.android.gallery3d.R;
 import com.android.gallery3d.common.ApiHelper;
 
 import java.io.Closeable;

diff --git a/src/com/android/camera/VideoController.java b/src/com/android/camera/VideoController.java
index d84c1ad..3a22077 100644 (file)
--- a/src/com/android/camera/VideoController.java
+++ b/src/com/android/camera/VideoController.java
@@ -26,6 +26,7 @@ import com.android.camera.ui.PieItem;
 import com.android.camera.ui.PieItem.OnClickListener;
 import com.android.camera.ui.PieRenderer;
 import com.android.camera.ui.TimeIntervalPopup;
+import com.android.gallery3d.R;
 
 public class VideoController extends PieController
         implements MoreSettingPopup.Listener,

diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java
index 8d84e00..c136358 100644 (file)
--- a/src/com/android/camera/VideoModule.java
+++ b/src/com/android/camera/VideoModule.java
@@ -75,6 +75,7 @@ import com.android.camera.ui.RotateLayout;
 import com.android.camera.ui.RotateTextToast;
 import com.android.camera.ui.TwoStateImageView;
 import com.android.camera.ui.ZoomRenderer;
+import com.android.gallery3d.R;
 import com.android.gallery3d.common.ApiHelper;
 import com.android.gallery3d.util.AccessibilityUtils;
 

diff --git a/src/com/android/camera/ui/AbstractSettingPopup.java b/src/com/android/camera/ui/AbstractSettingPopup.java
index 49df77b..783b6c7 100644 (file)
--- 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.camera.R;
+import com.android.gallery3d.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/CameraSwitcher.java b/src/com/android/camera/ui/CameraSwitcher.java
index 7b9fb64..8d2cd71 100644 (file)
--- a/src/com/android/camera/ui/CameraSwitcher.java
+++ b/src/com/android/camera/ui/CameraSwitcher.java
@@ -32,7 +32,7 @@ import android.view.View.OnTouchListener;
 import android.view.ViewGroup;
 import android.widget.LinearLayout;
 
-import com.android.camera.R;
+import com.android.gallery3d.R;
 import com.android.gallery3d.common.ApiHelper;
 
 public class CameraSwitcher extends RotateImageView

diff --git a/src/com/android/camera/ui/CountDownView.java b/src/com/android/camera/ui/CountDownView.java
index ade25c3..907d335 100644 (file)
--- 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.camera.R;
+import com.android.gallery3d.R;
 
 public class CountDownView extends FrameLayout {
 

diff --git a/src/com/android/camera/ui/EffectSettingPopup.java b/src/com/android/camera/ui/EffectSettingPopup.java
index 628d815..568781a 100644 (file)
--- a/src/com/android/camera/ui/EffectSettingPopup.java
+++ b/src/com/android/camera/ui/EffectSettingPopup.java
@@ -26,8 +26,8 @@ import android.widget.GridView;
 import android.widget.SimpleAdapter;
 
 import com.android.camera.IconListPreference;
-import com.android.camera.R;
 
+import com.android.gallery3d.R;
 import com.android.gallery3d.common.ApiHelper;
 
 import java.util.ArrayList;

diff --git a/src/com/android/camera/ui/FaceView.java b/src/com/android/camera/ui/FaceView.java
index 9e6f982..099f3bf 100644 (file)
--- a/src/com/android/camera/ui/FaceView.java
+++ b/src/com/android/camera/ui/FaceView.java
@@ -33,8 +33,8 @@ import android.view.View;
 
 import com.android.camera.CameraActivity;
 import com.android.camera.CameraScreenNail;
-import com.android.camera.R;
 import com.android.camera.Util;
+import com.android.gallery3d.R;
 import com.android.gallery3d.common.ApiHelper;
 
 @TargetApi(ApiHelper.VERSION_CODES.ICE_CREAM_SANDWICH)

diff --git a/src/com/android/camera/ui/InLineSettingCheckBox.java b/src/com/android/camera/ui/InLineSettingCheckBox.java
index 5d9cc38..c1aa5a9 100644 (file)
--- a/src/com/android/camera/ui/InLineSettingCheckBox.java
+++ b/src/com/android/camera/ui/InLineSettingCheckBox.java
@@ -25,7 +25,7 @@ import android.widget.CompoundButton.OnCheckedChangeListener;
 
 
 import com.android.camera.ListPreference;
-import com.android.camera.R;
+import com.android.gallery3d.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 4f88f27..839a77f 100644 (file)
--- 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.camera.R;
+import com.android.gallery3d.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 2fe8934..8e45c3e 100644 (file)
--- 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.camera.R;
+import com.android.gallery3d.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 c0411c9..cfef73f 100644 (file)
--- a/src/com/android/camera/ui/ListPrefSettingPopup.java
+++ b/src/com/android/camera/ui/ListPrefSettingPopup.java
@@ -27,7 +27,7 @@ import android.widget.SimpleAdapter;
 
 import com.android.camera.IconListPreference;
 import com.android.camera.ListPreference;
-import com.android.camera.R;
+import com.android.gallery3d.R;
 
 import java.util.ArrayList;
 import java.util.HashMap;

diff --git a/src/com/android/camera/ui/MoreSettingPopup.java b/src/com/android/camera/ui/MoreSettingPopup.java
index ab1baba..5900058 100644 (file)
--- a/src/com/android/camera/ui/MoreSettingPopup.java
+++ b/src/com/android/camera/ui/MoreSettingPopup.java
@@ -28,7 +28,7 @@ import android.widget.ListView;
 
 import com.android.camera.ListPreference;
 import com.android.camera.PreferenceGroup;
-import com.android.camera.R;
+import com.android.gallery3d.R;
 
 import java.util.ArrayList;
 

diff --git a/src/com/android/camera/ui/PieRenderer.java b/src/com/android/camera/ui/PieRenderer.java
index b592508..8afd481 100644 (file)
--- a/src/com/android/camera/ui/PieRenderer.java
+++ b/src/com/android/camera/ui/PieRenderer.java
@@ -36,7 +36,7 @@ import android.view.animation.Animation.AnimationListener;
 import android.view.animation.LinearInterpolator;
 import android.view.animation.Transformation;
 
-import com.android.camera.R;
+import com.android.gallery3d.R;
 import com.android.gallery3d.common.ApiHelper;
 
 import java.util.ArrayList;

diff --git a/src/com/android/camera/ui/RotateTextToast.java b/src/com/android/camera/ui/RotateTextToast.java
index f73c033..c78a258 100644 (file)
--- a/src/com/android/camera/ui/RotateTextToast.java
+++ b/src/com/android/camera/ui/RotateTextToast.java
@@ -23,8 +23,8 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
 
-import com.android.camera.R;
 import com.android.camera.Util;
+import com.android.gallery3d.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 5b1ab4c..ac21758 100644 (file)
--- a/src/com/android/camera/ui/Switch.java
+++ b/src/com/android/camera/ui/Switch.java
@@ -42,7 +42,7 @@ import android.view.accessibility.AccessibilityEvent;
 import android.view.accessibility.AccessibilityNodeInfo;
 import android.widget.CompoundButton;
 
-import com.android.camera.R;
+import com.android.gallery3d.R;
 import com.android.gallery3d.common.ApiHelper;
 
 import java.util.Arrays;

diff --git a/src/com/android/camera/ui/TimeIntervalPopup.java b/src/com/android/camera/ui/TimeIntervalPopup.java
index b79663b..18ad9f5 100644 (file)
--- 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.camera.R;
+import com.android.gallery3d.R;
 
 /**
  * This is a popup window that allows users to turn on/off time lapse feature,

diff --git a/src/com/android/camera/ui/TimerSettingPopup.java b/src/com/android/camera/ui/TimerSettingPopup.java
index 06d7e4e..983c7f2 100644 (file)
--- a/src/com/android/camera/ui/TimerSettingPopup.java
+++ b/src/com/android/camera/ui/TimerSettingPopup.java
@@ -30,7 +30,7 @@ import android.widget.Switch;
 import android.widget.TextView;
 
 import com.android.camera.ListPreference;
-import com.android.camera.R;
+import com.android.gallery3d.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 10c5e80..86b82b4 100644 (file)
--- 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.camera.R;
+import com.android.gallery3d.R;
 
 public class ZoomRenderer extends OverlayRenderer
         implements ScaleGestureDetector.OnScaleGestureListener {