From 89d153ba5666f76bb603198fe175fa92aa75431f Mon Sep 17 00:00:00 2001 From: Sachin Shah Date: Fri, 15 Aug 2014 18:36:44 -0700 Subject: 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 --- src/com/android/camera/CameraActivity.java | 2 +- src/com/android/camera/CameraPreference.java | 2 +- src/com/android/camera/CameraSettings.java | 2 +- src/com/android/camera/CountDownTimerPreference.java | 2 +- src/com/android/camera/IconListPreference.java | 2 +- src/com/android/camera/ListPreference.java | 2 +- src/com/android/camera/OnScreenHint.java | 2 +- src/com/android/camera/OnScreenIndicators.java | 2 +- src/com/android/camera/PhotoMenu.java | 2 +- src/com/android/camera/PhotoModule.java | 2 +- src/com/android/camera/PhotoUI.java | 2 +- src/com/android/camera/PieController.java | 2 +- src/com/android/camera/SoundClips.java | 2 +- src/com/android/camera/VideoMenu.java | 2 +- src/com/android/camera/VideoModule.java | 2 +- src/com/android/camera/VideoUI.java | 2 +- src/com/android/camera/WideAnglePanoramaModule.java | 2 +- src/com/android/camera/WideAnglePanoramaUI.java | 2 +- src/com/android/camera/crop/CropActivity.java | 2 +- src/com/android/camera/crop/CropView.java | 2 +- src/com/android/camera/data/InProgressDataWrapper.java | 2 +- src/com/android/camera/data/LocalMediaData.java | 2 +- src/com/android/camera/data/MediaDetails.java | 2 +- src/com/android/camera/data/RotationTask.java | 2 +- src/com/android/camera/tinyplanet/TinyPlanetFragment.java | 2 +- src/com/android/camera/ui/AbstractSettingPopup.java | 2 +- src/com/android/camera/ui/CameraControls.java | 2 +- src/com/android/camera/ui/CountDownView.java | 2 +- src/com/android/camera/ui/CountdownTimerPopup.java | 2 +- src/com/android/camera/ui/DetailsDialog.java | 2 +- src/com/android/camera/ui/FaceView.java | 2 +- src/com/android/camera/ui/FilmStripView.java | 2 +- src/com/android/camera/ui/FilmstripBottomControls.java | 2 +- src/com/android/camera/ui/InLineSettingCheckBox.java | 2 +- src/com/android/camera/ui/InLineSettingItem.java | 2 +- src/com/android/camera/ui/InLineSettingMenu.java | 2 +- src/com/android/camera/ui/ListPrefSettingPopup.java | 2 +- src/com/android/camera/ui/ModuleSwitcher.java | 2 +- src/com/android/camera/ui/MoreSettingPopup.java | 2 +- src/com/android/camera/ui/PieRenderer.java | 2 +- src/com/android/camera/ui/ProgressRenderer.java | 2 +- src/com/android/camera/ui/RotateTextToast.java | 2 +- src/com/android/camera/ui/Switch.java | 2 +- src/com/android/camera/ui/TimeIntervalPopup.java | 2 +- src/com/android/camera/ui/ZoomRenderer.java | 2 +- src/com/android/camera/util/CameraUtil.java | 2 +- 46 files changed, 46 insertions(+), 46 deletions(-) (limited to 'src') diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java index 5ade3950a..4ad1bd0d0 100644 --- a/src/com/android/camera/CameraActivity.java +++ b/src/com/android/camera/CameraActivity.java @@ -88,7 +88,7 @@ import com.android.camera.util.IntentHelper; import com.android.camera.util.PhotoSphereHelper; 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.io.File; diff --git a/src/com/android/camera/CameraPreference.java b/src/com/android/camera/CameraPreference.java index f2a78e9cc..fc5aa4aa6 100644 --- a/src/com/android/camera/CameraPreference.java +++ b/src/com/android/camera/CameraPreference.java @@ -21,7 +21,7 @@ import android.content.SharedPreferences; import android.content.res.TypedArray; import android.util.AttributeSet; -import com.android.camera2.R; +import org.codeaurora.snapcam.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 4a05994d5..721cd1c20 100644 --- a/src/com/android/camera/CameraSettings.java +++ b/src/com/android/camera/CameraSettings.java @@ -33,7 +33,7 @@ import android.util.Log; import com.android.camera.util.ApiHelper; import com.android.camera.util.CameraUtil; import com.android.camera.util.GcamHelper; -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/CountDownTimerPreference.java b/src/com/android/camera/CountDownTimerPreference.java index 14819fa48..c256f0783 100644 --- a/src/com/android/camera/CountDownTimerPreference.java +++ b/src/com/android/camera/CountDownTimerPreference.java @@ -19,7 +19,7 @@ package com.android.camera; import android.content.Context; import android.util.AttributeSet; -import com.android.camera2.R; +import org.codeaurora.snapcam.R; public class CountDownTimerPreference extends ListPreference { private static final int[] DURATIONS = { diff --git a/src/com/android/camera/IconListPreference.java b/src/com/android/camera/IconListPreference.java index 97e729d0e..eab0d613e 100644 --- a/src/com/android/camera/IconListPreference.java +++ b/src/com/android/camera/IconListPreference.java @@ -23,7 +23,7 @@ import android.content.res.Resources; import android.content.res.TypedArray; import android.util.AttributeSet; -import com.android.camera2.R; +import org.codeaurora.snapcam.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 2a33fb098..b856d460e 100644 --- a/src/com/android/camera/ListPreference.java +++ b/src/com/android/camera/ListPreference.java @@ -28,7 +28,7 @@ import android.util.TypedValue; import com.android.camera.util.CameraUtil; import com.android.camera.util.UsageStatistics; -import com.android.camera2.R; +import org.codeaurora.snapcam.R; /** * A type of CameraPreference whose number of possible values diff --git a/src/com/android/camera/OnScreenHint.java b/src/com/android/camera/OnScreenHint.java index f47d9d8cb..48cdebf5d 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.android.camera2.R; +import org.codeaurora.snapcam.R; /** * A on-screen hint is a view containing a little message for the user and will diff --git a/src/com/android/camera/OnScreenIndicators.java b/src/com/android/camera/OnScreenIndicators.java index 64992cfae..5f5dbc311 100644 --- a/src/com/android/camera/OnScreenIndicators.java +++ b/src/com/android/camera/OnScreenIndicators.java @@ -24,7 +24,7 @@ import android.util.Log; import android.view.View; import android.widget.ImageView; -import com.android.camera2.R; +import org.codeaurora.snapcam.R; /** * The on-screen indicators of the pie menu button. They show the camera diff --git a/src/com/android/camera/PhotoMenu.java b/src/com/android/camera/PhotoMenu.java index dbb9925b7..98dd9baf5 100644 --- a/src/com/android/camera/PhotoMenu.java +++ b/src/com/android/camera/PhotoMenu.java @@ -28,7 +28,7 @@ import com.android.camera.ui.MoreSettingPopup; import com.android.camera.ui.PieItem; import com.android.camera.ui.PieItem.OnClickListener; import com.android.camera.ui.PieRenderer; -import com.android.camera2.R; +import org.codeaurora.snapcam.R; import android.content.Context; import android.view.LayoutInflater; import android.widget.Toast; diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index c10df2477..8a616d33e 100644 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -74,7 +74,7 @@ import com.android.camera.util.ApiHelper; import com.android.camera.util.CameraUtil; import com.android.camera.util.GcamHelper; import com.android.camera.util.UsageStatistics; -import com.android.camera2.R; +import org.codeaurora.snapcam.R; import com.android.internal.util.MemInfoReader; import android.app.ActivityManager; diff --git a/src/com/android/camera/PhotoUI.java b/src/com/android/camera/PhotoUI.java index 5a085dca5..48458ba0a 100644 --- a/src/com/android/camera/PhotoUI.java +++ b/src/com/android/camera/PhotoUI.java @@ -57,7 +57,7 @@ import com.android.camera.ui.PieRenderer.PieListener; import com.android.camera.ui.RenderOverlay; import com.android.camera.ui.ZoomRenderer; import com.android.camera.util.CameraUtil; -import com.android.camera2.R; +import org.codeaurora.snapcam.R; import java.util.List; diff --git a/src/com/android/camera/PieController.java b/src/com/android/camera/PieController.java index d2e5b72c1..cc4ad6552 100644 --- a/src/com/android/camera/PieController.java +++ b/src/com/android/camera/PieController.java @@ -26,7 +26,7 @@ import com.android.camera.drawable.TextDrawable; import com.android.camera.ui.PieItem; import com.android.camera.ui.PieItem.OnClickListener; import com.android.camera.ui.PieRenderer; -import com.android.camera2.R; +import org.codeaurora.snapcam.R; import java.util.ArrayList; import java.util.HashMap; diff --git a/src/com/android/camera/SoundClips.java b/src/com/android/camera/SoundClips.java index e8e5ce733..8ccd51d4a 100644 --- a/src/com/android/camera/SoundClips.java +++ b/src/com/android/camera/SoundClips.java @@ -24,7 +24,7 @@ import android.media.SoundPool; import android.os.Build; import android.util.Log; -import com.android.camera2.R; +import org.codeaurora.snapcam.R; import com.android.camera.util.ApiHelper; /* diff --git a/src/com/android/camera/VideoMenu.java b/src/com/android/camera/VideoMenu.java index 2ee2f211d..c15033529 100644 --- a/src/com/android/camera/VideoMenu.java +++ b/src/com/android/camera/VideoMenu.java @@ -26,7 +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.camera2.R; +import org.codeaurora.snapcam.R; public class VideoMenu extends PieController implements MoreSettingPopup.Listener, diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java index 16911f1f0..81c6e136d 100644 --- a/src/com/android/camera/VideoModule.java +++ b/src/com/android/camera/VideoModule.java @@ -67,7 +67,7 @@ import com.android.camera.util.AccessibilityUtils; import com.android.camera.util.ApiHelper; import com.android.camera.util.CameraUtil; import com.android.camera.util.UsageStatistics; -import com.android.camera2.R; +import org.codeaurora.snapcam.R; import com.android.camera.PhotoModule; import java.io.File; import java.io.IOException; diff --git a/src/com/android/camera/VideoUI.java b/src/com/android/camera/VideoUI.java index 9ffd1a113..75105822b 100644 --- a/src/com/android/camera/VideoUI.java +++ b/src/com/android/camera/VideoUI.java @@ -52,7 +52,7 @@ import com.android.camera.ui.RotateLayout; import com.android.camera.PauseButton.OnPauseButtonListener; import com.android.camera.ui.ZoomRenderer; import com.android.camera.util.CameraUtil; -import com.android.camera2.R; +import org.codeaurora.snapcam.R; import java.util.List; diff --git a/src/com/android/camera/WideAnglePanoramaModule.java b/src/com/android/camera/WideAnglePanoramaModule.java index f6daa6019..225981808 100644 --- a/src/com/android/camera/WideAnglePanoramaModule.java +++ b/src/com/android/camera/WideAnglePanoramaModule.java @@ -50,7 +50,7 @@ import com.android.camera.data.LocalData; import com.android.camera.exif.ExifInterface; import com.android.camera.util.CameraUtil; import com.android.camera.util.UsageStatistics; -import com.android.camera2.R; +import org.codeaurora.snapcam.R; import java.io.ByteArrayOutputStream; import java.io.File; diff --git a/src/com/android/camera/WideAnglePanoramaUI.java b/src/com/android/camera/WideAnglePanoramaUI.java index 4ee2427eb..57b414a43 100644 --- a/src/com/android/camera/WideAnglePanoramaUI.java +++ b/src/com/android/camera/WideAnglePanoramaUI.java @@ -44,7 +44,7 @@ import com.android.camera.ui.CameraControls; import com.android.camera.ui.CameraRootView; import com.android.camera.ui.ModuleSwitcher; import com.android.camera.util.CameraUtil; -import com.android.camera2.R; +import org.codeaurora.snapcam.R; /** * The UI of {@link WideAnglePanoramaModule}. diff --git a/src/com/android/camera/crop/CropActivity.java b/src/com/android/camera/crop/CropActivity.java index b5351d34c..9c9295dc4 100644 --- a/src/com/android/camera/crop/CropActivity.java +++ b/src/com/android/camera/crop/CropActivity.java @@ -42,7 +42,7 @@ import android.view.View.OnClickListener; import android.view.WindowManager; import android.widget.Toast; -import com.android.camera2.R; +import org.codeaurora.snapcam.R; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; diff --git a/src/com/android/camera/crop/CropView.java b/src/com/android/camera/crop/CropView.java index a47cb0a36..77a79bba7 100644 --- a/src/com/android/camera/crop/CropView.java +++ b/src/com/android/camera/crop/CropView.java @@ -32,7 +32,7 @@ import android.util.Log; import android.view.MotionEvent; import android.view.View; -import com.android.camera2.R; +import org.codeaurora.snapcam.R; public class CropView extends View { private static final String LOGTAG = "CropView"; diff --git a/src/com/android/camera/data/InProgressDataWrapper.java b/src/com/android/camera/data/InProgressDataWrapper.java index 61e87b722..9ce968e2f 100644 --- a/src/com/android/camera/data/InProgressDataWrapper.java +++ b/src/com/android/camera/data/InProgressDataWrapper.java @@ -25,7 +25,7 @@ import android.view.View; import android.widget.FrameLayout; import com.android.camera.util.PhotoSphereHelper; -import com.android.camera2.R; +import org.codeaurora.snapcam.R; /** * A wrapper class for in-progress data. Data that's still being processed diff --git a/src/com/android/camera/data/LocalMediaData.java b/src/com/android/camera/data/LocalMediaData.java index fe5610863..e77578b16 100644 --- a/src/com/android/camera/data/LocalMediaData.java +++ b/src/com/android/camera/data/LocalMediaData.java @@ -41,7 +41,7 @@ import android.widget.ImageView; import com.android.camera.ui.FilmStripView; import com.android.camera.util.CameraUtil; import com.android.camera.util.PhotoSphereHelper; -import com.android.camera2.R; +import org.codeaurora.snapcam.R; import java.io.File; import java.text.DateFormat; diff --git a/src/com/android/camera/data/MediaDetails.java b/src/com/android/camera/data/MediaDetails.java index dd4c147cc..f7d7fd05c 100644 --- a/src/com/android/camera/data/MediaDetails.java +++ b/src/com/android/camera/data/MediaDetails.java @@ -22,7 +22,7 @@ import android.util.SparseIntArray; import com.android.camera.exif.ExifInterface; import com.android.camera.exif.ExifTag; -import com.android.camera2.R; +import org.codeaurora.snapcam.R; import java.io.FileNotFoundException; import java.io.IOException; diff --git a/src/com/android/camera/data/RotationTask.java b/src/com/android/camera/data/RotationTask.java index 558815a50..de9b92f7e 100644 --- a/src/com/android/camera/data/RotationTask.java +++ b/src/com/android/camera/data/RotationTask.java @@ -26,7 +26,7 @@ import android.util.Log; import com.android.camera.data.LocalMediaData.PhotoData; import com.android.camera.exif.ExifInterface; import com.android.camera.exif.ExifTag; -import com.android.camera2.R; +import org.codeaurora.snapcam.R; import java.io.File; import java.io.FileNotFoundException; diff --git a/src/com/android/camera/tinyplanet/TinyPlanetFragment.java b/src/com/android/camera/tinyplanet/TinyPlanetFragment.java index d1d5af91c..5a9f73947 100644 --- a/src/com/android/camera/tinyplanet/TinyPlanetFragment.java +++ b/src/com/android/camera/tinyplanet/TinyPlanetFragment.java @@ -48,7 +48,7 @@ import com.android.camera.MediaSaveService.OnMediaSavedListener; import com.android.camera.exif.ExifInterface; import com.android.camera.tinyplanet.TinyPlanetPreview.PreviewSizeListener; import com.android.camera.util.XmpUtil; -import com.android.camera2.R; +import org.codeaurora.snapcam.R; import java.io.ByteArrayOutputStream; import java.io.FileNotFoundException; 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 { diff --git a/src/com/android/camera/util/CameraUtil.java b/src/com/android/camera/util/CameraUtil.java index bb7639f9f..cfddf957e 100644 --- a/src/com/android/camera/util/CameraUtil.java +++ b/src/com/android/camera/util/CameraUtil.java @@ -58,7 +58,7 @@ import com.android.camera.CameraHolder; import com.android.camera.CameraManager; import com.android.camera.CameraSettings; import com.android.camera.util.IntentHelper; -import com.android.camera2.R; +import org.codeaurora.snapcam.R; import java.io.Closeable; import java.io.IOException; -- cgit v1.2.3