diff options
236 files changed, 248 insertions, 244 deletions
diff --git a/Android.mk b/Android.mk index 3a425d213..54f8e0e43 100644 --- a/Android.mk +++ b/Android.mk @@ -7,7 +7,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_JAVA_LIBRARIES := telephony-common LOCAL_STATIC_JAVA_LIBRARIES := android-support-v13 -LOCAL_STATIC_JAVA_LIBRARIES += com.android.gallery3d.common2 +LOCAL_STATIC_JAVA_LIBRARIES += org.codeaurora.gallery.common LOCAL_STATIC_JAVA_LIBRARIES += xmp_toolkit LOCAL_STATIC_JAVA_LIBRARIES += mp4parser #LOCAL_STATIC_JAVA_LIBRARIES += android-support-v8-renderscript @@ -35,11 +35,11 @@ LOCAL_RESOURCE_DIR += $(LOCAL_PATH)/res LOCAL_AAPT_FLAGS := --auto-add-overlay -LOCAL_PACKAGE_NAME := Gallery2 +LOCAL_PACKAGE_NAME := SnapdragonGallery LOCAL_PRIVILEGED_MODULE := true -LOCAL_OVERRIDES_PACKAGES := Gallery Gallery3D GalleryNew3D +LOCAL_OVERRIDES_PACKAGES := Gallery Gallery3D GalleryNew3D Gallery2 LOCAL_PROGUARD_ENABLED := disabled diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 1eda90bf7..37c925c4b 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -20,7 +20,7 @@ <manifest android:versionCode="40030" android:versionName="1.1.40030" xmlns:android="http://schemas.android.com/apk/res/android" - package="com.android.gallery3d"> + package="org.codeaurora.gallery"> <original-package android:name="com.android.gallery3d" /> diff --git a/gallerycommon/Android.mk b/gallerycommon/Android.mk index 1d341472c..97b6faf43 100644 --- a/gallerycommon/Android.mk +++ b/gallerycommon/Android.mk @@ -20,7 +20,7 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) -LOCAL_MODULE := com.android.gallery3d.common2 +LOCAL_MODULE := org.codeaurora.gallery.common LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_SDK_VERSION := 16 diff --git a/gallerycommon/src/com/android/gallery3d/jpegstream/JPEGInputStream.java b/gallerycommon/src/com/android/gallery3d/jpegstream/JPEGInputStream.java index 44ccd4c6b..71c3eb438 100644 --- a/gallerycommon/src/com/android/gallery3d/jpegstream/JPEGInputStream.java +++ b/gallerycommon/src/com/android/gallery3d/jpegstream/JPEGInputStream.java @@ -188,6 +188,6 @@ public class JPEGInputStream extends FilterInputStream { native private int skipDecodedBytes(int bytes); static { - System.loadLibrary("jni_jpegstream"); + System.loadLibrary("jni_gallery_jpegstream"); } } diff --git a/gallerycommon/src/com/android/gallery3d/jpegstream/JPEGOutputStream.java b/gallerycommon/src/com/android/gallery3d/jpegstream/JPEGOutputStream.java index c49d3759c..ab5c3a93d 100644 --- a/gallerycommon/src/com/android/gallery3d/jpegstream/JPEGOutputStream.java +++ b/gallerycommon/src/com/android/gallery3d/jpegstream/JPEGOutputStream.java @@ -139,6 +139,6 @@ public class JPEGOutputStream extends FilterOutputStream { native private int writeInputBytes(byte[] inBuffer, int offset, int inCount); static { - System.loadLibrary("jni_jpegstream"); + System.loadLibrary("jni_gallery_jpegstream"); } } diff --git a/jni/Android.mk b/jni/Android.mk index 2d7a0c398..1a45a90be 100644 --- a/jni/Android.mk +++ b/jni/Android.mk @@ -10,7 +10,7 @@ LOCAL_SDK_VERSION := 9 LOCAL_MODULE_TAGS := optional -LOCAL_MODULE := libjni_eglfence +LOCAL_MODULE := libjni_gallery_eglfence LOCAL_LDLIBS := -llog -lEGL @@ -23,7 +23,7 @@ include $(CLEAR_VARS) LOCAL_CPP_EXTENSION := .cc LOCAL_SDK_VERSION := 9 -LOCAL_MODULE := libjni_filtershow_filters +LOCAL_MODULE := libjni_gallery_filters LOCAL_SRC_FILES := filters/gradient.c \ filters/saturated.c \ filters/exposure.c \ diff --git a/jni_jpegstream/Android.mk b/jni_jpegstream/Android.mk index 97d57eeba..ef499baf4 100644 --- a/jni_jpegstream/Android.mk +++ b/jni_jpegstream/Android.mk @@ -4,7 +4,7 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) -LOCAL_MODULE := libjni_jpegstream +LOCAL_MODULE := libjni_gallery_jpegstream LOCAL_NDK_STL_VARIANT := stlport_static diff --git a/res/layout/audio_effects_dialog.xml b/res/layout/audio_effects_dialog.xml index a14cd1e54..be72d69cd 100644 --- a/res/layout/audio_effects_dialog.xml +++ b/res/layout/audio_effects_dialog.xml @@ -29,7 +29,7 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. --> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:custom="http://schemas.android.com/apk/res/com.android.gallery3d" + xmlns:custom="http://schemas.android.com/apk/res/org.codeaurora.gallery" android:layout_width="wrap_content" android:layout_height="wrap_content" android:orientation="vertical" diff --git a/res/layout/filtershow_activity.xml b/res/layout/filtershow_activity.xml index 87adf730b..2a7ea6d33 100644 --- a/res/layout/filtershow_activity.xml +++ b/res/layout/filtershow_activity.xml @@ -59,7 +59,7 @@ </RelativeLayout> <com.android.gallery3d.filtershow.CenteredLinearLayout - xmlns:custom="http://schemas.android.com/apk/res/com.android.gallery3d" + xmlns:custom="http://schemas.android.com/apk/res/org.codeaurora.gallery" android:id="@+id/mainPanel" android:layout_width="match_parent" android:layout_height="wrap_content" diff --git a/res/layout/filtershow_category_panel_new.xml b/res/layout/filtershow_category_panel_new.xml index 58d45272e..4828725cb 100644 --- a/res/layout/filtershow_category_panel_new.xml +++ b/res/layout/filtershow_category_panel_new.xml @@ -16,7 +16,7 @@ --> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:custom="http://schemas.android.com/apk/res/com.android.gallery3d" + xmlns:custom="http://schemas.android.com/apk/res/org.codeaurora.gallery" android:orientation="horizontal" android:layout_width="match_parent" android:layout_height="wrap_content" @@ -47,4 +47,4 @@ android:layout_height="@dimen/category_panel_height" android:src="@drawable/filtershow_add"/> -</LinearLayout>
\ No newline at end of file +</LinearLayout> diff --git a/res/layout/filtershow_state_panel_new.xml b/res/layout/filtershow_state_panel_new.xml index 4ea7c8ae7..ac67ccbed 100644 --- a/res/layout/filtershow_state_panel_new.xml +++ b/res/layout/filtershow_state_panel_new.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:custom="http://schemas.android.com/apk/res/com.android.gallery3d" + xmlns:custom="http://schemas.android.com/apk/res/org.codeaurora.gallery" android:orientation="vertical" android:layout_width="match_parent" android:layout_height="wrap_content" diff --git a/res/xml/camera_preferences.xml b/res/xml/camera_preferences.xml index 8c13a3422..d17f47272 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.gallery3d" + xmlns:camera="http://schemas.android.com/apk/res/org.codeaurora.gallery" camera:title="@string/pref_camera_settings_category"> <IconListPreference camera:key="pref_camera_flashmode_key" diff --git a/res/xml/video_preferences.xml b/res/xml/video_preferences.xml index 79154e653..de9dfccb2 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.gallery3d" + xmlns:camera="http://schemas.android.com/apk/res/org.codeaurora.gallery" camera:title="@string/pref_camcorder_settings_category"> <ListPreference camera:key="pref_video_quality_key" diff --git a/src/com/android/gallery3d/app/AbstractGalleryActivity.java b/src/com/android/gallery3d/app/AbstractGalleryActivity.java index 7a734e040..07dee812e 100644 --- a/src/com/android/gallery3d/app/AbstractGalleryActivity.java +++ b/src/com/android/gallery3d/app/AbstractGalleryActivity.java @@ -39,7 +39,7 @@ import android.view.Window; import android.view.WindowManager; import android.widget.Toolbar; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.common.ApiHelper; import com.android.gallery3d.data.DataManager; import com.android.gallery3d.data.MediaItem; diff --git a/src/com/android/gallery3d/app/ActivityState.java b/src/com/android/gallery3d/app/ActivityState.java index 8ca584a12..7050db6c2 100644 --- a/src/com/android/gallery3d/app/ActivityState.java +++ b/src/com/android/gallery3d/app/ActivityState.java @@ -32,7 +32,7 @@ import android.view.MenuItem; import android.view.Window; import android.view.WindowManager; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.anim.StateTransitionAnimation; import com.android.gallery3d.glrenderer.RawTexture; import com.android.gallery3d.ui.GLView; diff --git a/src/com/android/gallery3d/app/AlbumPage.java b/src/com/android/gallery3d/app/AlbumPage.java index 3ceb7a09a..05cc1f8a1 100644 --- a/src/com/android/gallery3d/app/AlbumPage.java +++ b/src/com/android/gallery3d/app/AlbumPage.java @@ -40,7 +40,7 @@ import android.widget.TextView; import android.widget.Toast; import android.widget.Toolbar; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.common.Utils; import com.android.gallery3d.data.DataManager; import com.android.gallery3d.data.MediaDetails; diff --git a/src/com/android/gallery3d/app/AlbumPicker.java b/src/com/android/gallery3d/app/AlbumPicker.java index 8c2d09a0e..729585e12 100644 --- a/src/com/android/gallery3d/app/AlbumPicker.java +++ b/src/com/android/gallery3d/app/AlbumPicker.java @@ -19,7 +19,7 @@ package com.android.gallery3d.app; import android.content.Intent; import android.os.Bundle; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.data.DataManager; public class AlbumPicker extends PickerActivity { diff --git a/src/com/android/gallery3d/app/AlbumSetPage.java b/src/com/android/gallery3d/app/AlbumSetPage.java index 31b0e3840..ec75d2aa8 100644 --- a/src/com/android/gallery3d/app/AlbumSetPage.java +++ b/src/com/android/gallery3d/app/AlbumSetPage.java @@ -41,7 +41,7 @@ import android.widget.RelativeLayout; import android.widget.TextView; import android.widget.Toast; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.common.Utils; import com.android.gallery3d.data.DataManager; import com.android.gallery3d.data.MediaDetails; diff --git a/src/com/android/gallery3d/app/CommonControllerOverlay.java b/src/com/android/gallery3d/app/CommonControllerOverlay.java index 28b6988f5..1c8287414 100644 --- a/src/com/android/gallery3d/app/CommonControllerOverlay.java +++ b/src/com/android/gallery3d/app/CommonControllerOverlay.java @@ -32,7 +32,7 @@ import android.widget.ProgressBar; import android.widget.RelativeLayout; import android.widget.TextView; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; /** * The common playback controller for the Movie Player or Video Trimming. diff --git a/src/com/android/gallery3d/app/Config.java b/src/com/android/gallery3d/app/Config.java index 8e8d11b26..5a458ae35 100644 --- a/src/com/android/gallery3d/app/Config.java +++ b/src/com/android/gallery3d/app/Config.java @@ -19,7 +19,7 @@ package com.android.gallery3d.app; import android.content.Context; import android.content.res.Resources; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.ui.AlbumSetSlotRenderer; import com.android.gallery3d.ui.AlbumSlotRenderer; import com.android.gallery3d.ui.SlotView; diff --git a/src/com/android/gallery3d/app/FilterUtils.java b/src/com/android/gallery3d/app/FilterUtils.java index 2c4c96c73..af771c135 100644 --- a/src/com/android/gallery3d/app/FilterUtils.java +++ b/src/com/android/gallery3d/app/FilterUtils.java @@ -16,7 +16,7 @@ package com.android.gallery3d.app; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.data.MediaObject; import com.android.gallery3d.data.Path; diff --git a/src/com/android/gallery3d/app/GalleryActionBar.java b/src/com/android/gallery3d/app/GalleryActionBar.java index ebec5731b..b2ce2b2f3 100644 --- a/src/com/android/gallery3d/app/GalleryActionBar.java +++ b/src/com/android/gallery3d/app/GalleryActionBar.java @@ -39,7 +39,7 @@ import android.widget.TextView; import android.widget.Toolbar; import android.widget.TwoLineListItem; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.common.ApiHelper; import java.util.ArrayList; diff --git a/src/com/android/gallery3d/app/GalleryActivity.java b/src/com/android/gallery3d/app/GalleryActivity.java index c328af73c..fd233e5f9 100644 --- a/src/com/android/gallery3d/app/GalleryActivity.java +++ b/src/com/android/gallery3d/app/GalleryActivity.java @@ -65,7 +65,7 @@ import android.support.v4.widget.DrawerLayout.DrawerListener; import android.text.TextUtils; import java.util.ArrayList; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.common.Utils; import com.android.gallery3d.data.DataManager; import com.android.gallery3d.data.MediaItem; @@ -359,7 +359,7 @@ public final class GalleryActivity extends AbstractGalleryActivity implements On LayoutInflater inflater = (LayoutInflater) mContext .getSystemService(Context.LAYOUT_INFLATER_SERVICE); view = inflater.inflate( - com.android.gallery3d.R.layout.drawer_list_item, null); + org.codeaurora.gallery.R.layout.drawer_list_item, null); } else { view = convertView; } diff --git a/src/com/android/gallery3d/app/GestureControllerOverlay.java b/src/com/android/gallery3d/app/GestureControllerOverlay.java index c97245ca6..6ac278608 100644 --- a/src/com/android/gallery3d/app/GestureControllerOverlay.java +++ b/src/com/android/gallery3d/app/GestureControllerOverlay.java @@ -42,7 +42,7 @@ import android.view.WindowManager; import android.widget.FrameLayout; import android.widget.TextView; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.util.GalleryUtils; public class GestureControllerOverlay extends FrameLayout implements diff --git a/src/com/android/gallery3d/app/ManageCachePage.java b/src/com/android/gallery3d/app/ManageCachePage.java index 4f5c35819..c94519950 100644 --- a/src/com/android/gallery3d/app/ManageCachePage.java +++ b/src/com/android/gallery3d/app/ManageCachePage.java @@ -30,7 +30,7 @@ import android.widget.ProgressBar; import android.widget.TextView; import android.widget.Toast; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.common.Utils; import com.android.gallery3d.data.MediaObject; import com.android.gallery3d.data.MediaSet; diff --git a/src/com/android/gallery3d/app/MovieActivity.java b/src/com/android/gallery3d/app/MovieActivity.java index cc6c72966..cbea7b303 100644 --- a/src/com/android/gallery3d/app/MovieActivity.java +++ b/src/com/android/gallery3d/app/MovieActivity.java @@ -66,7 +66,7 @@ import android.widget.ShareActionProvider; import android.widget.ToggleButton; import android.widget.Toast; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.common.ApiHelper; import com.android.gallery3d.common.Utils; import com.android.gallery3d.ui.Knob; diff --git a/src/com/android/gallery3d/app/MovieControllerOverlay.java b/src/com/android/gallery3d/app/MovieControllerOverlay.java index 4d497ac13..e1a3d0282 100644 --- a/src/com/android/gallery3d/app/MovieControllerOverlay.java +++ b/src/com/android/gallery3d/app/MovieControllerOverlay.java @@ -38,7 +38,7 @@ import android.widget.ImageView; import android.widget.ImageView.ScaleType; import android.widget.LinearLayout; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import org.codeaurora.gallery3d.ext.IContrllerOverlayExt; import org.codeaurora.gallery3d.video.IControllerRewindAndForward; diff --git a/src/com/android/gallery3d/app/MovieControllerOverlayNew.java b/src/com/android/gallery3d/app/MovieControllerOverlayNew.java index 7d93b2b2d..824f8a469 100644 --- a/src/com/android/gallery3d/app/MovieControllerOverlayNew.java +++ b/src/com/android/gallery3d/app/MovieControllerOverlayNew.java @@ -40,7 +40,7 @@ import android.widget.ImageView; import org.codeaurora.gallery3d.video.IVideoSnapshotListener; import org.codeaurora.gallery3d.video.IControllerRewindAndForward; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; public class MovieControllerOverlayNew extends MovieControllerOverlay { private VideoSnapshotLayout mVideoSnapshotLayout = new VideoSnapshotLayout(); diff --git a/src/com/android/gallery3d/app/MoviePlayer.java b/src/com/android/gallery3d/app/MoviePlayer.java index 47c9b128a..a16cc9a33 100644 --- a/src/com/android/gallery3d/app/MoviePlayer.java +++ b/src/com/android/gallery3d/app/MoviePlayer.java @@ -44,7 +44,7 @@ import android.view.View; import android.view.ViewGroup; import android.widget.Toast; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.common.ApiHelper; import com.android.gallery3d.common.BlobCache; import com.android.gallery3d.util.CacheManager; diff --git a/src/com/android/gallery3d/app/MuteVideo.java b/src/com/android/gallery3d/app/MuteVideo.java index dd05397d2..86bd05db2 100755 --- a/src/com/android/gallery3d/app/MuteVideo.java +++ b/src/com/android/gallery3d/app/MuteVideo.java @@ -26,7 +26,7 @@ import android.os.Handler; import android.provider.MediaStore; import android.widget.Toast; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.data.MediaItem; import com.android.gallery3d.util.SaveVideoFileInfo; import com.android.gallery3d.util.SaveVideoFileUtils; diff --git a/src/com/android/gallery3d/app/PhotoPage.java b/src/com/android/gallery3d/app/PhotoPage.java index 287df66b7..50f813276 100644 --- a/src/com/android/gallery3d/app/PhotoPage.java +++ b/src/com/android/gallery3d/app/PhotoPage.java @@ -47,7 +47,7 @@ import android.widget.ShareActionProvider; import android.widget.Toast; import android.widget.Toolbar; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.common.ApiHelper; import com.android.gallery3d.data.ComboAlbum; import com.android.gallery3d.data.DataManager; diff --git a/src/com/android/gallery3d/app/PhotoPageBottomControls.java b/src/com/android/gallery3d/app/PhotoPageBottomControls.java index 80ae3875b..166224eff 100644 --- a/src/com/android/gallery3d/app/PhotoPageBottomControls.java +++ b/src/com/android/gallery3d/app/PhotoPageBottomControls.java @@ -28,7 +28,7 @@ import android.view.animation.Animation; import android.widget.RelativeLayout; import android.widget.ImageButton; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import java.util.HashMap; import java.util.Map; diff --git a/src/com/android/gallery3d/app/PhotoPageProgressBar.java b/src/com/android/gallery3d/app/PhotoPageProgressBar.java index 141fea698..788a6b814 100644 --- a/src/com/android/gallery3d/app/PhotoPageProgressBar.java +++ b/src/com/android/gallery3d/app/PhotoPageProgressBar.java @@ -22,7 +22,7 @@ import android.view.ViewGroup; import android.view.ViewGroup.LayoutParams; import android.widget.RelativeLayout; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; public class PhotoPageProgressBar { private ViewGroup mContainer; diff --git a/src/com/android/gallery3d/app/PickerActivity.java b/src/com/android/gallery3d/app/PickerActivity.java index d5bb218ea..09ce203ee 100644 --- a/src/com/android/gallery3d/app/PickerActivity.java +++ b/src/com/android/gallery3d/app/PickerActivity.java @@ -24,7 +24,7 @@ import android.view.View; import android.view.View.OnClickListener; import android.view.Window; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.ui.GLRootView; public class PickerActivity extends AbstractGalleryActivity diff --git a/src/com/android/gallery3d/app/SlideshowPage.java b/src/com/android/gallery3d/app/SlideshowPage.java index ffc5dbf32..97a4d5076 100644 --- a/src/com/android/gallery3d/app/SlideshowPage.java +++ b/src/com/android/gallery3d/app/SlideshowPage.java @@ -28,7 +28,7 @@ import android.os.Handler; import android.os.Message; import android.view.MotionEvent; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.common.Utils; import com.android.gallery3d.data.ContentListener; import com.android.gallery3d.data.MediaItem; diff --git a/src/com/android/gallery3d/app/TimeBar.java b/src/com/android/gallery3d/app/TimeBar.java index f66dfdfcd..91d46b2fa 100755 --- a/src/com/android/gallery3d/app/TimeBar.java +++ b/src/com/android/gallery3d/app/TimeBar.java @@ -28,7 +28,7 @@ import android.util.Log; import android.view.MotionEvent; import android.view.View; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.common.Utils; import java.util.Locale; diff --git a/src/com/android/gallery3d/app/TimeBarNew.java b/src/com/android/gallery3d/app/TimeBarNew.java index 370b4c636..28211d697 100644 --- a/src/com/android/gallery3d/app/TimeBarNew.java +++ b/src/com/android/gallery3d/app/TimeBarNew.java @@ -32,7 +32,7 @@ package com.android.gallery3d.app; import android.content.Context; import android.view.MotionEvent; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; public class TimeBarNew extends TimeBar { diff --git a/src/com/android/gallery3d/app/TimeLinePage.java b/src/com/android/gallery3d/app/TimeLinePage.java index a2b472107..9da003eb9 100644 --- a/src/com/android/gallery3d/app/TimeLinePage.java +++ b/src/com/android/gallery3d/app/TimeLinePage.java @@ -72,7 +72,7 @@ import com.android.gallery3d.ui.TimeLineSlotRenderer; import com.android.gallery3d.ui.TimeLineSlotView; import com.android.gallery3d.util.Future; import com.android.gallery3d.util.GalleryUtils; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import java.lang.ref.WeakReference; import java.util.ArrayList; diff --git a/src/com/android/gallery3d/app/TrimControllerOverlay.java b/src/com/android/gallery3d/app/TrimControllerOverlay.java index 5bf3b03a5..4c90a971b 100644 --- a/src/com/android/gallery3d/app/TrimControllerOverlay.java +++ b/src/com/android/gallery3d/app/TrimControllerOverlay.java @@ -23,7 +23,7 @@ import android.content.Context; import android.view.MotionEvent; import android.view.View; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.common.ApiHelper; /** diff --git a/src/com/android/gallery3d/app/TrimTimeBar.java b/src/com/android/gallery3d/app/TrimTimeBar.java index 8dad597a1..06e8741bb 100644 --- a/src/com/android/gallery3d/app/TrimTimeBar.java +++ b/src/com/android/gallery3d/app/TrimTimeBar.java @@ -22,7 +22,7 @@ import android.graphics.BitmapFactory; import android.graphics.Canvas; import android.view.MotionEvent; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; /** * The trim time bar view, which includes the current and total time, the progress diff --git a/src/com/android/gallery3d/app/TrimVideo.java b/src/com/android/gallery3d/app/TrimVideo.java index 6905e62d5..d2d6cd336 100644 --- a/src/com/android/gallery3d/app/TrimVideo.java +++ b/src/com/android/gallery3d/app/TrimVideo.java @@ -36,7 +36,7 @@ import android.widget.TextView; import android.widget.Toast; import android.widget.VideoView; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.util.SaveVideoFileInfo; import com.android.gallery3d.util.SaveVideoFileUtils; diff --git a/src/com/android/gallery3d/data/CameraShortcutImage.java b/src/com/android/gallery3d/data/CameraShortcutImage.java index 865270b4c..0334c308b 100644 --- a/src/com/android/gallery3d/data/CameraShortcutImage.java +++ b/src/com/android/gallery3d/data/CameraShortcutImage.java @@ -16,7 +16,7 @@ package com.android.gallery3d.data; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.app.GalleryApp; public class CameraShortcutImage extends ActionImage { diff --git a/src/com/android/gallery3d/data/ComboAlbumSet.java b/src/com/android/gallery3d/data/ComboAlbumSet.java index 3f3674500..1c5088562 100644 --- a/src/com/android/gallery3d/data/ComboAlbumSet.java +++ b/src/com/android/gallery3d/data/ComboAlbumSet.java @@ -16,7 +16,7 @@ package com.android.gallery3d.data; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.app.GalleryApp; import com.android.gallery3d.util.Future; diff --git a/src/com/android/gallery3d/data/EmptyAlbumImage.java b/src/com/android/gallery3d/data/EmptyAlbumImage.java index 6f8c37c6b..c055d5703 100644 --- a/src/com/android/gallery3d/data/EmptyAlbumImage.java +++ b/src/com/android/gallery3d/data/EmptyAlbumImage.java @@ -16,7 +16,7 @@ package com.android.gallery3d.data; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.app.GalleryApp; public class EmptyAlbumImage extends ActionImage { diff --git a/src/com/android/gallery3d/data/FaceClustering.java b/src/com/android/gallery3d/data/FaceClustering.java index a0d567902..0bdef0818 100755 --- a/src/com/android/gallery3d/data/FaceClustering.java +++ b/src/com/android/gallery3d/data/FaceClustering.java @@ -19,7 +19,7 @@ package com.android.gallery3d.data; import android.content.Context; import android.graphics.Rect; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.picasasource.PicasaSource; import java.util.ArrayList; diff --git a/src/com/android/gallery3d/data/LocalAlbum.java b/src/com/android/gallery3d/data/LocalAlbum.java index 24d3b1b3f..2592a8990 100644 --- a/src/com/android/gallery3d/data/LocalAlbum.java +++ b/src/com/android/gallery3d/data/LocalAlbum.java @@ -27,7 +27,7 @@ import android.provider.MediaStore.Images.ImageColumns; import android.provider.MediaStore.Video; import android.provider.MediaStore.Video.VideoColumns; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.app.GalleryApp; import com.android.gallery3d.common.Utils; import com.android.gallery3d.util.BucketNames; diff --git a/src/com/android/gallery3d/data/LocalAlbumSet.java b/src/com/android/gallery3d/data/LocalAlbumSet.java index b2b4b8c5d..81e7d8070 100644 --- a/src/com/android/gallery3d/data/LocalAlbumSet.java +++ b/src/com/android/gallery3d/data/LocalAlbumSet.java @@ -21,7 +21,7 @@ import android.os.Handler; import android.provider.MediaStore.Images; import android.provider.MediaStore.Video; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.app.GalleryApp; import com.android.gallery3d.data.BucketHelper.BucketEntry; import com.android.gallery3d.util.Future; diff --git a/src/com/android/gallery3d/data/LocationClustering.java b/src/com/android/gallery3d/data/LocationClustering.java index 90ac41c65..8cc2ad13b 100644 --- a/src/com/android/gallery3d/data/LocationClustering.java +++ b/src/com/android/gallery3d/data/LocationClustering.java @@ -21,7 +21,7 @@ import android.os.Handler; import android.os.Looper; import android.widget.Toast; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.util.GalleryUtils; import com.android.gallery3d.util.ReverseGeocoder; diff --git a/src/com/android/gallery3d/data/MediaDetails.java b/src/com/android/gallery3d/data/MediaDetails.java index cac524b88..2a501c7c5 100644 --- a/src/com/android/gallery3d/data/MediaDetails.java +++ b/src/com/android/gallery3d/data/MediaDetails.java @@ -16,7 +16,7 @@ package com.android.gallery3d.data; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.common.Utils; import com.android.gallery3d.exif.ExifInterface; import com.android.gallery3d.exif.ExifTag; diff --git a/src/com/android/gallery3d/data/SizeClustering.java b/src/com/android/gallery3d/data/SizeClustering.java index b809c841b..89c55031c 100644 --- a/src/com/android/gallery3d/data/SizeClustering.java +++ b/src/com/android/gallery3d/data/SizeClustering.java @@ -19,7 +19,7 @@ package com.android.gallery3d.data; import android.content.Context; import android.content.res.Resources; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import java.util.ArrayList; diff --git a/src/com/android/gallery3d/data/TagClustering.java b/src/com/android/gallery3d/data/TagClustering.java index 407ca84c4..c93c3c9d1 100644 --- a/src/com/android/gallery3d/data/TagClustering.java +++ b/src/com/android/gallery3d/data/TagClustering.java @@ -18,7 +18,7 @@ package com.android.gallery3d.data; import android.content.Context; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import java.util.ArrayList; import java.util.Map; diff --git a/src/com/android/gallery3d/data/UnlockImage.java b/src/com/android/gallery3d/data/UnlockImage.java index ed3b485c4..02fa464e9 100644 --- a/src/com/android/gallery3d/data/UnlockImage.java +++ b/src/com/android/gallery3d/data/UnlockImage.java @@ -16,7 +16,7 @@ package com.android.gallery3d.data; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.app.GalleryApp; public class UnlockImage extends ActionImage { diff --git a/src/com/android/gallery3d/filtershow/CenteredLinearLayout.java b/src/com/android/gallery3d/filtershow/CenteredLinearLayout.java index bc9342d6f..c792c2c4f 100644 --- a/src/com/android/gallery3d/filtershow/CenteredLinearLayout.java +++ b/src/com/android/gallery3d/filtershow/CenteredLinearLayout.java @@ -23,7 +23,7 @@ import android.util.AttributeSet; import android.util.TypedValue; import android.widget.LinearLayout; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; public class CenteredLinearLayout extends LinearLayout { private final int mMaxWidth; diff --git a/src/com/android/gallery3d/filtershow/FilterShowActivity.java b/src/com/android/gallery3d/filtershow/FilterShowActivity.java index 4448b6914..c1395170b 100644 --- a/src/com/android/gallery3d/filtershow/FilterShowActivity.java +++ b/src/com/android/gallery3d/filtershow/FilterShowActivity.java @@ -79,7 +79,7 @@ import android.widget.ShareActionProvider; import android.widget.ShareActionProvider.OnShareTargetSelectedListener; import android.widget.Toast; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.app.PhotoPage; import com.android.gallery3d.data.LocalAlbum; import com.android.gallery3d.filtershow.cache.ImageLoader; diff --git a/src/com/android/gallery3d/filtershow/category/Action.java b/src/com/android/gallery3d/filtershow/category/Action.java index b3a4148eb..9c0587bfc 100644 --- a/src/com/android/gallery3d/filtershow/category/Action.java +++ b/src/com/android/gallery3d/filtershow/category/Action.java @@ -28,7 +28,7 @@ import android.util.Log; import android.widget.ArrayAdapter; import android.widget.ListAdapter; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.filtershow.FilterShowActivity; import com.android.gallery3d.filtershow.filters.FilterDrawRepresentation; import com.android.gallery3d.filtershow.filters.FilterUserPresetRepresentation; diff --git a/src/com/android/gallery3d/filtershow/category/BasicGeometryPanel.java b/src/com/android/gallery3d/filtershow/category/BasicGeometryPanel.java index 30d874040..52d16a56c 100644 --- a/src/com/android/gallery3d/filtershow/category/BasicGeometryPanel.java +++ b/src/com/android/gallery3d/filtershow/category/BasicGeometryPanel.java @@ -38,7 +38,7 @@ import android.view.ViewGroup; import android.widget.ImageButton; import android.widget.TextView; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; public class BasicGeometryPanel extends Fragment { protected View mMainView; diff --git a/src/com/android/gallery3d/filtershow/category/CategoryAdapter.java b/src/com/android/gallery3d/filtershow/category/CategoryAdapter.java index 7ef3c0bb2..4062bf0ef 100644 --- a/src/com/android/gallery3d/filtershow/category/CategoryAdapter.java +++ b/src/com/android/gallery3d/filtershow/category/CategoryAdapter.java @@ -22,7 +22,7 @@ import android.view.ViewGroup; import android.widget.ArrayAdapter; import android.widget.ListView; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.filtershow.FilterShowActivity; import com.android.gallery3d.filtershow.filters.FilterRepresentation; import com.android.gallery3d.filtershow.filters.FilterTinyPlanetRepresentation; diff --git a/src/com/android/gallery3d/filtershow/category/CategoryPanel.java b/src/com/android/gallery3d/filtershow/category/CategoryPanel.java index 096e65ff2..cbe38c8e6 100644 --- a/src/com/android/gallery3d/filtershow/category/CategoryPanel.java +++ b/src/com/android/gallery3d/filtershow/category/CategoryPanel.java @@ -27,7 +27,7 @@ import android.widget.ImageButton; import android.widget.LinearLayout; import android.widget.ListView; import android.widget.TextView; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.filtershow.FilterShowActivity; import android.util.Log; public class CategoryPanel extends Fragment implements View.OnClickListener { diff --git a/src/com/android/gallery3d/filtershow/category/CategorySelected.java b/src/com/android/gallery3d/filtershow/category/CategorySelected.java index 42058c0db..92848c12a 100644 --- a/src/com/android/gallery3d/filtershow/category/CategorySelected.java +++ b/src/com/android/gallery3d/filtershow/category/CategorySelected.java @@ -7,7 +7,7 @@ import android.graphics.Paint; import android.util.AttributeSet; import android.view.View; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; public class CategorySelected extends View { private Paint mPaint = new Paint(); diff --git a/src/com/android/gallery3d/filtershow/category/CategoryTrack.java b/src/com/android/gallery3d/filtershow/category/CategoryTrack.java index 1371fe876..a906df5ad 100644 --- a/src/com/android/gallery3d/filtershow/category/CategoryTrack.java +++ b/src/com/android/gallery3d/filtershow/category/CategoryTrack.java @@ -25,7 +25,7 @@ import android.util.Log; import android.view.MotionEvent; import android.view.View; import android.widget.LinearLayout; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; public class CategoryTrack extends LinearLayout { diff --git a/src/com/android/gallery3d/filtershow/category/CategoryView.java b/src/com/android/gallery3d/filtershow/category/CategoryView.java index fff4e0bf3..940627290 100644 --- a/src/com/android/gallery3d/filtershow/category/CategoryView.java +++ b/src/com/android/gallery3d/filtershow/category/CategoryView.java @@ -26,7 +26,7 @@ import android.graphics.Paint; import android.graphics.Rect; import android.view.MotionEvent; import android.view.View; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.filtershow.FilterShowActivity; import com.android.gallery3d.filtershow.filters.FilterRepresentation; import com.android.gallery3d.filtershow.ui.SelectionRenderer; diff --git a/src/com/android/gallery3d/filtershow/category/EditorCropPanel.java b/src/com/android/gallery3d/filtershow/category/EditorCropPanel.java index 55d52fff3..3e6124c0a 100644 --- a/src/com/android/gallery3d/filtershow/category/EditorCropPanel.java +++ b/src/com/android/gallery3d/filtershow/category/EditorCropPanel.java @@ -37,7 +37,7 @@ import android.view.View; import android.widget.ImageButton; import android.widget.TextView; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.filtershow.FilterShowActivity; import com.android.gallery3d.filtershow.editors.EditorCrop; diff --git a/src/com/android/gallery3d/filtershow/category/IconView.java b/src/com/android/gallery3d/filtershow/category/IconView.java index 1bfd2a7af..c952d431d 100644 --- a/src/com/android/gallery3d/filtershow/category/IconView.java +++ b/src/com/android/gallery3d/filtershow/category/IconView.java @@ -28,7 +28,7 @@ import android.graphics.RectF; import android.graphics.Typeface; import android.util.AttributeSet; import android.view.View; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; public class IconView extends View { diff --git a/src/com/android/gallery3d/filtershow/category/MainPanel.java b/src/com/android/gallery3d/filtershow/category/MainPanel.java index f2c3b099b..762978744 100644 --- a/src/com/android/gallery3d/filtershow/category/MainPanel.java +++ b/src/com/android/gallery3d/filtershow/category/MainPanel.java @@ -25,7 +25,7 @@ import android.view.ViewGroup; import android.widget.ImageButton; import android.widget.LinearLayout; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.filtershow.FilterShowActivity; import com.android.gallery3d.filtershow.editors.EditorPanel; import com.android.gallery3d.filtershow.filters.HazeBusterActs; diff --git a/src/com/android/gallery3d/filtershow/category/StraightenPanel.java b/src/com/android/gallery3d/filtershow/category/StraightenPanel.java index c16bbe394..e9eb03e7f 100644 --- a/src/com/android/gallery3d/filtershow/category/StraightenPanel.java +++ b/src/com/android/gallery3d/filtershow/category/StraightenPanel.java @@ -34,7 +34,7 @@ import android.os.Bundle; import android.support.annotation.Nullable; import android.view.View; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.filtershow.FilterShowActivity; import com.android.gallery3d.filtershow.editors.EditorStraighten; diff --git a/src/com/android/gallery3d/filtershow/colorpicker/ColorBrightnessView.java b/src/com/android/gallery3d/filtershow/colorpicker/ColorBrightnessView.java index 9b955efc6..3f528a912 100644 --- a/src/com/android/gallery3d/filtershow/colorpicker/ColorBrightnessView.java +++ b/src/com/android/gallery3d/filtershow/colorpicker/ColorBrightnessView.java @@ -30,7 +30,7 @@ import android.util.DisplayMetrics; import android.view.MotionEvent; import android.view.View; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/com/android/gallery3d/filtershow/colorpicker/ColorCompareView.java b/src/com/android/gallery3d/filtershow/colorpicker/ColorCompareView.java index 15996713a..c765b4d23 100644 --- a/src/com/android/gallery3d/filtershow/colorpicker/ColorCompareView.java +++ b/src/com/android/gallery3d/filtershow/colorpicker/ColorCompareView.java @@ -30,7 +30,7 @@ import android.util.DisplayMetrics; import android.view.MotionEvent; import android.view.View; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import java.util.ArrayList; diff --git a/src/com/android/gallery3d/filtershow/colorpicker/ColorGridDialog.java b/src/com/android/gallery3d/filtershow/colorpicker/ColorGridDialog.java index 028599478..b93434a09 100644 --- a/src/com/android/gallery3d/filtershow/colorpicker/ColorGridDialog.java +++ b/src/com/android/gallery3d/filtershow/colorpicker/ColorGridDialog.java @@ -24,7 +24,7 @@ import android.view.View; import android.view.ViewGroup; import android.widget.Button; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import java.util.ArrayList; diff --git a/src/com/android/gallery3d/filtershow/colorpicker/ColorHueView.java b/src/com/android/gallery3d/filtershow/colorpicker/ColorHueView.java index 498f5a4b6..c8c03bec7 100644 --- a/src/com/android/gallery3d/filtershow/colorpicker/ColorHueView.java +++ b/src/com/android/gallery3d/filtershow/colorpicker/ColorHueView.java @@ -31,7 +31,7 @@ import android.util.DisplayMetrics; import android.view.MotionEvent; import android.view.View; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import java.util.ArrayList; diff --git a/src/com/android/gallery3d/filtershow/colorpicker/ColorOpacityView.java b/src/com/android/gallery3d/filtershow/colorpicker/ColorOpacityView.java index ec15b5b09..df20d01ef 100644 --- a/src/com/android/gallery3d/filtershow/colorpicker/ColorOpacityView.java +++ b/src/com/android/gallery3d/filtershow/colorpicker/ColorOpacityView.java @@ -31,7 +31,7 @@ import android.util.DisplayMetrics; import android.view.MotionEvent; import android.view.View; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import java.util.ArrayList; diff --git a/src/com/android/gallery3d/filtershow/colorpicker/ColorPickerDialog.java b/src/com/android/gallery3d/filtershow/colorpicker/ColorPickerDialog.java index ff36f5aa8..478eb9dab 100644 --- a/src/com/android/gallery3d/filtershow/colorpicker/ColorPickerDialog.java +++ b/src/com/android/gallery3d/filtershow/colorpicker/ColorPickerDialog.java @@ -30,7 +30,7 @@ import android.widget.Button; import android.widget.ImageButton; import android.widget.ToggleButton; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.filtershow.FilterShowActivity; import com.android.photos.views.GalleryThumbnailView; diff --git a/src/com/android/gallery3d/filtershow/colorpicker/ColorRectView.java b/src/com/android/gallery3d/filtershow/colorpicker/ColorRectView.java index 07d7c7126..a99295939 100644 --- a/src/com/android/gallery3d/filtershow/colorpicker/ColorRectView.java +++ b/src/com/android/gallery3d/filtershow/colorpicker/ColorRectView.java @@ -30,7 +30,7 @@ import android.util.DisplayMetrics; import android.view.MotionEvent; import android.view.View; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import java.util.ArrayList; diff --git a/src/com/android/gallery3d/filtershow/colorpicker/ColorSVRectView.java b/src/com/android/gallery3d/filtershow/colorpicker/ColorSVRectView.java index fb8b4fcb4..5382b4999 100644 --- a/src/com/android/gallery3d/filtershow/colorpicker/ColorSVRectView.java +++ b/src/com/android/gallery3d/filtershow/colorpicker/ColorSVRectView.java @@ -32,7 +32,7 @@ import android.util.DisplayMetrics; import android.view.MotionEvent; import android.view.View; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import java.util.ArrayList; diff --git a/src/com/android/gallery3d/filtershow/colorpicker/ColorSaturationView.java b/src/com/android/gallery3d/filtershow/colorpicker/ColorSaturationView.java index af4dfdaa1..a945be81b 100644 --- a/src/com/android/gallery3d/filtershow/colorpicker/ColorSaturationView.java +++ b/src/com/android/gallery3d/filtershow/colorpicker/ColorSaturationView.java @@ -30,7 +30,7 @@ import android.util.DisplayMetrics; import android.view.MotionEvent; import android.view.View; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/com/android/gallery3d/filtershow/colorpicker/ColorValueView.java b/src/com/android/gallery3d/filtershow/colorpicker/ColorValueView.java index bbfd829b3..c7befc79f 100644 --- a/src/com/android/gallery3d/filtershow/colorpicker/ColorValueView.java +++ b/src/com/android/gallery3d/filtershow/colorpicker/ColorValueView.java @@ -28,7 +28,7 @@ import android.util.DisplayMetrics; import android.view.MotionEvent; import android.view.View; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import java.util.ArrayList; diff --git a/src/com/android/gallery3d/filtershow/controller/ActionSlider.java b/src/com/android/gallery3d/filtershow/controller/ActionSlider.java index f80a1cacb..ce74373f9 100644 --- a/src/com/android/gallery3d/filtershow/controller/ActionSlider.java +++ b/src/com/android/gallery3d/filtershow/controller/ActionSlider.java @@ -22,7 +22,7 @@ import android.view.View.OnClickListener; import android.view.ViewGroup; import android.widget.ImageButton; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.filtershow.editors.Editor; public class ActionSlider extends TitledSlider { diff --git a/src/com/android/gallery3d/filtershow/controller/BasicSlider.java b/src/com/android/gallery3d/filtershow/controller/BasicSlider.java index 53be81ba4..eb6a491f4 100644 --- a/src/com/android/gallery3d/filtershow/controller/BasicSlider.java +++ b/src/com/android/gallery3d/filtershow/controller/BasicSlider.java @@ -24,7 +24,7 @@ import android.widget.LinearLayout; import android.widget.SeekBar; import android.widget.SeekBar.OnSeekBarChangeListener; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.filtershow.FilterShowActivity; import com.android.gallery3d.filtershow.editors.Editor; diff --git a/src/com/android/gallery3d/filtershow/controller/ColorChooser.java b/src/com/android/gallery3d/filtershow/controller/ColorChooser.java index 82ce80bbf..cfa92607d 100644 --- a/src/com/android/gallery3d/filtershow/controller/ColorChooser.java +++ b/src/com/android/gallery3d/filtershow/controller/ColorChooser.java @@ -11,7 +11,7 @@ import android.view.ViewGroup; import android.widget.Button; import android.widget.LinearLayout; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.filtershow.colorpicker.ColorListener; import com.android.gallery3d.filtershow.colorpicker.ColorPickerDialog; import com.android.gallery3d.filtershow.editors.Editor; diff --git a/src/com/android/gallery3d/filtershow/controller/SliderBrightness.java b/src/com/android/gallery3d/filtershow/controller/SliderBrightness.java index 2929d6891..4e704b15f 100644 --- a/src/com/android/gallery3d/filtershow/controller/SliderBrightness.java +++ b/src/com/android/gallery3d/filtershow/controller/SliderBrightness.java @@ -22,7 +22,7 @@ import android.view.View; import android.view.ViewGroup; import android.widget.LinearLayout; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.filtershow.colorpicker.ColorBrightnessView; import com.android.gallery3d.filtershow.colorpicker.ColorListener; import com.android.gallery3d.filtershow.colorpicker.ColorOpacityView; diff --git a/src/com/android/gallery3d/filtershow/controller/SliderHue.java b/src/com/android/gallery3d/filtershow/controller/SliderHue.java index 1820ce234..dc0042f6b 100644 --- a/src/com/android/gallery3d/filtershow/controller/SliderHue.java +++ b/src/com/android/gallery3d/filtershow/controller/SliderHue.java @@ -31,7 +31,7 @@ import android.widget.LinearLayout; import android.widget.SeekBar; import android.widget.SeekBar.OnSeekBarChangeListener; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.app.Log; import com.android.gallery3d.filtershow.colorpicker.ColorHueView; import com.android.gallery3d.filtershow.colorpicker.ColorListener; diff --git a/src/com/android/gallery3d/filtershow/controller/SliderOpacity.java b/src/com/android/gallery3d/filtershow/controller/SliderOpacity.java index 2a34aad2f..06ed607a3 100644 --- a/src/com/android/gallery3d/filtershow/controller/SliderOpacity.java +++ b/src/com/android/gallery3d/filtershow/controller/SliderOpacity.java @@ -24,7 +24,7 @@ import android.widget.LinearLayout; import android.widget.SeekBar; import android.widget.SeekBar.OnSeekBarChangeListener; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.filtershow.colorpicker.ColorListener; import com.android.gallery3d.filtershow.colorpicker.ColorOpacityView; import com.android.gallery3d.filtershow.editors.Editor; diff --git a/src/com/android/gallery3d/filtershow/controller/SliderSaturation.java b/src/com/android/gallery3d/filtershow/controller/SliderSaturation.java index 6f3ae6e4f..c99de25da 100644 --- a/src/com/android/gallery3d/filtershow/controller/SliderSaturation.java +++ b/src/com/android/gallery3d/filtershow/controller/SliderSaturation.java @@ -24,7 +24,7 @@ import android.widget.LinearLayout; import android.widget.SeekBar; import android.widget.SeekBar.OnSeekBarChangeListener; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.filtershow.colorpicker.ColorListener; import com.android.gallery3d.filtershow.colorpicker.ColorOpacityView; import com.android.gallery3d.filtershow.colorpicker.ColorSaturationView; diff --git a/src/com/android/gallery3d/filtershow/controller/StyleChooser.java b/src/com/android/gallery3d/filtershow/controller/StyleChooser.java index ab17d63d7..674bedd6a 100644 --- a/src/com/android/gallery3d/filtershow/controller/StyleChooser.java +++ b/src/com/android/gallery3d/filtershow/controller/StyleChooser.java @@ -11,7 +11,7 @@ import android.widget.ImageButton; import android.widget.ImageView.ScaleType; import android.widget.LinearLayout; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.filtershow.pipeline.RenderingRequest; import com.android.gallery3d.filtershow.pipeline.RenderingRequestCaller; import com.android.gallery3d.filtershow.editors.Editor; diff --git a/src/com/android/gallery3d/filtershow/controller/TitledSlider.java b/src/com/android/gallery3d/filtershow/controller/TitledSlider.java index 8031b759f..ed7eaf91c 100644 --- a/src/com/android/gallery3d/filtershow/controller/TitledSlider.java +++ b/src/com/android/gallery3d/filtershow/controller/TitledSlider.java @@ -25,7 +25,7 @@ import android.widget.SeekBar; import android.widget.SeekBar.OnSeekBarChangeListener; import android.widget.TextView; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.filtershow.editors.Editor; public class TitledSlider implements Control { diff --git a/src/com/android/gallery3d/filtershow/crop/CropActivity.java b/src/com/android/gallery3d/filtershow/crop/CropActivity.java index cc8d3e28b..afb527da9 100644 --- a/src/com/android/gallery3d/filtershow/crop/CropActivity.java +++ b/src/com/android/gallery3d/filtershow/crop/CropActivity.java @@ -42,7 +42,7 @@ import android.view.View.OnClickListener; import android.view.WindowManager; import android.widget.Toast; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.common.Utils; import com.android.gallery3d.filtershow.cache.ImageLoader; import com.android.gallery3d.filtershow.tools.SaveImage; diff --git a/src/com/android/gallery3d/filtershow/crop/CropDrawingUtils.java b/src/com/android/gallery3d/filtershow/crop/CropDrawingUtils.java index 8edbcba8f..b3f1af72d 100644 --- a/src/com/android/gallery3d/filtershow/crop/CropDrawingUtils.java +++ b/src/com/android/gallery3d/filtershow/crop/CropDrawingUtils.java @@ -26,7 +26,7 @@ import android.graphics.RectF; import android.graphics.Region; import android.graphics.drawable.Drawable; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; public abstract class CropDrawingUtils { diff --git a/src/com/android/gallery3d/filtershow/crop/CropView.java b/src/com/android/gallery3d/filtershow/crop/CropView.java index e1f42066c..d51d79983 100644 --- a/src/com/android/gallery3d/filtershow/crop/CropView.java +++ b/src/com/android/gallery3d/filtershow/crop/CropView.java @@ -32,7 +32,7 @@ import android.util.Log; import android.view.MotionEvent; import android.view.View; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; public class CropView extends View { diff --git a/src/com/android/gallery3d/filtershow/data/UserPresetsManager.java b/src/com/android/gallery3d/filtershow/data/UserPresetsManager.java index 6232a2d15..b5f8bb24b 100644 --- a/src/com/android/gallery3d/filtershow/data/UserPresetsManager.java +++ b/src/com/android/gallery3d/filtershow/data/UserPresetsManager.java @@ -3,7 +3,7 @@ package com.android.gallery3d.filtershow.data; import android.os.Handler; import android.os.HandlerThread; import android.os.Message; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.filtershow.FilterShowActivity; import com.android.gallery3d.filtershow.filters.FilterUserPresetRepresentation; import com.android.gallery3d.filtershow.pipeline.ImagePreset; diff --git a/src/com/android/gallery3d/filtershow/editors/BasicEditor.java b/src/com/android/gallery3d/filtershow/editors/BasicEditor.java index af694d811..861ed48af 100644 --- a/src/com/android/gallery3d/filtershow/editors/BasicEditor.java +++ b/src/com/android/gallery3d/filtershow/editors/BasicEditor.java @@ -18,7 +18,7 @@ package com.android.gallery3d.filtershow.editors; import android.content.Context; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.filtershow.controller.Control; import com.android.gallery3d.filtershow.controller.FilterView; import com.android.gallery3d.filtershow.controller.Parameter; diff --git a/src/com/android/gallery3d/filtershow/editors/Editor.java b/src/com/android/gallery3d/filtershow/editors/Editor.java index 80c6cf712..f68689388 100644 --- a/src/com/android/gallery3d/filtershow/editors/Editor.java +++ b/src/com/android/gallery3d/filtershow/editors/Editor.java @@ -33,7 +33,7 @@ import android.widget.SeekBar; import android.widget.SeekBar.OnSeekBarChangeListener; import android.widget.TextView; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.filtershow.controller.Control; import com.android.gallery3d.filtershow.filters.FilterBasicRepresentation; import com.android.gallery3d.filtershow.filters.FilterRepresentation; diff --git a/src/com/android/gallery3d/filtershow/editors/EditorChanSat.java b/src/com/android/gallery3d/filtershow/editors/EditorChanSat.java index 00460e505..0cc2ee322 100644 --- a/src/com/android/gallery3d/filtershow/editors/EditorChanSat.java +++ b/src/com/android/gallery3d/filtershow/editors/EditorChanSat.java @@ -29,7 +29,7 @@ import android.widget.SeekBar; import android.widget.SeekBar.OnSeekBarChangeListener; import android.widget.TextView; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.filtershow.FilterShowActivity; import com.android.gallery3d.filtershow.controller.BasicParameterStyle; import com.android.gallery3d.filtershow.controller.BitmapCaller; diff --git a/src/com/android/gallery3d/filtershow/editors/EditorColorBorder.java b/src/com/android/gallery3d/filtershow/editors/EditorColorBorder.java index ec44d7ed8..71f4dcb58 100644 --- a/src/com/android/gallery3d/filtershow/editors/EditorColorBorder.java +++ b/src/com/android/gallery3d/filtershow/editors/EditorColorBorder.java @@ -32,7 +32,7 @@ import android.widget.LinearLayout; import android.widget.PopupMenu; import android.widget.SeekBar; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.filtershow.FilterShowActivity; import com.android.gallery3d.filtershow.controller.BitmapCaller; import com.android.gallery3d.filtershow.controller.ColorChooser; diff --git a/src/com/android/gallery3d/filtershow/editors/EditorColorBorderTabletUI.java b/src/com/android/gallery3d/filtershow/editors/EditorColorBorderTabletUI.java index 9f1a11b58..8e7e8b06e 100644 --- a/src/com/android/gallery3d/filtershow/editors/EditorColorBorderTabletUI.java +++ b/src/com/android/gallery3d/filtershow/editors/EditorColorBorderTabletUI.java @@ -28,7 +28,7 @@ import android.widget.LinearLayout; import android.widget.SeekBar; import android.widget.TextView; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.filtershow.colorpicker.ColorCompareView; import com.android.gallery3d.filtershow.colorpicker.ColorHueView; import com.android.gallery3d.filtershow.colorpicker.ColorListener; diff --git a/src/com/android/gallery3d/filtershow/editors/EditorCrop.java b/src/com/android/gallery3d/filtershow/editors/EditorCrop.java index 1f8b448f6..e4db1f23d 100644 --- a/src/com/android/gallery3d/filtershow/editors/EditorCrop.java +++ b/src/com/android/gallery3d/filtershow/editors/EditorCrop.java @@ -27,7 +27,7 @@ import android.widget.FrameLayout; import android.widget.LinearLayout; import android.widget.PopupMenu; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.filtershow.FilterShowActivity; import com.android.gallery3d.filtershow.filters.FilterCropRepresentation; import com.android.gallery3d.filtershow.filters.FilterRepresentation; diff --git a/src/com/android/gallery3d/filtershow/editors/EditorCurves.java b/src/com/android/gallery3d/filtershow/editors/EditorCurves.java index 35ac35994..475c86422 100644 --- a/src/com/android/gallery3d/filtershow/editors/EditorCurves.java +++ b/src/com/android/gallery3d/filtershow/editors/EditorCurves.java @@ -20,7 +20,7 @@ import android.content.Context; import android.view.View; import android.widget.FrameLayout; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.filtershow.filters.FilterCurvesRepresentation; import com.android.gallery3d.filtershow.filters.FilterRepresentation; import com.android.gallery3d.filtershow.imageshow.ImageCurves; diff --git a/src/com/android/gallery3d/filtershow/editors/EditorDraw.java b/src/com/android/gallery3d/filtershow/editors/EditorDraw.java index 33e328098..20d788510 100644 --- a/src/com/android/gallery3d/filtershow/editors/EditorDraw.java +++ b/src/com/android/gallery3d/filtershow/editors/EditorDraw.java @@ -37,7 +37,7 @@ import android.widget.LinearLayout; import android.widget.PopupMenu; import android.widget.SeekBar; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.filtershow.FilterShowActivity; import com.android.gallery3d.filtershow.colorpicker.ColorHueView; import com.android.gallery3d.filtershow.colorpicker.ColorListener; diff --git a/src/com/android/gallery3d/filtershow/editors/EditorDrawTabletUI.java b/src/com/android/gallery3d/filtershow/editors/EditorDrawTabletUI.java index 83d89c9a5..ea01e10c9 100644 --- a/src/com/android/gallery3d/filtershow/editors/EditorDrawTabletUI.java +++ b/src/com/android/gallery3d/filtershow/editors/EditorDrawTabletUI.java @@ -31,7 +31,7 @@ import android.widget.LinearLayout; import android.widget.SeekBar; import android.widget.TextView; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.filtershow.colorpicker.ColorCompareView; import com.android.gallery3d.filtershow.colorpicker.ColorHueView; import com.android.gallery3d.filtershow.colorpicker.ColorListener; diff --git a/src/com/android/gallery3d/filtershow/editors/EditorDualCamFusion.java b/src/com/android/gallery3d/filtershow/editors/EditorDualCamFusion.java index 1ce56b3d9..d20b15511 100644 --- a/src/com/android/gallery3d/filtershow/editors/EditorDualCamFusion.java +++ b/src/com/android/gallery3d/filtershow/editors/EditorDualCamFusion.java @@ -37,7 +37,7 @@ import android.widget.Button; import android.widget.FrameLayout; import android.widget.LinearLayout; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.filtershow.FilterShowActivity; import com.android.gallery3d.filtershow.filters.FilterDualCamFusionRepresentation; import com.android.gallery3d.filtershow.filters.FilterRepresentation; diff --git a/src/com/android/gallery3d/filtershow/editors/EditorDualCamSketch.java b/src/com/android/gallery3d/filtershow/editors/EditorDualCamSketch.java index 94b511177..d7ff83ef7 100644 --- a/src/com/android/gallery3d/filtershow/editors/EditorDualCamSketch.java +++ b/src/com/android/gallery3d/filtershow/editors/EditorDualCamSketch.java @@ -32,7 +32,7 @@ package com.android.gallery3d.filtershow.editors; import android.content.Context; import android.widget.FrameLayout; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.filtershow.filters.FilterDualCamSketchRepresentation; import com.android.gallery3d.filtershow.filters.FilterRepresentation; import com.android.gallery3d.filtershow.imageshow.ImageDualCamera; diff --git a/src/com/android/gallery3d/filtershow/editors/EditorDualCamera.java b/src/com/android/gallery3d/filtershow/editors/EditorDualCamera.java index f2c7091ba..060cadc3b 100644 --- a/src/com/android/gallery3d/filtershow/editors/EditorDualCamera.java +++ b/src/com/android/gallery3d/filtershow/editors/EditorDualCamera.java @@ -32,7 +32,7 @@ package com.android.gallery3d.filtershow.editors; import android.content.Context; import android.widget.FrameLayout; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.filtershow.filters.FilterDualCamBasicRepresentation; import com.android.gallery3d.filtershow.filters.FilterRepresentation; import com.android.gallery3d.filtershow.imageshow.ImageDualCamera; diff --git a/src/com/android/gallery3d/filtershow/editors/EditorGrad.java b/src/com/android/gallery3d/filtershow/editors/EditorGrad.java index 96b8dbdd7..3624a6e10 100644 --- a/src/com/android/gallery3d/filtershow/editors/EditorGrad.java +++ b/src/com/android/gallery3d/filtershow/editors/EditorGrad.java @@ -30,7 +30,7 @@ import android.widget.SeekBar.OnSeekBarChangeListener; import android.widget.TextView; import android.widget.ToggleButton; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.filtershow.FilterShowActivity; import com.android.gallery3d.filtershow.controller.Control; import com.android.gallery3d.filtershow.controller.FilterView; diff --git a/src/com/android/gallery3d/filtershow/editors/EditorMakeup.java b/src/com/android/gallery3d/filtershow/editors/EditorMakeup.java index 331d31b57..26ecd4f49 100644 --- a/src/com/android/gallery3d/filtershow/editors/EditorMakeup.java +++ b/src/com/android/gallery3d/filtershow/editors/EditorMakeup.java @@ -20,7 +20,7 @@ package com.android.gallery3d.filtershow.editors; import android.view.View; import android.widget.SeekBar; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; public class EditorMakeup extends BasicEditor { public static int ID = R.id.editorMakeup; diff --git a/src/com/android/gallery3d/filtershow/editors/EditorMirror.java b/src/com/android/gallery3d/filtershow/editors/EditorMirror.java index d6d9ee75d..4be00d653 100644 --- a/src/com/android/gallery3d/filtershow/editors/EditorMirror.java +++ b/src/com/android/gallery3d/filtershow/editors/EditorMirror.java @@ -24,7 +24,7 @@ import android.widget.Button; import android.widget.FrameLayout; import android.widget.LinearLayout; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.filtershow.filters.FilterMirrorRepresentation; import com.android.gallery3d.filtershow.filters.FilterRepresentation; import com.android.gallery3d.filtershow.imageshow.ImageMirror; diff --git a/src/com/android/gallery3d/filtershow/editors/EditorPanel.java b/src/com/android/gallery3d/filtershow/editors/EditorPanel.java index ac9e16a59..34f711df9 100644 --- a/src/com/android/gallery3d/filtershow/editors/EditorPanel.java +++ b/src/com/android/gallery3d/filtershow/editors/EditorPanel.java @@ -29,7 +29,7 @@ import android.widget.ImageButton; import android.widget.LinearLayout; import android.widget.TextView; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.filtershow.FilterShowActivity; import com.android.gallery3d.filtershow.history.HistoryManager; import com.android.gallery3d.filtershow.category.MainPanel; diff --git a/src/com/android/gallery3d/filtershow/editors/EditorRedEye.java b/src/com/android/gallery3d/filtershow/editors/EditorRedEye.java index b0e88dd44..df381a58f 100644 --- a/src/com/android/gallery3d/filtershow/editors/EditorRedEye.java +++ b/src/com/android/gallery3d/filtershow/editors/EditorRedEye.java @@ -19,7 +19,7 @@ package com.android.gallery3d.filtershow.editors; import android.content.Context; import android.widget.FrameLayout; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.filtershow.filters.FilterRedEyeRepresentation; import com.android.gallery3d.filtershow.filters.FilterRepresentation; import com.android.gallery3d.filtershow.imageshow.ImageRedEye; diff --git a/src/com/android/gallery3d/filtershow/editors/EditorRotate.java b/src/com/android/gallery3d/filtershow/editors/EditorRotate.java index 9452bf0c0..a12a41dec 100644 --- a/src/com/android/gallery3d/filtershow/editors/EditorRotate.java +++ b/src/com/android/gallery3d/filtershow/editors/EditorRotate.java @@ -24,7 +24,7 @@ import android.widget.Button; import android.widget.FrameLayout; import android.widget.LinearLayout; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.filtershow.filters.FilterRepresentation; import com.android.gallery3d.filtershow.filters.FilterRotateRepresentation; import com.android.gallery3d.filtershow.imageshow.ImageRotate; diff --git a/src/com/android/gallery3d/filtershow/editors/EditorStraighten.java b/src/com/android/gallery3d/filtershow/editors/EditorStraighten.java index b2c0e9ab0..5f33739d0 100644 --- a/src/com/android/gallery3d/filtershow/editors/EditorStraighten.java +++ b/src/com/android/gallery3d/filtershow/editors/EditorStraighten.java @@ -20,7 +20,7 @@ import android.content.Context; import android.util.Log; import android.widget.FrameLayout; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.filtershow.filters.FilterRepresentation; import com.android.gallery3d.filtershow.filters.FilterStraightenRepresentation; import com.android.gallery3d.filtershow.imageshow.ImageStraighten; diff --git a/src/com/android/gallery3d/filtershow/editors/EditorTinyPlanet.java b/src/com/android/gallery3d/filtershow/editors/EditorTinyPlanet.java index 9376fbef0..d55f1d3a0 100644 --- a/src/com/android/gallery3d/filtershow/editors/EditorTinyPlanet.java +++ b/src/com/android/gallery3d/filtershow/editors/EditorTinyPlanet.java @@ -19,7 +19,7 @@ package com.android.gallery3d.filtershow.editors; import android.content.Context; import android.widget.FrameLayout; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.filtershow.filters.FilterRepresentation; import com.android.gallery3d.filtershow.filters.FilterTinyPlanetRepresentation; import com.android.gallery3d.filtershow.imageshow.ImageTinyPlanet; diff --git a/src/com/android/gallery3d/filtershow/editors/EditorVignette.java b/src/com/android/gallery3d/filtershow/editors/EditorVignette.java index 9766e19e4..8b5fcb505 100644 --- a/src/com/android/gallery3d/filtershow/editors/EditorVignette.java +++ b/src/com/android/gallery3d/filtershow/editors/EditorVignette.java @@ -28,7 +28,7 @@ import android.widget.PopupMenu; import android.widget.SeekBar; import android.widget.TextView; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.filtershow.FilterShowActivity; import com.android.gallery3d.filtershow.controller.BasicParameterInt; import com.android.gallery3d.filtershow.controller.Parameter; diff --git a/src/com/android/gallery3d/filtershow/editors/EditorZoom.java b/src/com/android/gallery3d/filtershow/editors/EditorZoom.java index ea8e3d140..2d1d250a2 100644 --- a/src/com/android/gallery3d/filtershow/editors/EditorZoom.java +++ b/src/com/android/gallery3d/filtershow/editors/EditorZoom.java @@ -16,7 +16,7 @@ package com.android.gallery3d.filtershow.editors; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; public class EditorZoom extends BasicEditor { public static final int ID = R.id.imageZoom; diff --git a/src/com/android/gallery3d/filtershow/editors/HazeBusterEditor.java b/src/com/android/gallery3d/filtershow/editors/HazeBusterEditor.java index 917af9e0b..c9ee3c8fe 100644 --- a/src/com/android/gallery3d/filtershow/editors/HazeBusterEditor.java +++ b/src/com/android/gallery3d/filtershow/editors/HazeBusterEditor.java @@ -32,7 +32,7 @@ package com.android.gallery3d.filtershow.editors; import android.content.Context; import android.widget.FrameLayout; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.filtershow.filters.FilterBasicRepresentation; import com.android.gallery3d.filtershow.filters.TrueScannerActs; import com.android.gallery3d.filtershow.imageshow.ImageShow; diff --git a/src/com/android/gallery3d/filtershow/editors/ImageOnlyEditor.java b/src/com/android/gallery3d/filtershow/editors/ImageOnlyEditor.java index 0858a014c..e48e7a69e 100644 --- a/src/com/android/gallery3d/filtershow/editors/ImageOnlyEditor.java +++ b/src/com/android/gallery3d/filtershow/editors/ImageOnlyEditor.java @@ -19,7 +19,7 @@ package com.android.gallery3d.filtershow.editors; import android.content.Context; import android.widget.FrameLayout; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.filtershow.imageshow.ImageShow; /** diff --git a/src/com/android/gallery3d/filtershow/editors/ParametricEditor.java b/src/com/android/gallery3d/filtershow/editors/ParametricEditor.java index d7b7f5724..c13c9f822 100644 --- a/src/com/android/gallery3d/filtershow/editors/ParametricEditor.java +++ b/src/com/android/gallery3d/filtershow/editors/ParametricEditor.java @@ -28,7 +28,7 @@ import android.widget.FrameLayout; import android.widget.LinearLayout; import android.widget.SeekBar; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.filtershow.controller.ActionSlider; import com.android.gallery3d.filtershow.controller.BasicSlider; import com.android.gallery3d.filtershow.controller.ColorChooser; diff --git a/src/com/android/gallery3d/filtershow/editors/SeeStraightEditor.java b/src/com/android/gallery3d/filtershow/editors/SeeStraightEditor.java index 89c22f485..d8dff10ee 100644 --- a/src/com/android/gallery3d/filtershow/editors/SeeStraightEditor.java +++ b/src/com/android/gallery3d/filtershow/editors/SeeStraightEditor.java @@ -32,7 +32,7 @@ package com.android.gallery3d.filtershow.editors; import android.content.Context; import android.widget.FrameLayout; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.filtershow.filters.SeeStraightActs; import com.android.gallery3d.filtershow.imageshow.ImageShow; diff --git a/src/com/android/gallery3d/filtershow/editors/TrueScannerEditor.java b/src/com/android/gallery3d/filtershow/editors/TrueScannerEditor.java index 30f099ca5..816e0b59a 100644 --- a/src/com/android/gallery3d/filtershow/editors/TrueScannerEditor.java +++ b/src/com/android/gallery3d/filtershow/editors/TrueScannerEditor.java @@ -32,7 +32,7 @@ package com.android.gallery3d.filtershow.editors; import android.content.Context; import android.widget.FrameLayout; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.filtershow.filters.FilterBasicRepresentation; import com.android.gallery3d.filtershow.filters.TrueScannerActs; import com.android.gallery3d.filtershow.imageshow.ImageShow; diff --git a/src/com/android/gallery3d/filtershow/filters/BaseFiltersManager.java b/src/com/android/gallery3d/filtershow/filters/BaseFiltersManager.java index d9b28cef1..4a2e2d830 100644 --- a/src/com/android/gallery3d/filtershow/filters/BaseFiltersManager.java +++ b/src/com/android/gallery3d/filtershow/filters/BaseFiltersManager.java @@ -20,7 +20,7 @@ import android.content.res.Resources; import android.graphics.Color; import android.util.Log; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.filtershow.editors.ImageOnlyEditor; import com.android.gallery3d.filtershow.pipeline.ImagePreset; diff --git a/src/com/android/gallery3d/filtershow/filters/FilterChanSatRepresentation.java b/src/com/android/gallery3d/filtershow/filters/FilterChanSatRepresentation.java index 6c5274da1..b009dfae0 100644 --- a/src/com/android/gallery3d/filtershow/filters/FilterChanSatRepresentation.java +++ b/src/com/android/gallery3d/filtershow/filters/FilterChanSatRepresentation.java @@ -19,7 +19,7 @@ package com.android.gallery3d.filtershow.filters; import android.util.JsonReader; import android.util.JsonWriter; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.filtershow.controller.BasicParameterInt; import com.android.gallery3d.filtershow.controller.Parameter; import com.android.gallery3d.filtershow.controller.ParameterSet; diff --git a/src/com/android/gallery3d/filtershow/filters/FilterColorBorderRepresentation.java b/src/com/android/gallery3d/filtershow/filters/FilterColorBorderRepresentation.java index 516292749..99e9223be 100644 --- a/src/com/android/gallery3d/filtershow/filters/FilterColorBorderRepresentation.java +++ b/src/com/android/gallery3d/filtershow/filters/FilterColorBorderRepresentation.java @@ -20,7 +20,7 @@ import android.graphics.Color; import android.util.JsonReader; import android.util.JsonWriter; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.filtershow.controller.BasicParameterInt; import com.android.gallery3d.filtershow.controller.Parameter; import com.android.gallery3d.filtershow.controller.ParameterColor; diff --git a/src/com/android/gallery3d/filtershow/filters/FilterCropRepresentation.java b/src/com/android/gallery3d/filtershow/filters/FilterCropRepresentation.java index 98afc3a08..d209189e7 100644 --- a/src/com/android/gallery3d/filtershow/filters/FilterCropRepresentation.java +++ b/src/com/android/gallery3d/filtershow/filters/FilterCropRepresentation.java @@ -20,7 +20,7 @@ import android.graphics.RectF; import android.util.JsonReader; import android.util.JsonWriter; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.filtershow.editors.EditorCrop; import java.io.IOException; diff --git a/src/com/android/gallery3d/filtershow/filters/FilterCurvesRepresentation.java b/src/com/android/gallery3d/filtershow/filters/FilterCurvesRepresentation.java index edab2a08d..9f7745788 100644 --- a/src/com/android/gallery3d/filtershow/filters/FilterCurvesRepresentation.java +++ b/src/com/android/gallery3d/filtershow/filters/FilterCurvesRepresentation.java @@ -4,7 +4,7 @@ import android.util.JsonReader; import android.util.JsonWriter; import android.util.Log; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.filtershow.imageshow.ControlPoint; import com.android.gallery3d.filtershow.imageshow.Spline; diff --git a/src/com/android/gallery3d/filtershow/filters/FilterDrawRepresentation.java b/src/com/android/gallery3d/filtershow/filters/FilterDrawRepresentation.java index 5c5e561ca..0e867ac16 100644 --- a/src/com/android/gallery3d/filtershow/filters/FilterDrawRepresentation.java +++ b/src/com/android/gallery3d/filtershow/filters/FilterDrawRepresentation.java @@ -23,7 +23,7 @@ import android.util.JsonReader; import android.util.JsonWriter; import android.util.Log; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.filtershow.controller.BasicParameterInt; import com.android.gallery3d.filtershow.controller.BasicParameterStyle; import com.android.gallery3d.filtershow.controller.Parameter; diff --git a/src/com/android/gallery3d/filtershow/filters/FilterDualCamFusionRepresentation.java b/src/com/android/gallery3d/filtershow/filters/FilterDualCamFusionRepresentation.java index 8e38c250b..f8d8263d3 100644 --- a/src/com/android/gallery3d/filtershow/filters/FilterDualCamFusionRepresentation.java +++ b/src/com/android/gallery3d/filtershow/filters/FilterDualCamFusionRepresentation.java @@ -36,7 +36,7 @@ import android.net.Uri; import android.util.JsonReader; import android.util.JsonWriter; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.filtershow.editors.EditorDualCamFusion; diff --git a/src/com/android/gallery3d/filtershow/filters/FilterGradRepresentation.java b/src/com/android/gallery3d/filtershow/filters/FilterGradRepresentation.java index a3a7e9555..3459a8776 100644 --- a/src/com/android/gallery3d/filtershow/filters/FilterGradRepresentation.java +++ b/src/com/android/gallery3d/filtershow/filters/FilterGradRepresentation.java @@ -19,7 +19,7 @@ import android.graphics.Rect; import android.util.JsonReader; import android.util.JsonWriter; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.filtershow.editors.EditorGrad; import com.android.gallery3d.filtershow.imageshow.MasterImage; import com.android.gallery3d.filtershow.imageshow.Line; diff --git a/src/com/android/gallery3d/filtershow/filters/FilterImageBorderRepresentation.java b/src/com/android/gallery3d/filtershow/filters/FilterImageBorderRepresentation.java index f310a2be1..11b9a0fcf 100644 --- a/src/com/android/gallery3d/filtershow/filters/FilterImageBorderRepresentation.java +++ b/src/com/android/gallery3d/filtershow/filters/FilterImageBorderRepresentation.java @@ -16,7 +16,7 @@ package com.android.gallery3d.filtershow.filters; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.filtershow.editors.ImageOnlyEditor; public class FilterImageBorderRepresentation extends FilterRepresentation { diff --git a/src/com/android/gallery3d/filtershow/filters/FilterMirrorRepresentation.java b/src/com/android/gallery3d/filtershow/filters/FilterMirrorRepresentation.java index c2814432d..67d1959cd 100644 --- a/src/com/android/gallery3d/filtershow/filters/FilterMirrorRepresentation.java +++ b/src/com/android/gallery3d/filtershow/filters/FilterMirrorRepresentation.java @@ -20,7 +20,7 @@ import android.util.JsonReader; import android.util.JsonWriter; import android.util.Log; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.filtershow.editors.EditorMirror; import com.android.gallery3d.filtershow.editors.ImageOnlyEditor; import com.android.gallery3d.filtershow.imageshow.GeometryMathUtils; diff --git a/src/com/android/gallery3d/filtershow/filters/FilterRedEyeRepresentation.java b/src/com/android/gallery3d/filtershow/filters/FilterRedEyeRepresentation.java index dd06a9760..68cf0d66a 100644 --- a/src/com/android/gallery3d/filtershow/filters/FilterRedEyeRepresentation.java +++ b/src/com/android/gallery3d/filtershow/filters/FilterRedEyeRepresentation.java @@ -18,7 +18,7 @@ package com.android.gallery3d.filtershow.filters; import android.graphics.RectF; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.filtershow.editors.EditorRedEye; import java.util.Vector; diff --git a/src/com/android/gallery3d/filtershow/filters/FilterRotateRepresentation.java b/src/com/android/gallery3d/filtershow/filters/FilterRotateRepresentation.java index 4299dd396..bb4ea31d2 100644 --- a/src/com/android/gallery3d/filtershow/filters/FilterRotateRepresentation.java +++ b/src/com/android/gallery3d/filtershow/filters/FilterRotateRepresentation.java @@ -20,7 +20,7 @@ import android.util.JsonReader; import android.util.JsonWriter; import android.util.Log; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.filtershow.editors.EditorRotate; import com.android.gallery3d.filtershow.editors.ImageOnlyEditor; diff --git a/src/com/android/gallery3d/filtershow/filters/FilterStraightenRepresentation.java b/src/com/android/gallery3d/filtershow/filters/FilterStraightenRepresentation.java index 1ba80e8b4..ebff5aba0 100644 --- a/src/com/android/gallery3d/filtershow/filters/FilterStraightenRepresentation.java +++ b/src/com/android/gallery3d/filtershow/filters/FilterStraightenRepresentation.java @@ -20,7 +20,7 @@ import android.util.JsonReader; import android.util.JsonWriter; import android.util.Log; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.filtershow.editors.EditorStraighten; import java.io.IOException; diff --git a/src/com/android/gallery3d/filtershow/filters/FilterTinyPlanetRepresentation.java b/src/com/android/gallery3d/filtershow/filters/FilterTinyPlanetRepresentation.java index 4f7bc6a15..172e06076 100644 --- a/src/com/android/gallery3d/filtershow/filters/FilterTinyPlanetRepresentation.java +++ b/src/com/android/gallery3d/filtershow/filters/FilterTinyPlanetRepresentation.java @@ -16,7 +16,7 @@ package com.android.gallery3d.filtershow.filters; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.filtershow.editors.EditorTinyPlanet; public class FilterTinyPlanetRepresentation extends FilterBasicRepresentation { diff --git a/src/com/android/gallery3d/filtershow/filters/FilterVignetteRepresentation.java b/src/com/android/gallery3d/filtershow/filters/FilterVignetteRepresentation.java index d316adeed..cff923132 100644 --- a/src/com/android/gallery3d/filtershow/filters/FilterVignetteRepresentation.java +++ b/src/com/android/gallery3d/filtershow/filters/FilterVignetteRepresentation.java @@ -19,7 +19,7 @@ package com.android.gallery3d.filtershow.filters; import android.util.JsonReader; import android.util.JsonWriter; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.filtershow.controller.BasicParameterInt; import com.android.gallery3d.filtershow.controller.Parameter; import com.android.gallery3d.filtershow.editors.EditorVignette; diff --git a/src/com/android/gallery3d/filtershow/filters/HazeBusterActs.java b/src/com/android/gallery3d/filtershow/filters/HazeBusterActs.java index 0960d16e4..a62e0c948 100644 --- a/src/com/android/gallery3d/filtershow/filters/HazeBusterActs.java +++ b/src/com/android/gallery3d/filtershow/filters/HazeBusterActs.java @@ -34,7 +34,7 @@ import android.graphics.Canvas; import android.graphics.Rect; import android.util.Log; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.filtershow.editors.HazeBusterEditor; import static com.android.gallery3d.filtershow.imageshow.ImageTrueScanner.*; diff --git a/src/com/android/gallery3d/filtershow/filters/IconUtilities.java b/src/com/android/gallery3d/filtershow/filters/IconUtilities.java index e2a01472d..8f22bbe5f 100644 --- a/src/com/android/gallery3d/filtershow/filters/IconUtilities.java +++ b/src/com/android/gallery3d/filtershow/filters/IconUtilities.java @@ -20,7 +20,7 @@ import android.content.res.Resources; import android.graphics.Bitmap; import android.graphics.BitmapFactory; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; public class IconUtilities { public static final int PUNCH = R.drawable.filtershow_fx_0005_punch; diff --git a/src/com/android/gallery3d/filtershow/filters/ImageFilterBwFilter.java b/src/com/android/gallery3d/filtershow/filters/ImageFilterBwFilter.java index 50837ca2f..9a012d6cb 100644 --- a/src/com/android/gallery3d/filtershow/filters/ImageFilterBwFilter.java +++ b/src/com/android/gallery3d/filtershow/filters/ImageFilterBwFilter.java @@ -16,7 +16,7 @@ package com.android.gallery3d.filtershow.filters; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import android.graphics.Bitmap; import android.graphics.Color; diff --git a/src/com/android/gallery3d/filtershow/filters/ImageFilterChanSat.java b/src/com/android/gallery3d/filtershow/filters/ImageFilterChanSat.java index 8482eac32..dd8d31db7 100644 --- a/src/com/android/gallery3d/filtershow/filters/ImageFilterChanSat.java +++ b/src/com/android/gallery3d/filtershow/filters/ImageFilterChanSat.java @@ -24,7 +24,7 @@ import android.renderscript.RenderScript; import android.renderscript.Script.LaunchOptions; import android.renderscript.Type; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.filtershow.pipeline.FilterEnvironment; public class ImageFilterChanSat extends ImageFilterRS { diff --git a/src/com/android/gallery3d/filtershow/filters/ImageFilterContrast.java b/src/com/android/gallery3d/filtershow/filters/ImageFilterContrast.java index 27c0e0877..c11cb792c 100644 --- a/src/com/android/gallery3d/filtershow/filters/ImageFilterContrast.java +++ b/src/com/android/gallery3d/filtershow/filters/ImageFilterContrast.java @@ -16,7 +16,7 @@ package com.android.gallery3d.filtershow.filters; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import android.graphics.Bitmap; diff --git a/src/com/android/gallery3d/filtershow/filters/ImageFilterDownsample.java b/src/com/android/gallery3d/filtershow/filters/ImageFilterDownsample.java index efb9cde71..ad7cbd708 100644 --- a/src/com/android/gallery3d/filtershow/filters/ImageFilterDownsample.java +++ b/src/com/android/gallery3d/filtershow/filters/ImageFilterDownsample.java @@ -20,7 +20,7 @@ import android.graphics.Bitmap; import android.graphics.Canvas; import android.graphics.Rect; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.filtershow.cache.ImageLoader; import com.android.gallery3d.filtershow.imageshow.MasterImage; diff --git a/src/com/android/gallery3d/filtershow/filters/ImageFilterDraw.java b/src/com/android/gallery3d/filtershow/filters/ImageFilterDraw.java index da7de9379..77dfa1744 100644 --- a/src/com/android/gallery3d/filtershow/filters/ImageFilterDraw.java +++ b/src/com/android/gallery3d/filtershow/filters/ImageFilterDraw.java @@ -28,7 +28,7 @@ import android.graphics.PathMeasure; import android.graphics.PorterDuff; import android.graphics.PorterDuffColorFilter; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.app.GalleryAppImpl; import com.android.gallery3d.app.Log; import com.android.gallery3d.filtershow.cache.ImageLoader; diff --git a/src/com/android/gallery3d/filtershow/filters/ImageFilterDualCamFusion.java b/src/com/android/gallery3d/filtershow/filters/ImageFilterDualCamFusion.java index b9bd574f4..9d9b2b817 100644 --- a/src/com/android/gallery3d/filtershow/filters/ImageFilterDualCamFusion.java +++ b/src/com/android/gallery3d/filtershow/filters/ImageFilterDualCamFusion.java @@ -40,7 +40,7 @@ import android.graphics.RectF; import android.util.Log; import android.widget.Toast; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.filtershow.cache.BitmapCache; import com.android.gallery3d.filtershow.cache.ImageLoader; import com.android.gallery3d.filtershow.imageshow.GeometryMathUtils; diff --git a/src/com/android/gallery3d/filtershow/filters/ImageFilterDualCamSketch.java b/src/com/android/gallery3d/filtershow/filters/ImageFilterDualCamSketch.java index a9ee61ca5..8d61a32c3 100644 --- a/src/com/android/gallery3d/filtershow/filters/ImageFilterDualCamSketch.java +++ b/src/com/android/gallery3d/filtershow/filters/ImageFilterDualCamSketch.java @@ -39,7 +39,7 @@ import android.graphics.RectF; import android.util.Log; import android.widget.Toast; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.filtershow.cache.BitmapCache; import com.android.gallery3d.filtershow.cache.ImageLoader; import com.android.gallery3d.filtershow.imageshow.GeometryMathUtils; diff --git a/src/com/android/gallery3d/filtershow/filters/ImageFilterDualCamera.java b/src/com/android/gallery3d/filtershow/filters/ImageFilterDualCamera.java index 318833dfa..fa38b0ecb 100644 --- a/src/com/android/gallery3d/filtershow/filters/ImageFilterDualCamera.java +++ b/src/com/android/gallery3d/filtershow/filters/ImageFilterDualCamera.java @@ -39,7 +39,7 @@ import android.graphics.RectF; import android.util.Log; import android.widget.Toast; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.filtershow.cache.BitmapCache; import com.android.gallery3d.filtershow.cache.ImageLoader; import com.android.gallery3d.filtershow.imageshow.GeometryMathUtils; diff --git a/src/com/android/gallery3d/filtershow/filters/ImageFilterEdge.java b/src/com/android/gallery3d/filtershow/filters/ImageFilterEdge.java index 2d0d7653d..12e43849c 100644 --- a/src/com/android/gallery3d/filtershow/filters/ImageFilterEdge.java +++ b/src/com/android/gallery3d/filtershow/filters/ImageFilterEdge.java @@ -18,7 +18,7 @@ package com.android.gallery3d.filtershow.filters; import android.graphics.Bitmap; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; public class ImageFilterEdge extends SimpleImageFilter { private static final String SERIALIZATION_NAME = "EDGE"; diff --git a/src/com/android/gallery3d/filtershow/filters/ImageFilterExposure.java b/src/com/android/gallery3d/filtershow/filters/ImageFilterExposure.java index 69eab7330..e65cbc225 100644 --- a/src/com/android/gallery3d/filtershow/filters/ImageFilterExposure.java +++ b/src/com/android/gallery3d/filtershow/filters/ImageFilterExposure.java @@ -16,7 +16,7 @@ package com.android.gallery3d.filtershow.filters; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import android.graphics.Bitmap; diff --git a/src/com/android/gallery3d/filtershow/filters/ImageFilterGrad.java b/src/com/android/gallery3d/filtershow/filters/ImageFilterGrad.java index 4d5a79c04..aa3162657 100644 --- a/src/com/android/gallery3d/filtershow/filters/ImageFilterGrad.java +++ b/src/com/android/gallery3d/filtershow/filters/ImageFilterGrad.java @@ -20,7 +20,7 @@ import android.graphics.Bitmap; import android.graphics.Color; import android.graphics.Matrix; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.filtershow.pipeline.FilterEnvironment; import android.graphics.Bitmap; @@ -33,7 +33,7 @@ import android.renderscript.Script.LaunchOptions; import android.renderscript.Type; import android.util.Log; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.filtershow.pipeline.FilterEnvironment; public class ImageFilterGrad extends ImageFilterRS { diff --git a/src/com/android/gallery3d/filtershow/filters/ImageFilterHighlights.java b/src/com/android/gallery3d/filtershow/filters/ImageFilterHighlights.java index 4c837e0bf..c8af46baa 100644 --- a/src/com/android/gallery3d/filtershow/filters/ImageFilterHighlights.java +++ b/src/com/android/gallery3d/filtershow/filters/ImageFilterHighlights.java @@ -18,7 +18,7 @@ package com.android.gallery3d.filtershow.filters; import android.graphics.Bitmap; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; public class ImageFilterHighlights extends SimpleImageFilter { private static final String SERIALIZATION_NAME = "HIGHLIGHTS"; diff --git a/src/com/android/gallery3d/filtershow/filters/ImageFilterHue.java b/src/com/android/gallery3d/filtershow/filters/ImageFilterHue.java index b87c25490..2ca226509 100644 --- a/src/com/android/gallery3d/filtershow/filters/ImageFilterHue.java +++ b/src/com/android/gallery3d/filtershow/filters/ImageFilterHue.java @@ -16,7 +16,7 @@ package com.android.gallery3d.filtershow.filters; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.filtershow.editors.BasicEditor; import android.graphics.Bitmap; diff --git a/src/com/android/gallery3d/filtershow/filters/ImageFilterKMeans.java b/src/com/android/gallery3d/filtershow/filters/ImageFilterKMeans.java index 77cdf47b3..0966a9fa3 100644 --- a/src/com/android/gallery3d/filtershow/filters/ImageFilterKMeans.java +++ b/src/com/android/gallery3d/filtershow/filters/ImageFilterKMeans.java @@ -19,7 +19,7 @@ package com.android.gallery3d.filtershow.filters; import android.graphics.Bitmap; import android.text.format.Time; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; public class ImageFilterKMeans extends SimpleImageFilter { private static final String SERIALIZATION_NAME = "KMEANS"; diff --git a/src/com/android/gallery3d/filtershow/filters/ImageFilterMakeupBigeye.java b/src/com/android/gallery3d/filtershow/filters/ImageFilterMakeupBigeye.java index 64067881e..ab10d6a26 100644 --- a/src/com/android/gallery3d/filtershow/filters/ImageFilterMakeupBigeye.java +++ b/src/com/android/gallery3d/filtershow/filters/ImageFilterMakeupBigeye.java @@ -19,7 +19,7 @@ package com.android.gallery3d.filtershow.filters; import android.graphics.Bitmap; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.thundersoft.hz.selfportrait.detect.FaceInfo; import com.thundersoft.hz.selfportrait.makeup.engine.MakeupEngine; diff --git a/src/com/android/gallery3d/filtershow/filters/ImageFilterMakeupSoften.java b/src/com/android/gallery3d/filtershow/filters/ImageFilterMakeupSoften.java index 8587158c3..b92ab34a0 100644 --- a/src/com/android/gallery3d/filtershow/filters/ImageFilterMakeupSoften.java +++ b/src/com/android/gallery3d/filtershow/filters/ImageFilterMakeupSoften.java @@ -19,7 +19,7 @@ package com.android.gallery3d.filtershow.filters; import android.graphics.Bitmap; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.thundersoft.hz.selfportrait.detect.FaceInfo; import com.thundersoft.hz.selfportrait.makeup.engine.MakeupEngine; diff --git a/src/com/android/gallery3d/filtershow/filters/ImageFilterMakeupTrimface.java b/src/com/android/gallery3d/filtershow/filters/ImageFilterMakeupTrimface.java index 4b0499036..d4a1e47a1 100644 --- a/src/com/android/gallery3d/filtershow/filters/ImageFilterMakeupTrimface.java +++ b/src/com/android/gallery3d/filtershow/filters/ImageFilterMakeupTrimface.java @@ -19,7 +19,7 @@ package com.android.gallery3d.filtershow.filters; import android.graphics.Bitmap; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.thundersoft.hz.selfportrait.detect.FaceInfo; import com.thundersoft.hz.selfportrait.makeup.engine.MakeupEngine; diff --git a/src/com/android/gallery3d/filtershow/filters/ImageFilterMakeupWhiten.java b/src/com/android/gallery3d/filtershow/filters/ImageFilterMakeupWhiten.java index e60be84d7..817a977bd 100644 --- a/src/com/android/gallery3d/filtershow/filters/ImageFilterMakeupWhiten.java +++ b/src/com/android/gallery3d/filtershow/filters/ImageFilterMakeupWhiten.java @@ -19,7 +19,7 @@ package com.android.gallery3d.filtershow.filters; import android.graphics.Bitmap; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.thundersoft.hz.selfportrait.detect.FaceInfo; import com.thundersoft.hz.selfportrait.makeup.engine.MakeupEngine; diff --git a/src/com/android/gallery3d/filtershow/filters/ImageFilterNegative.java b/src/com/android/gallery3d/filtershow/filters/ImageFilterNegative.java index 9a1a84030..88cc08f65 100644 --- a/src/com/android/gallery3d/filtershow/filters/ImageFilterNegative.java +++ b/src/com/android/gallery3d/filtershow/filters/ImageFilterNegative.java @@ -2,7 +2,7 @@ package com.android.gallery3d.filtershow.filters; import android.graphics.Bitmap; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.filtershow.editors.ImageOnlyEditor; public class ImageFilterNegative extends ImageFilter { diff --git a/src/com/android/gallery3d/filtershow/filters/ImageFilterRS.java b/src/com/android/gallery3d/filtershow/filters/ImageFilterRS.java index 3c54456b6..3a2ad91c7 100644 --- a/src/com/android/gallery3d/filtershow/filters/ImageFilterRS.java +++ b/src/com/android/gallery3d/filtershow/filters/ImageFilterRS.java @@ -21,7 +21,7 @@ import android.graphics.BitmapFactory; import android.renderscript.*; import android.util.Log; import android.content.res.Resources; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.filtershow.pipeline.PipelineInterface; public abstract class ImageFilterRS extends ImageFilter { diff --git a/src/com/android/gallery3d/filtershow/filters/ImageFilterSaturated.java b/src/com/android/gallery3d/filtershow/filters/ImageFilterSaturated.java index c3124ff77..7f5d7e870 100644 --- a/src/com/android/gallery3d/filtershow/filters/ImageFilterSaturated.java +++ b/src/com/android/gallery3d/filtershow/filters/ImageFilterSaturated.java @@ -16,7 +16,7 @@ package com.android.gallery3d.filtershow.filters; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import android.graphics.Bitmap; diff --git a/src/com/android/gallery3d/filtershow/filters/ImageFilterShadows.java b/src/com/android/gallery3d/filtershow/filters/ImageFilterShadows.java index bd119bbc9..2b30030bc 100644 --- a/src/com/android/gallery3d/filtershow/filters/ImageFilterShadows.java +++ b/src/com/android/gallery3d/filtershow/filters/ImageFilterShadows.java @@ -16,7 +16,7 @@ package com.android.gallery3d.filtershow.filters; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import android.graphics.Bitmap; diff --git a/src/com/android/gallery3d/filtershow/filters/ImageFilterSharpen.java b/src/com/android/gallery3d/filtershow/filters/ImageFilterSharpen.java index 783afee25..4881d54e0 100644 --- a/src/com/android/gallery3d/filtershow/filters/ImageFilterSharpen.java +++ b/src/com/android/gallery3d/filtershow/filters/ImageFilterSharpen.java @@ -16,7 +16,7 @@ package com.android.gallery3d.filtershow.filters; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.filtershow.editors.BasicEditor; public class ImageFilterSharpen extends ImageFilterRS { diff --git a/src/com/android/gallery3d/filtershow/filters/ImageFilterVibrance.java b/src/com/android/gallery3d/filtershow/filters/ImageFilterVibrance.java index 86be9a155..575bb4304 100644 --- a/src/com/android/gallery3d/filtershow/filters/ImageFilterVibrance.java +++ b/src/com/android/gallery3d/filtershow/filters/ImageFilterVibrance.java @@ -16,7 +16,7 @@ package com.android.gallery3d.filtershow.filters; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import android.graphics.Bitmap; diff --git a/src/com/android/gallery3d/filtershow/filters/ImageFilterVignette.java b/src/com/android/gallery3d/filtershow/filters/ImageFilterVignette.java index 0d0dd3b08..dd88f9283 100644 --- a/src/com/android/gallery3d/filtershow/filters/ImageFilterVignette.java +++ b/src/com/android/gallery3d/filtershow/filters/ImageFilterVignette.java @@ -21,7 +21,7 @@ import android.graphics.Bitmap; import android.graphics.Canvas; import android.graphics.Matrix; import android.graphics.Rect; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.filtershow.imageshow.MasterImage; import com.android.gallery3d.filtershow.pipeline.FilterEnvironment; import android.renderscript.Allocation; diff --git a/src/com/android/gallery3d/filtershow/filters/ImageFilterWBalance.java b/src/com/android/gallery3d/filtershow/filters/ImageFilterWBalance.java index 7aa19a4a9..0ceaca382 100644 --- a/src/com/android/gallery3d/filtershow/filters/ImageFilterWBalance.java +++ b/src/com/android/gallery3d/filtershow/filters/ImageFilterWBalance.java @@ -16,7 +16,7 @@ package com.android.gallery3d.filtershow.filters; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.filtershow.editors.ImageOnlyEditor; import android.graphics.Bitmap; diff --git a/src/com/android/gallery3d/filtershow/filters/SeeStraightActs.java b/src/com/android/gallery3d/filtershow/filters/SeeStraightActs.java index 7ecae02cf..664b7b8b5 100644 --- a/src/com/android/gallery3d/filtershow/filters/SeeStraightActs.java +++ b/src/com/android/gallery3d/filtershow/filters/SeeStraightActs.java @@ -33,7 +33,7 @@ import android.graphics.Bitmap; import android.util.Log; import android.widget.Toast; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.filtershow.editors.SeeStraightEditor; public class SeeStraightActs extends SimpleImageFilter { diff --git a/src/com/android/gallery3d/filtershow/filters/TrueScannerActs.java b/src/com/android/gallery3d/filtershow/filters/TrueScannerActs.java index 63c3a1299..143d4ddf6 100644 --- a/src/com/android/gallery3d/filtershow/filters/TrueScannerActs.java +++ b/src/com/android/gallery3d/filtershow/filters/TrueScannerActs.java @@ -33,7 +33,7 @@ import android.graphics.Bitmap; import android.util.Log; import android.widget.Toast; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.app.GalleryActivity; import com.android.gallery3d.filtershow.FilterShowActivity; import com.android.gallery3d.filtershow.editors.TrueScannerEditor; diff --git a/src/com/android/gallery3d/filtershow/filters/TrueScannerWhiteBoardActs.java b/src/com/android/gallery3d/filtershow/filters/TrueScannerWhiteBoardActs.java index 9b4eedb4e..62f68b2a5 100644 --- a/src/com/android/gallery3d/filtershow/filters/TrueScannerWhiteBoardActs.java +++ b/src/com/android/gallery3d/filtershow/filters/TrueScannerWhiteBoardActs.java @@ -30,7 +30,7 @@ package com.android.gallery3d.filtershow.filters; import android.graphics.Bitmap; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.filtershow.editors.TrueScannerEditor; public class TrueScannerWhiteBoardActs extends TrueScannerActs { diff --git a/src/com/android/gallery3d/filtershow/imageshow/EclipseControl.java b/src/com/android/gallery3d/filtershow/imageshow/EclipseControl.java index b94e52e48..3e6d0e71f 100644 --- a/src/com/android/gallery3d/filtershow/imageshow/EclipseControl.java +++ b/src/com/android/gallery3d/filtershow/imageshow/EclipseControl.java @@ -27,7 +27,7 @@ import android.graphics.RectF; import android.graphics.Shader; import android.util.Log; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; public class EclipseControl { private float mCenterX = Float.NaN; diff --git a/src/com/android/gallery3d/filtershow/imageshow/GradControl.java b/src/com/android/gallery3d/filtershow/imageshow/GradControl.java index 29870154b..4b1ab7b72 100644 --- a/src/com/android/gallery3d/filtershow/imageshow/GradControl.java +++ b/src/com/android/gallery3d/filtershow/imageshow/GradControl.java @@ -27,7 +27,7 @@ import android.graphics.RadialGradient; import android.graphics.Rect; import android.graphics.Shader; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; public class GradControl { private float mPoint1X = Float.NaN; // used to flag parameters have not been set diff --git a/src/com/android/gallery3d/filtershow/imageshow/ImageCrop.java b/src/com/android/gallery3d/filtershow/imageshow/ImageCrop.java index e2de11e8c..294fbb7a7 100644 --- a/src/com/android/gallery3d/filtershow/imageshow/ImageCrop.java +++ b/src/com/android/gallery3d/filtershow/imageshow/ImageCrop.java @@ -28,7 +28,7 @@ import android.util.AttributeSet; import android.util.Log; import android.view.MotionEvent; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.filtershow.crop.CropDrawingUtils; import com.android.gallery3d.filtershow.crop.CropMath; import com.android.gallery3d.filtershow.crop.CropObject; diff --git a/src/com/android/gallery3d/filtershow/imageshow/ImageCurves.java b/src/com/android/gallery3d/filtershow/imageshow/ImageCurves.java index 3fb75c6df..11964dfeb 100644 --- a/src/com/android/gallery3d/filtershow/imageshow/ImageCurves.java +++ b/src/com/android/gallery3d/filtershow/imageshow/ImageCurves.java @@ -33,7 +33,7 @@ import android.widget.Button; import android.widget.LinearLayout; import android.widget.PopupMenu; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.filtershow.FilterShowActivity; import com.android.gallery3d.filtershow.editors.Editor; import com.android.gallery3d.filtershow.editors.EditorCurves; diff --git a/src/com/android/gallery3d/filtershow/imageshow/ImageDraw.java b/src/com/android/gallery3d/filtershow/imageshow/ImageDraw.java index 795a24781..e12806977 100644 --- a/src/com/android/gallery3d/filtershow/imageshow/ImageDraw.java +++ b/src/com/android/gallery3d/filtershow/imageshow/ImageDraw.java @@ -20,7 +20,7 @@ import android.os.Handler; import android.util.AttributeSet; import android.view.MotionEvent; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.filtershow.editors.EditorDraw; import com.android.gallery3d.filtershow.filters.FilterDrawRepresentation; import com.android.gallery3d.filtershow.filters.ImageFilterDraw; diff --git a/src/com/android/gallery3d/filtershow/imageshow/ImageGrad.java b/src/com/android/gallery3d/filtershow/imageshow/ImageGrad.java index b55cc2bc4..d9b8a53f0 100644 --- a/src/com/android/gallery3d/filtershow/imageshow/ImageGrad.java +++ b/src/com/android/gallery3d/filtershow/imageshow/ImageGrad.java @@ -22,7 +22,7 @@ import android.graphics.Matrix; import android.util.AttributeSet; import android.view.MotionEvent; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.filtershow.editors.EditorGrad; import com.android.gallery3d.filtershow.filters.FilterGradRepresentation; diff --git a/src/com/android/gallery3d/filtershow/imageshow/ImageShow.java b/src/com/android/gallery3d/filtershow/imageshow/ImageShow.java index adbb63da5..7d5f57a7a 100644 --- a/src/com/android/gallery3d/filtershow/imageshow/ImageShow.java +++ b/src/com/android/gallery3d/filtershow/imageshow/ImageShow.java @@ -47,7 +47,7 @@ import android.view.View; import android.widget.ImageButton; import android.widget.LinearLayout; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.filtershow.FilterShowActivity; import com.android.gallery3d.filtershow.filters.FilterMirrorRepresentation; import com.android.gallery3d.filtershow.filters.FilterRepresentation; diff --git a/src/com/android/gallery3d/filtershow/info/InfoPanel.java b/src/com/android/gallery3d/filtershow/info/InfoPanel.java index 151624c80..c34faebaa 100644 --- a/src/com/android/gallery3d/filtershow/info/InfoPanel.java +++ b/src/com/android/gallery3d/filtershow/info/InfoPanel.java @@ -31,7 +31,7 @@ import android.widget.ImageButton; import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.TextView; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.exif.ExifInterface; import com.android.gallery3d.exif.ExifTag; import com.android.gallery3d.filtershow.cache.ImageLoader; diff --git a/src/com/android/gallery3d/filtershow/pipeline/ImagePreset.java b/src/com/android/gallery3d/filtershow/pipeline/ImagePreset.java index 1fb88a1c5..1640dac66 100644 --- a/src/com/android/gallery3d/filtershow/pipeline/ImagePreset.java +++ b/src/com/android/gallery3d/filtershow/pipeline/ImagePreset.java @@ -30,7 +30,7 @@ import android.util.JsonReader; import android.util.JsonWriter; import android.util.Log; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.filtershow.cache.ImageLoader; import com.android.gallery3d.filtershow.filters.BaseFiltersManager; import com.android.gallery3d.filtershow.filters.FilterCropRepresentation; diff --git a/src/com/android/gallery3d/filtershow/pipeline/ProcessingService.java b/src/com/android/gallery3d/filtershow/pipeline/ProcessingService.java index 72f692534..e1a83600b 100644 --- a/src/com/android/gallery3d/filtershow/pipeline/ProcessingService.java +++ b/src/com/android/gallery3d/filtershow/pipeline/ProcessingService.java @@ -30,7 +30,7 @@ import android.os.Bundle; import android.os.IBinder; import android.util.Log; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.filtershow.FilterShowActivity; import com.android.gallery3d.filtershow.filters.FiltersManager; import com.android.gallery3d.filtershow.filters.ImageFilter; @@ -330,6 +330,6 @@ public class ProcessingService extends Service { } static { - System.loadLibrary("jni_filtershow_filters"); + System.loadLibrary("jni_gallery_filters"); } } diff --git a/src/com/android/gallery3d/filtershow/presets/PresetManagementDialog.java b/src/com/android/gallery3d/filtershow/presets/PresetManagementDialog.java index 63a6165e3..4d7fdafb4 100644 --- a/src/com/android/gallery3d/filtershow/presets/PresetManagementDialog.java +++ b/src/com/android/gallery3d/filtershow/presets/PresetManagementDialog.java @@ -24,7 +24,7 @@ import android.view.ViewGroup; import android.widget.EditText; import android.widget.ImageView; import android.widget.ListView; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.filtershow.FilterShowActivity; public class PresetManagementDialog extends DialogFragment implements View.OnClickListener { diff --git a/src/com/android/gallery3d/filtershow/presets/UserPresetsAdapter.java b/src/com/android/gallery3d/filtershow/presets/UserPresetsAdapter.java index dab9ea454..be48cccf3 100644 --- a/src/com/android/gallery3d/filtershow/presets/UserPresetsAdapter.java +++ b/src/com/android/gallery3d/filtershow/presets/UserPresetsAdapter.java @@ -25,7 +25,7 @@ import android.widget.ArrayAdapter; import android.widget.EditText; import android.widget.ImageButton; import android.widget.ImageView; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.filtershow.category.Action; import com.android.gallery3d.filtershow.category.CategoryView; import com.android.gallery3d.filtershow.filters.FilterRepresentation; diff --git a/src/com/android/gallery3d/filtershow/state/StateAdapter.java b/src/com/android/gallery3d/filtershow/state/StateAdapter.java index 522585280..cf3499d12 100644 --- a/src/com/android/gallery3d/filtershow/state/StateAdapter.java +++ b/src/com/android/gallery3d/filtershow/state/StateAdapter.java @@ -21,7 +21,7 @@ import android.util.Log; import android.view.View; import android.view.ViewGroup; import android.widget.ArrayAdapter; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.filtershow.FilterShowActivity; import com.android.gallery3d.filtershow.editors.ImageOnlyEditor; import com.android.gallery3d.filtershow.filters.FilterRepresentation; diff --git a/src/com/android/gallery3d/filtershow/state/StatePanel.java b/src/com/android/gallery3d/filtershow/state/StatePanel.java index 192400315..e7ea92b7a 100644 --- a/src/com/android/gallery3d/filtershow/state/StatePanel.java +++ b/src/com/android/gallery3d/filtershow/state/StatePanel.java @@ -24,7 +24,7 @@ import android.view.View; import android.view.ViewGroup; import android.widget.ImageButton; import android.widget.LinearLayout; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.filtershow.category.MainPanel; import com.android.gallery3d.filtershow.imageshow.MasterImage; import com.android.gallery3d.util.FilterShowHelper; diff --git a/src/com/android/gallery3d/filtershow/state/StatePanelTrack.java b/src/com/android/gallery3d/filtershow/state/StatePanelTrack.java index 4ddb363db..105c6715f 100644 --- a/src/com/android/gallery3d/filtershow/state/StatePanelTrack.java +++ b/src/com/android/gallery3d/filtershow/state/StatePanelTrack.java @@ -31,7 +31,7 @@ import android.view.View; import android.view.ViewGroup; import android.widget.Adapter; import android.widget.LinearLayout; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.filtershow.FilterShowActivity; import com.android.gallery3d.filtershow.editors.ImageOnlyEditor; import com.android.gallery3d.filtershow.filters.FilterRepresentation; diff --git a/src/com/android/gallery3d/filtershow/state/StateView.java b/src/com/android/gallery3d/filtershow/state/StateView.java index a43cd47ba..9035b8a48 100644 --- a/src/com/android/gallery3d/filtershow/state/StateView.java +++ b/src/com/android/gallery3d/filtershow/state/StateView.java @@ -22,7 +22,7 @@ import android.graphics.*; import android.view.MotionEvent; import android.view.View; import android.widget.LinearLayout; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.filtershow.FilterShowActivity; import com.android.gallery3d.filtershow.category.SwipableView; import com.android.gallery3d.filtershow.filters.FilterRepresentation; diff --git a/src/com/android/gallery3d/filtershow/tools/SaveImage.java b/src/com/android/gallery3d/filtershow/tools/SaveImage.java index ca65d6c82..0f615da25 100644 --- a/src/com/android/gallery3d/filtershow/tools/SaveImage.java +++ b/src/com/android/gallery3d/filtershow/tools/SaveImage.java @@ -44,7 +44,7 @@ import android.provider.MediaStore.Images.ImageColumns; import android.util.Log; import android.widget.Toast; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.common.Utils; import com.android.gallery3d.exif.ExifInterface; import com.android.gallery3d.filtershow.FilterShowActivity; diff --git a/src/com/android/gallery3d/filtershow/tools/XmpPresets.java b/src/com/android/gallery3d/filtershow/tools/XmpPresets.java index 7095e742d..dfb0bc23f 100644 --- a/src/com/android/gallery3d/filtershow/tools/XmpPresets.java +++ b/src/com/android/gallery3d/filtershow/tools/XmpPresets.java @@ -23,7 +23,7 @@ import android.util.Log; import com.adobe.xmp.XMPException; import com.adobe.xmp.XMPMeta; import com.adobe.xmp.XMPMetaFactory; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.common.Utils; import com.android.gallery3d.filtershow.imageshow.MasterImage; import com.android.gallery3d.filtershow.pipeline.ImagePreset; diff --git a/src/com/android/gallery3d/filtershow/ui/ExportDialog.java b/src/com/android/gallery3d/filtershow/ui/ExportDialog.java index 15992797b..d9e695cfb 100644 --- a/src/com/android/gallery3d/filtershow/ui/ExportDialog.java +++ b/src/com/android/gallery3d/filtershow/ui/ExportDialog.java @@ -32,7 +32,7 @@ import android.widget.EditText; import android.widget.SeekBar; import android.widget.TextView; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.filtershow.FilterShowActivity; import com.android.gallery3d.filtershow.imageshow.MasterImage; import com.android.gallery3d.filtershow.pipeline.ImagePreset; diff --git a/src/com/android/gallery3d/filtershow/ui/FramedTextButton.java b/src/com/android/gallery3d/filtershow/ui/FramedTextButton.java index c1e4109d2..8957f2d6c 100644 --- a/src/com/android/gallery3d/filtershow/ui/FramedTextButton.java +++ b/src/com/android/gallery3d/filtershow/ui/FramedTextButton.java @@ -25,7 +25,7 @@ import android.graphics.Rect; import android.util.AttributeSet; import android.widget.ImageButton; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; public class FramedTextButton extends ImageButton { private static final String LOGTAG = "FramedTextButton"; diff --git a/src/com/android/gallery3d/gadget/PhotoAppWidgetProvider.java b/src/com/android/gallery3d/gadget/PhotoAppWidgetProvider.java index 91e5cbeb6..0b26e4896 100644 --- a/src/com/android/gallery3d/gadget/PhotoAppWidgetProvider.java +++ b/src/com/android/gallery3d/gadget/PhotoAppWidgetProvider.java @@ -32,7 +32,7 @@ import android.util.Log; import android.view.View; import android.widget.RemoteViews; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.common.ApiHelper; import com.android.gallery3d.gadget.WidgetDatabaseHelper.Entry; import com.android.gallery3d.onetimeinitializer.GalleryWidgetMigrator; diff --git a/src/com/android/gallery3d/gadget/WidgetClickHandler.java b/src/com/android/gallery3d/gadget/WidgetClickHandler.java index e5b0a376c..4a9096649 100644 --- a/src/com/android/gallery3d/gadget/WidgetClickHandler.java +++ b/src/com/android/gallery3d/gadget/WidgetClickHandler.java @@ -26,7 +26,7 @@ import android.os.Bundle; import android.util.Log; import android.widget.Toast; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.app.GalleryActivity; import com.android.gallery3d.app.PhotoPage; import com.android.gallery3d.common.ApiHelper; diff --git a/src/com/android/gallery3d/gadget/WidgetConfigure.java b/src/com/android/gallery3d/gadget/WidgetConfigure.java index 2a4c6cfe4..f674f3038 100644 --- a/src/com/android/gallery3d/gadget/WidgetConfigure.java +++ b/src/com/android/gallery3d/gadget/WidgetConfigure.java @@ -26,7 +26,7 @@ import android.os.Bundle; import android.util.Log; import android.widget.RemoteViews; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.app.AlbumPicker; import com.android.gallery3d.app.DialogPicker; import com.android.gallery3d.app.GalleryApp; diff --git a/src/com/android/gallery3d/gadget/WidgetService.java b/src/com/android/gallery3d/gadget/WidgetService.java index 751aaef9d..dd05b6732 100644 --- a/src/com/android/gallery3d/gadget/WidgetService.java +++ b/src/com/android/gallery3d/gadget/WidgetService.java @@ -26,7 +26,7 @@ import android.view.View; import android.widget.RemoteViews; import android.widget.RemoteViewsService; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.app.GalleryApp; import com.android.gallery3d.common.ApiHelper; import com.android.gallery3d.data.ContentListener; diff --git a/src/com/android/gallery3d/gadget/WidgetTypeChooser.java b/src/com/android/gallery3d/gadget/WidgetTypeChooser.java index 1694f1c04..177817cc6 100644 --- a/src/com/android/gallery3d/gadget/WidgetTypeChooser.java +++ b/src/com/android/gallery3d/gadget/WidgetTypeChooser.java @@ -25,7 +25,7 @@ import android.widget.Button; import android.widget.RadioGroup; import android.widget.RadioGroup.OnCheckedChangeListener; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; public class WidgetTypeChooser extends Activity { diff --git a/src/com/android/gallery3d/gadget/WidgetUtils.java b/src/com/android/gallery3d/gadget/WidgetUtils.java index c20c186df..8f37ecc3e 100644 --- a/src/com/android/gallery3d/gadget/WidgetUtils.java +++ b/src/com/android/gallery3d/gadget/WidgetUtils.java @@ -24,7 +24,7 @@ import android.graphics.Canvas; import android.graphics.Paint; import android.util.Log; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.data.MediaItem; import com.android.gallery3d.util.ThreadPool; diff --git a/src/com/android/gallery3d/ingest/IngestActivity.java b/src/com/android/gallery3d/ingest/IngestActivity.java index 46173d686..9cdacb871 100644 --- a/src/com/android/gallery3d/ingest/IngestActivity.java +++ b/src/com/android/gallery3d/ingest/IngestActivity.java @@ -16,7 +16,7 @@ package com.android.gallery3d.ingest; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.ingest.adapter.CheckBroker; import com.android.gallery3d.ingest.adapter.MtpAdapter; import com.android.gallery3d.ingest.adapter.MtpPagerAdapter; diff --git a/src/com/android/gallery3d/ingest/IngestService.java b/src/com/android/gallery3d/ingest/IngestService.java index 98aa7f5c6..361fb8020 100644 --- a/src/com/android/gallery3d/ingest/IngestService.java +++ b/src/com/android/gallery3d/ingest/IngestService.java @@ -16,7 +16,7 @@ package com.android.gallery3d.ingest; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.ingest.data.ImportTask; import com.android.gallery3d.ingest.data.IngestObjectInfo; import com.android.gallery3d.ingest.data.MtpClient; diff --git a/src/com/android/gallery3d/ingest/adapter/MtpAdapter.java b/src/com/android/gallery3d/ingest/adapter/MtpAdapter.java index c3ce59f4e..766bfef5c 100644 --- a/src/com/android/gallery3d/ingest/adapter/MtpAdapter.java +++ b/src/com/android/gallery3d/ingest/adapter/MtpAdapter.java @@ -16,7 +16,7 @@ package com.android.gallery3d.ingest.adapter; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.ingest.data.IngestObjectInfo; import com.android.gallery3d.ingest.data.MtpDeviceIndex; import com.android.gallery3d.ingest.data.MtpDeviceIndex.SortOrder; diff --git a/src/com/android/gallery3d/ingest/adapter/MtpPagerAdapter.java b/src/com/android/gallery3d/ingest/adapter/MtpPagerAdapter.java index 9fe650c17..889e3ddc5 100644 --- a/src/com/android/gallery3d/ingest/adapter/MtpPagerAdapter.java +++ b/src/com/android/gallery3d/ingest/adapter/MtpPagerAdapter.java @@ -16,7 +16,7 @@ package com.android.gallery3d.ingest.adapter; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.ingest.data.IngestObjectInfo; import com.android.gallery3d.ingest.data.MtpDeviceIndex; import com.android.gallery3d.ingest.data.MtpDeviceIndex.SortOrder; diff --git a/src/com/android/gallery3d/ingest/ui/DateTileView.java b/src/com/android/gallery3d/ingest/ui/DateTileView.java index cd31e82a9..fc94e6a8e 100644 --- a/src/com/android/gallery3d/ingest/ui/DateTileView.java +++ b/src/com/android/gallery3d/ingest/ui/DateTileView.java @@ -16,7 +16,7 @@ package com.android.gallery3d.ingest.ui; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.ingest.data.SimpleDate; import android.content.Context; diff --git a/src/com/android/gallery3d/ingest/ui/MtpFullscreenView.java b/src/com/android/gallery3d/ingest/ui/MtpFullscreenView.java index 00785dde0..b41129ded 100644 --- a/src/com/android/gallery3d/ingest/ui/MtpFullscreenView.java +++ b/src/com/android/gallery3d/ingest/ui/MtpFullscreenView.java @@ -16,7 +16,7 @@ package com.android.gallery3d.ingest.ui; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.ingest.adapter.CheckBroker; import android.content.Context; diff --git a/src/com/android/gallery3d/ingest/ui/MtpImageView.java b/src/com/android/gallery3d/ingest/ui/MtpImageView.java index 5362efd70..f28d677f2 100644 --- a/src/com/android/gallery3d/ingest/ui/MtpImageView.java +++ b/src/com/android/gallery3d/ingest/ui/MtpImageView.java @@ -16,7 +16,7 @@ package com.android.gallery3d.ingest.ui; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.ingest.data.BitmapWithMetadata; import com.android.gallery3d.ingest.data.IngestObjectInfo; import com.android.gallery3d.ingest.data.MtpBitmapFetch; diff --git a/src/com/android/gallery3d/ingest/ui/MtpThumbnailTileView.java b/src/com/android/gallery3d/ingest/ui/MtpThumbnailTileView.java index 844a75024..d78e41a91 100644 --- a/src/com/android/gallery3d/ingest/ui/MtpThumbnailTileView.java +++ b/src/com/android/gallery3d/ingest/ui/MtpThumbnailTileView.java @@ -16,7 +16,7 @@ package com.android.gallery3d.ingest.ui; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.ingest.data.IngestObjectInfo; import com.android.gallery3d.ingest.data.MtpBitmapFetch; diff --git a/src/com/android/gallery3d/ui/AbstractSlotRenderer.java b/src/com/android/gallery3d/ui/AbstractSlotRenderer.java index 0807814a3..d9a6bc07d 100644 --- a/src/com/android/gallery3d/ui/AbstractSlotRenderer.java +++ b/src/com/android/gallery3d/ui/AbstractSlotRenderer.java @@ -19,7 +19,7 @@ package com.android.gallery3d.ui; import android.content.Context; import android.graphics.Rect; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.data.MediaObject; import com.android.gallery3d.glrenderer.FadeOutTexture; import com.android.gallery3d.glrenderer.GLCanvas; diff --git a/src/com/android/gallery3d/ui/ActionModeHandler.java b/src/com/android/gallery3d/ui/ActionModeHandler.java index 126d7936c..4765c6838 100644 --- a/src/com/android/gallery3d/ui/ActionModeHandler.java +++ b/src/com/android/gallery3d/ui/ActionModeHandler.java @@ -34,7 +34,7 @@ import android.widget.ShareActionProvider; import android.widget.Toolbar; import android.widget.ShareActionProvider.OnShareTargetSelectedListener; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.app.AbstractGalleryActivity; import com.android.gallery3d.common.ApiHelper; import com.android.gallery3d.common.Utils; diff --git a/src/com/android/gallery3d/ui/AlbumLabelMaker.java b/src/com/android/gallery3d/ui/AlbumLabelMaker.java index 0216ffd7f..72144ae90 100644 --- a/src/com/android/gallery3d/ui/AlbumLabelMaker.java +++ b/src/com/android/gallery3d/ui/AlbumLabelMaker.java @@ -30,7 +30,7 @@ import android.text.TextPaint; import android.text.TextUtils; import android.view.View; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.data.DataSourceType; import com.android.photos.data.GalleryBitmapPool; import com.android.gallery3d.util.ThreadPool; diff --git a/src/com/android/gallery3d/ui/AlbumSetSlidingWindow.java b/src/com/android/gallery3d/ui/AlbumSetSlidingWindow.java index 8dd149647..4f462b485 100644 --- a/src/com/android/gallery3d/ui/AlbumSetSlidingWindow.java +++ b/src/com/android/gallery3d/ui/AlbumSetSlidingWindow.java @@ -19,7 +19,7 @@ package com.android.gallery3d.ui; import android.graphics.Bitmap; import android.os.Message; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.app.AbstractGalleryActivity; import com.android.gallery3d.app.AlbumSetDataLoader; import com.android.gallery3d.common.Utils; diff --git a/src/com/android/gallery3d/ui/AlbumSetSlotRenderer.java b/src/com/android/gallery3d/ui/AlbumSetSlotRenderer.java index 5c817e6de..264325a91 100644 --- a/src/com/android/gallery3d/ui/AlbumSetSlotRenderer.java +++ b/src/com/android/gallery3d/ui/AlbumSetSlotRenderer.java @@ -16,7 +16,7 @@ package com.android.gallery3d.ui; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.app.AbstractGalleryActivity; import com.android.gallery3d.app.AlbumSetDataLoader; import com.android.gallery3d.data.MediaObject; diff --git a/src/com/android/gallery3d/ui/DetailsHelper.java b/src/com/android/gallery3d/ui/DetailsHelper.java index 47296f655..860ace774 100644 --- a/src/com/android/gallery3d/ui/DetailsHelper.java +++ b/src/com/android/gallery3d/ui/DetailsHelper.java @@ -20,7 +20,7 @@ import android.graphics.Bitmap; import android.graphics.BitmapFactory; import android.view.View.MeasureSpec; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.app.AbstractGalleryActivity; import com.android.gallery3d.data.MediaDetails; import com.android.gallery3d.ui.DetailsAddressResolver.AddressResolvingListener; diff --git a/src/com/android/gallery3d/ui/DialogDetailsView.java b/src/com/android/gallery3d/ui/DialogDetailsView.java index 84d224fc4..04537c49a 100644 --- a/src/com/android/gallery3d/ui/DialogDetailsView.java +++ b/src/com/android/gallery3d/ui/DialogDetailsView.java @@ -32,7 +32,7 @@ import android.widget.BaseAdapter; import android.widget.ListView; import android.widget.TextView; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.app.AbstractGalleryActivity; import com.android.gallery3d.common.Utils; import com.android.gallery3d.data.MediaDetails; diff --git a/src/com/android/gallery3d/ui/EdgeEffect.java b/src/com/android/gallery3d/ui/EdgeEffect.java index 87ff0c5d3..1463655ff 100644 --- a/src/com/android/gallery3d/ui/EdgeEffect.java +++ b/src/com/android/gallery3d/ui/EdgeEffect.java @@ -22,7 +22,7 @@ import android.graphics.Rect; import android.view.animation.DecelerateInterpolator; import android.view.animation.Interpolator; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.glrenderer.GLCanvas; import com.android.gallery3d.glrenderer.ResourceTexture; diff --git a/src/com/android/gallery3d/ui/GLRootView.java b/src/com/android/gallery3d/ui/GLRootView.java index 4f3434593..3d17ee007 100644 --- a/src/com/android/gallery3d/ui/GLRootView.java +++ b/src/com/android/gallery3d/ui/GLRootView.java @@ -29,7 +29,7 @@ import android.view.MotionEvent; import android.view.SurfaceHolder; import android.view.View; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.anim.CanvasAnimation; import com.android.gallery3d.common.ApiHelper; import com.android.gallery3d.common.Utils; diff --git a/src/com/android/gallery3d/ui/Knob.java b/src/com/android/gallery3d/ui/Knob.java index b427c2f1e..cab7c6f8d 100644 --- a/src/com/android/gallery3d/ui/Knob.java +++ b/src/com/android/gallery3d/ui/Knob.java @@ -46,7 +46,7 @@ import android.widget.LinearLayout; import android.widget.TextView; import java.lang.Math; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; public class Knob extends FrameLayout { private static final int STROKE_WIDTH = 6; diff --git a/src/com/android/gallery3d/ui/ManageCacheDrawer.java b/src/com/android/gallery3d/ui/ManageCacheDrawer.java index d210bd1f1..68a201b9e 100644 --- a/src/com/android/gallery3d/ui/ManageCacheDrawer.java +++ b/src/com/android/gallery3d/ui/ManageCacheDrawer.java @@ -18,7 +18,7 @@ package com.android.gallery3d.ui; import android.content.Context; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.app.AbstractGalleryActivity; import com.android.gallery3d.data.DataSourceType; import com.android.gallery3d.data.MediaSet; diff --git a/src/com/android/gallery3d/ui/MenuExecutor.java b/src/com/android/gallery3d/ui/MenuExecutor.java index e65649bcf..c28fd097b 100644 --- a/src/com/android/gallery3d/ui/MenuExecutor.java +++ b/src/com/android/gallery3d/ui/MenuExecutor.java @@ -32,7 +32,7 @@ import android.support.v4.print.PrintHelper; import android.view.Menu; import android.view.MenuItem; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.app.AbstractGalleryActivity; import com.android.gallery3d.common.Utils; import com.android.gallery3d.data.DataManager; diff --git a/src/com/android/gallery3d/ui/PhotoView.java b/src/com/android/gallery3d/ui/PhotoView.java index 5c9992401..42888f33d 100644 --- a/src/com/android/gallery3d/ui/PhotoView.java +++ b/src/com/android/gallery3d/ui/PhotoView.java @@ -28,7 +28,7 @@ import android.view.MotionEvent; import android.view.View.MeasureSpec; import android.view.animation.AccelerateInterpolator; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.app.AbstractGalleryActivity; import com.android.gallery3d.common.ApiHelper; import com.android.gallery3d.common.Utils; diff --git a/src/com/android/gallery3d/ui/PopupList.java b/src/com/android/gallery3d/ui/PopupList.java index a03e27ca2..efbddd3ea 100644 --- a/src/com/android/gallery3d/ui/PopupList.java +++ b/src/com/android/gallery3d/ui/PopupList.java @@ -33,7 +33,7 @@ import android.widget.ListView; import android.widget.PopupWindow; import android.widget.TextView; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import java.util.ArrayList; diff --git a/src/com/android/gallery3d/ui/ProgressSpinner.java b/src/com/android/gallery3d/ui/ProgressSpinner.java index 1b31af278..1d2f3cb00 100644 --- a/src/com/android/gallery3d/ui/ProgressSpinner.java +++ b/src/com/android/gallery3d/ui/ProgressSpinner.java @@ -18,7 +18,7 @@ package com.android.gallery3d.ui; import android.content.Context; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.glrenderer.GLCanvas; import com.android.gallery3d.glrenderer.ResourceTexture; diff --git a/src/com/android/gallery3d/ui/SelectionMenu.java b/src/com/android/gallery3d/ui/SelectionMenu.java index 5b0828328..4ee60b437 100644 --- a/src/com/android/gallery3d/ui/SelectionMenu.java +++ b/src/com/android/gallery3d/ui/SelectionMenu.java @@ -21,7 +21,7 @@ import android.view.View; import android.view.View.OnClickListener; import android.widget.Button; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.ui.PopupList.OnPopupItemClickListener; public class SelectionMenu implements OnClickListener { diff --git a/src/com/android/gallery3d/ui/SlotView.java b/src/com/android/gallery3d/ui/SlotView.java index 90080ff9e..92ad7db93 100644 --- a/src/com/android/gallery3d/ui/SlotView.java +++ b/src/com/android/gallery3d/ui/SlotView.java @@ -25,7 +25,7 @@ import android.view.MotionEvent; import android.view.View; import android.view.animation.DecelerateInterpolator; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.anim.Animation; import com.android.gallery3d.app.AbstractGalleryActivity; import com.android.gallery3d.common.Utils; diff --git a/src/com/android/gallery3d/ui/TimeLineTitleMaker.java b/src/com/android/gallery3d/ui/TimeLineTitleMaker.java index 7a2c9e050..52a3af28f 100755 --- a/src/com/android/gallery3d/ui/TimeLineTitleMaker.java +++ b/src/com/android/gallery3d/ui/TimeLineTitleMaker.java @@ -33,7 +33,7 @@ import android.view.View; import com.android.gallery3d.util.ThreadPool; import com.android.gallery3d.util.ThreadPool.JobContext; import com.android.photos.data.GalleryBitmapPool; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import java.util.Locale; diff --git a/src/com/android/gallery3d/ui/UndoBarView.java b/src/com/android/gallery3d/ui/UndoBarView.java index 42f12ae72..6ac2428bb 100644 --- a/src/com/android/gallery3d/ui/UndoBarView.java +++ b/src/com/android/gallery3d/ui/UndoBarView.java @@ -19,7 +19,7 @@ package com.android.gallery3d.ui; import android.content.Context; import android.view.MotionEvent; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.common.Utils; import com.android.gallery3d.glrenderer.GLCanvas; import com.android.gallery3d.glrenderer.NinePatchTexture; diff --git a/src/com/android/gallery3d/util/GalleryUtils.java b/src/com/android/gallery3d/util/GalleryUtils.java index 009da6cbe..6a511273a 100644 --- a/src/com/android/gallery3d/util/GalleryUtils.java +++ b/src/com/android/gallery3d/util/GalleryUtils.java @@ -41,7 +41,7 @@ import android.util.Log; import android.view.WindowManager; import android.widget.Toast; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.app.GalleryActivity; import com.android.gallery3d.app.PackagesMonitor; import com.android.gallery3d.common.ApiHelper; diff --git a/src/com/android/photos/AlbumFragment.java b/src/com/android/photos/AlbumFragment.java index 886ca68a3..312b295e2 100644 --- a/src/com/android/photos/AlbumFragment.java +++ b/src/com/android/photos/AlbumFragment.java @@ -30,7 +30,7 @@ import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.app.GalleryActivity; import com.android.photos.adapters.PhotoThumbnailAdapter; import com.android.photos.data.PhotoSetLoader; diff --git a/src/com/android/photos/AlbumSetFragment.java b/src/com/android/photos/AlbumSetFragment.java index bc5289ee1..69025ac3d 100644 --- a/src/com/android/photos/AlbumSetFragment.java +++ b/src/com/android/photos/AlbumSetFragment.java @@ -29,7 +29,7 @@ import android.view.View; import android.view.ViewGroup; import android.widget.GridView; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.photos.adapters.AlbumSetCursorAdapter; import com.android.photos.data.AlbumSetLoader; import com.android.photos.shims.LoaderCompatShim; diff --git a/src/com/android/photos/GalleryActivity.java b/src/com/android/photos/GalleryActivity.java index f3279fe07..490289f61 100644 --- a/src/com/android/photos/GalleryActivity.java +++ b/src/com/android/photos/GalleryActivity.java @@ -29,7 +29,7 @@ import android.view.Menu; import android.view.MenuItem; import android.view.ViewGroup; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import java.util.ArrayList; diff --git a/src/com/android/photos/MultiChoiceManager.java b/src/com/android/photos/MultiChoiceManager.java index 49519ca63..99685cbfe 100644 --- a/src/com/android/photos/MultiChoiceManager.java +++ b/src/com/android/photos/MultiChoiceManager.java @@ -31,7 +31,7 @@ import android.widget.AbsListView.MultiChoiceModeListener; import android.widget.ShareActionProvider; import android.widget.ShareActionProvider.OnShareTargetSelectedListener; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.app.TrimVideo; import com.android.gallery3d.data.MediaObject; import com.android.gallery3d.filtershow.FilterShowActivity; diff --git a/src/com/android/photos/MultiSelectGridFragment.java b/src/com/android/photos/MultiSelectGridFragment.java index dda9fe443..ccf7e0efb 100644 --- a/src/com/android/photos/MultiSelectGridFragment.java +++ b/src/com/android/photos/MultiSelectGridFragment.java @@ -30,7 +30,7 @@ import android.widget.GridView; import android.widget.ListAdapter; import android.widget.TextView; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; public abstract class MultiSelectGridFragment extends Fragment implements MultiChoiceManager.Delegate, AdapterView.OnItemClickListener { diff --git a/src/com/android/photos/adapters/AlbumSetCursorAdapter.java b/src/com/android/photos/adapters/AlbumSetCursorAdapter.java index ab99cde70..58a78f7b6 100644 --- a/src/com/android/photos/adapters/AlbumSetCursorAdapter.java +++ b/src/com/android/photos/adapters/AlbumSetCursorAdapter.java @@ -28,7 +28,7 @@ import android.widget.ImageView; import android.widget.ProgressBar; import android.widget.TextView; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.photos.data.AlbumSetLoader; import com.android.photos.shims.LoaderCompatShim; diff --git a/src/com/android/photos/adapters/PhotoThumbnailAdapter.java b/src/com/android/photos/adapters/PhotoThumbnailAdapter.java index 1190b8c85..1c124d923 100644 --- a/src/com/android/photos/adapters/PhotoThumbnailAdapter.java +++ b/src/com/android/photos/adapters/PhotoThumbnailAdapter.java @@ -25,7 +25,7 @@ import android.view.ViewGroup; import android.widget.CursorAdapter; import android.widget.ImageView; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.photos.data.PhotoSetLoader; import com.android.photos.shims.LoaderCompatShim; import com.android.photos.views.GalleryThumbnailView.GalleryThumbnailAdapter; diff --git a/src/org/codeaurora/gallery3d/video/BookmarkActivity.java b/src/org/codeaurora/gallery3d/video/BookmarkActivity.java index ed653f63a..386593158 100644 --- a/src/org/codeaurora/gallery3d/video/BookmarkActivity.java +++ b/src/org/codeaurora/gallery3d/video/BookmarkActivity.java @@ -28,7 +28,7 @@ import android.widget.ListView; import android.widget.SimpleCursorAdapter; import android.widget.TextView; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.app.MovieActivity; public class BookmarkActivity extends Activity implements OnItemClickListener { diff --git a/src/org/codeaurora/gallery3d/video/BookmarkEnhance.java b/src/org/codeaurora/gallery3d/video/BookmarkEnhance.java index fc3ed9b0f..855cea343 100644 --- a/src/org/codeaurora/gallery3d/video/BookmarkEnhance.java +++ b/src/org/codeaurora/gallery3d/video/BookmarkEnhance.java @@ -8,7 +8,7 @@ import android.database.Cursor; import android.net.Uri; import android.util.Log; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; public class BookmarkEnhance { private static final String TAG = "BookmarkEnhance"; diff --git a/src/org/codeaurora/gallery3d/video/BookmarkHooker.java b/src/org/codeaurora/gallery3d/video/BookmarkHooker.java index 9d7697d7a..c6d014efa 100644 --- a/src/org/codeaurora/gallery3d/video/BookmarkHooker.java +++ b/src/org/codeaurora/gallery3d/video/BookmarkHooker.java @@ -1,10 +1,11 @@ package org.codeaurora.gallery3d.video; import android.content.Intent; +import android.graphics.Bitmap; import android.view.Menu; import android.view.MenuItem; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import org.codeaurora.gallery3d.ext.MovieUtils; public class BookmarkHooker extends MovieHooker { @@ -70,7 +71,10 @@ public class BookmarkHooker extends MovieHooker { intent.addCategory(Intent.CATEGORY_DEFAULT); intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_LAUNCHED_FROM_HISTORY); - intent.putExtra(KEY_LOGO_BITMAP, getIntent().getParcelableExtra(KEY_LOGO_BITMAP)); + Bitmap bitmap = getIntent().getParcelableExtra(KEY_LOGO_BITMAP); + if (bitmap != null) { + intent.putExtra(KEY_LOGO_BITMAP, bitmap); + } getContext().startActivity(intent); } } diff --git a/src/org/codeaurora/gallery3d/video/ExtensionHelper.java b/src/org/codeaurora/gallery3d/video/ExtensionHelper.java index 598351215..8c945bdce 100755 --- a/src/org/codeaurora/gallery3d/video/ExtensionHelper.java +++ b/src/org/codeaurora/gallery3d/video/ExtensionHelper.java @@ -31,7 +31,7 @@ package org.codeaurora.gallery3d.video; import android.content.Context; import com.android.gallery3d.app.MovieActivity; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import org.codeaurora.gallery3d.ext.ActivityHookerGroup; import org.codeaurora.gallery3d.ext.IActivityHooker; diff --git a/src/org/codeaurora/gallery3d/video/LoopVideoHooker.java b/src/org/codeaurora/gallery3d/video/LoopVideoHooker.java index 468e8a878..64463cc69 100644 --- a/src/org/codeaurora/gallery3d/video/LoopVideoHooker.java +++ b/src/org/codeaurora/gallery3d/video/LoopVideoHooker.java @@ -3,7 +3,7 @@ package org.codeaurora.gallery3d.video; import android.view.Menu; import android.view.MenuItem; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import org.codeaurora.gallery3d.ext.MovieUtils; public class LoopVideoHooker extends MovieHooker { diff --git a/src/org/codeaurora/gallery3d/video/MovieListHooker.java b/src/org/codeaurora/gallery3d/video/MovieListHooker.java index 3da15b1dd..244f40190 100644 --- a/src/org/codeaurora/gallery3d/video/MovieListHooker.java +++ b/src/org/codeaurora/gallery3d/video/MovieListHooker.java @@ -5,7 +5,7 @@ import android.util.Log; import android.view.Menu; import android.view.MenuItem; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import org.codeaurora.gallery3d.ext.IMovieItem; import org.codeaurora.gallery3d.ext.IMovieList; import org.codeaurora.gallery3d.ext.IMovieListLoader; diff --git a/src/org/codeaurora/gallery3d/video/SettingsActivity.java b/src/org/codeaurora/gallery3d/video/SettingsActivity.java index 262e761a6..b9f594e8c 100755 --- a/src/org/codeaurora/gallery3d/video/SettingsActivity.java +++ b/src/org/codeaurora/gallery3d/video/SettingsActivity.java @@ -26,7 +26,7 @@ import android.text.method.DigitsKeyListener; import android.util.Log; import android.view.KeyEvent; import android.view.MenuItem; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import java.util.ArrayList; diff --git a/src/org/codeaurora/gallery3d/video/SpeakerHooker.java b/src/org/codeaurora/gallery3d/video/SpeakerHooker.java index 1592195f7..4825436c1 100644 --- a/src/org/codeaurora/gallery3d/video/SpeakerHooker.java +++ b/src/org/codeaurora/gallery3d/video/SpeakerHooker.java @@ -42,7 +42,7 @@ import android.media.AudioManager; import android.media.AudioSystem; import android.os.Bundle; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; public class SpeakerHooker extends MovieHooker { diff --git a/src/org/codeaurora/gallery3d/video/StepOptionSettingsHooker.java b/src/org/codeaurora/gallery3d/video/StepOptionSettingsHooker.java index eff8057bd..3291ad6b5 100644 --- a/src/org/codeaurora/gallery3d/video/StepOptionSettingsHooker.java +++ b/src/org/codeaurora/gallery3d/video/StepOptionSettingsHooker.java @@ -4,7 +4,7 @@ import android.content.Intent; import android.view.Menu; import android.view.MenuItem; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.app.MovieActivity; import org.codeaurora.gallery3d.ext.ActivityHooker; import org.codeaurora.gallery3d.video.VideoSettingsActivity; diff --git a/src/org/codeaurora/gallery3d/video/StereoAudioHooker.java b/src/org/codeaurora/gallery3d/video/StereoAudioHooker.java index 88012fa7d..43d277b7d 100755 --- a/src/org/codeaurora/gallery3d/video/StereoAudioHooker.java +++ b/src/org/codeaurora/gallery3d/video/StereoAudioHooker.java @@ -6,7 +6,7 @@ import android.util.Log; import android.view.Menu; import android.view.MenuItem; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; public class StereoAudioHooker extends MovieHooker { private static final String TAG = "StereoAudioHooker"; diff --git a/src/org/codeaurora/gallery3d/video/StreamingHooker.java b/src/org/codeaurora/gallery3d/video/StreamingHooker.java index 7def5d8a0..5fa9191f9 100755 --- a/src/org/codeaurora/gallery3d/video/StreamingHooker.java +++ b/src/org/codeaurora/gallery3d/video/StreamingHooker.java @@ -9,7 +9,7 @@ import android.view.Menu; import android.view.MenuItem; import android.widget.Toast; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import org.codeaurora.gallery3d.ext.MovieUtils; public class StreamingHooker extends MovieHooker { diff --git a/src/org/codeaurora/gallery3d/video/VideoSettingsActivity.java b/src/org/codeaurora/gallery3d/video/VideoSettingsActivity.java index 941263c99..c3e54ffc2 100644 --- a/src/org/codeaurora/gallery3d/video/VideoSettingsActivity.java +++ b/src/org/codeaurora/gallery3d/video/VideoSettingsActivity.java @@ -31,7 +31,7 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; public class VideoSettingsActivity extends ListActivity { private String OPTION_NAME = "option_name"; diff --git a/src/org/codeaurora/gallery3d/video/VideoSnapshotExt.java b/src/org/codeaurora/gallery3d/video/VideoSnapshotExt.java index 7788e79d5..c6bcc6a3f 100644 --- a/src/org/codeaurora/gallery3d/video/VideoSnapshotExt.java +++ b/src/org/codeaurora/gallery3d/video/VideoSnapshotExt.java @@ -40,7 +40,7 @@ import android.os.Environment; import android.provider.MediaStore.Images; import android.provider.MediaStore.Images.ImageColumns; import android.util.Log; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import com.android.gallery3d.app.MovieControllerOverlay; import com.android.gallery3d.app.MovieControllerOverlayNew; diff --git a/src_pd/com/android/gallery3d/filtershow/filters/FiltersManager.java b/src_pd/com/android/gallery3d/filtershow/filters/FiltersManager.java index cde615e83..bc3b6255a 100644 --- a/src_pd/com/android/gallery3d/filtershow/filters/FiltersManager.java +++ b/src_pd/com/android/gallery3d/filtershow/filters/FiltersManager.java @@ -20,7 +20,7 @@ import android.content.Context; import android.content.res.Resources; import android.graphics.Color; -import com.android.gallery3d.R; +import org.codeaurora.gallery.R; import java.util.ArrayList; import java.util.HashMap; |