Rename package name back to com.android.gallery3d
Change-Id: I083ecff58e2c24fb75f921e4846786735927ce68
diff --git a/Android.mk b/Android.mk
index d5b099a..9aef7f5 100644
--- a/Android.mk
+++ b/Android.mk
@@ -16,7 +16,7 @@
androidx.legacy_legacy-support-v13
LOCAL_STATIC_JAVA_LIBRARIES := \
- org.codeaurora.gallery.common \
+ com.android.gallery3d.common2 \
xmp_toolkit \
mp4parser
@@ -39,8 +39,6 @@
LOCAL_OVERRIDES_PACKAGES := Gallery Gallery3D GalleryNew3D
-LOCAL_AAPT_FLAGS += --rename-manifest-package com.android.gallery3d
-
LOCAL_JNI_SHARED_LIBRARIES := \
libjni_gallery_eglfence \
libjni_gallery_filters \
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 62d06f2..4226b0d 100755
--- 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="org.codeaurora.gallery">
+ package="com.android.gallery3d">
<original-package android:name="com.android.gallery3d" />
@@ -29,10 +29,10 @@
<permission android:name="com.android.gallery3d.permission.GALLERY_PROVIDER"
android:protectionLevel="signatureOrSystem" />
- <permission android:name="org.codeaurora.gallery.filtershow.permission.READ"
+ <permission android:name="com.android.gallery3d.filtershow.permission.READ"
android:protectionLevel="signature" />
- <permission android:name="org.codeaurora.gallery.filtershow.permission.WRITE"
+ <permission android:name="com.android.gallery3d.filtershow.permission.WRITE"
android:protectionLevel="signature" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
@@ -261,8 +261,8 @@
android:name="com.android.gallery3d.filtershow.provider.SharedImageProvider"
android:authorities="com.android.gallery3d.filtershow.provider.SharedImageProvider"
android:grantUriPermissions="true"
- android:readPermission="org.codeaurora.gallery.filtershow.permission.READ"
- android:writePermission="org.codeaurora.gallery.filtershow.permission.WRITE" />
+ android:readPermission="com.android.gallery3d.filtershow.permission.READ"
+ android:writePermission="com.android.gallery3d.filtershow.permission.WRITE" />
<service
android:name="com.android.gallery3d.filtershow.pipeline.ProcessingService"
@@ -377,33 +377,33 @@
<service android:name="com.android.camera.MediaSaveService" />
- <activity android:name="org.codeaurora.gallery3d.video.SettingsActivity"
+ <activity android:name="com.android.gallery3d.video.SettingsActivity"
android:theme="@android:style/Theme.Material.Light"
android:configChanges="keyboardHidden|orientation|screenSize"
android:label="@string/streaming_settings" >
<intent-filter>
- <action android:name="org.codeaurora.settings.streaming" />
+ <action android:name="com.android.settings.streaming" />
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</activity>
- <receiver android:name="org.codeaurora.gallery3d.video.DmReceiver" >
+ <receiver android:name="com.android.gallery3d.video.DmReceiver" >
<intent-filter>
<action android:name="streaming.action.WRITE_SETTINGS" />
</intent-filter>
</receiver>
- <activity android:name="org.codeaurora.gallery3d.video.BookmarkActivity"
+ <activity android:name="com.android.gallery3d.video.BookmarkActivity"
android:configChanges="keyboardHidden|orientation|screenSize"
android:icon="@drawable/ic_menu_display_bookmark"
android:label="@string/bookmark_list"
android:theme="@android:style/Theme.Holo" >
<intent-filter>
- <action android:name="org.codeaurora.bookmark.VIEW" />
+ <action android:name="com.android.bookmark.VIEW" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</activity>
- <activity android:name="org.codeaurora.gallery3d.video.VideoSettingsActivity"
+ <activity android:name="com.android.gallery3d.video.VideoSettingsActivity"
android:label="@string/movie_view_label"
android:theme="@android:style/Theme.Material.Light"
android:configChanges="orientation|keyboardHidden|screenSize|mnc|mcc">
diff --git a/gallerycommon/Android.mk b/gallerycommon/Android.mk
index 735227f..bb62851 100644
--- a/gallerycommon/Android.mk
+++ b/gallerycommon/Android.mk
@@ -20,7 +20,7 @@
include $(CLEAR_VARS)
-LOCAL_MODULE := org.codeaurora.gallery.common
+LOCAL_MODULE := com.android.gallery3d.common2
LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_PRIVATE_PLATFORM_APIS := true
diff --git a/res/layout/filtershow_activity.xml b/res/layout/filtershow_activity.xml
index 741b3db..f6e23fe 100644
--- a/res/layout/filtershow_activity.xml
+++ b/res/layout/filtershow_activity.xml
@@ -60,7 +60,7 @@
</RelativeLayout>
<com.android.gallery3d.filtershow.CenteredLinearLayout
- xmlns:custom="http://schemas.android.com/apk/res/org.codeaurora.gallery"
+ xmlns:custom="http://schemas.android.com/apk/res/com.android.gallery3d"
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 4828725..372f301 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/org.codeaurora.gallery"
+ xmlns:custom="http://schemas.android.com/apk/res/com.android.gallery3d"
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
diff --git a/res/layout/filtershow_category_panel_two.xml b/res/layout/filtershow_category_panel_two.xml
index e807c88..c88757a 100644
--- a/res/layout/filtershow_category_panel_two.xml
+++ b/res/layout/filtershow_category_panel_two.xml
@@ -33,7 +33,7 @@
android:layout_height="match_parent"
android:background="@android:color/transparent"
android:orientation="vertical">
- <LinearLayout xmlns:custom="http://schemas.android.com/apk/res/org.codeaurora.gallery"
+ <LinearLayout xmlns:custom="http://schemas.android.com/apk/res/com.android.gallery3d"
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
diff --git a/res/layout/filtershow_state_panel_new.xml b/res/layout/filtershow_state_panel_new.xml
index ac67ccb..4ea7c8a 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/org.codeaurora.gallery"
+ xmlns:custom="http://schemas.android.com/apk/res/com.android.gallery3d"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content"
diff --git a/res/layout/movie_view.xml b/res/layout/movie_view.xml
index 2679e38..0d15e8f 100644
--- a/res/layout/movie_view.xml
+++ b/res/layout/movie_view.xml
@@ -20,7 +20,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
- <org.codeaurora.gallery3d.video.CodeauroraVideoView android:id="@+id/surface_view"
+ <com.android.gallery3d.video.CodeauroraVideoView android:id="@+id/surface_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_centerInParent="true" />
diff --git a/res/xml/camera_preferences.xml b/res/xml/camera_preferences.xml
index d17f472..8c13a34 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/org.codeaurora.gallery"
+ xmlns:camera="http://schemas.android.com/apk/res/com.android.gallery3d"
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 de9dfcc..79154e6 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/org.codeaurora.gallery"
+ xmlns:camera="http://schemas.android.com/apk/res/com.android.gallery3d"
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 ef9e600..a5493ff 100755
--- a/src/com/android/gallery3d/app/AbstractGalleryActivity.java
+++ b/src/com/android/gallery3d/app/AbstractGalleryActivity.java
@@ -38,7 +38,7 @@
import android.view.WindowManager;
import android.widget.Toolbar;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.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 7050db6..8ca584a 100644
--- a/src/com/android/gallery3d/app/ActivityState.java
+++ b/src/com/android/gallery3d/app/ActivityState.java
@@ -32,7 +32,7 @@
import android.view.Window;
import android.view.WindowManager;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.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 4f3f348..e6e34c0 100644
--- a/src/com/android/gallery3d/app/AlbumPage.java
+++ b/src/com/android/gallery3d/app/AlbumPage.java
@@ -40,7 +40,7 @@
import android.widget.Toast;
import android.widget.Toolbar;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.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 729585e..8c2d09a 100644
--- a/src/com/android/gallery3d/app/AlbumPicker.java
+++ b/src/com/android/gallery3d/app/AlbumPicker.java
@@ -19,7 +19,7 @@
import android.content.Intent;
import android.os.Bundle;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.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 7eaa2bc..2429fa2 100755
--- a/src/com/android/gallery3d/app/AlbumSetPage.java
+++ b/src/com/android/gallery3d/app/AlbumSetPage.java
@@ -41,7 +41,7 @@
import android.widget.TextView;
import android.widget.Toast;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.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 f4fbeb8..fcf8f44 100644
--- a/src/com/android/gallery3d/app/CommonControllerOverlay.java
+++ b/src/com/android/gallery3d/app/CommonControllerOverlay.java
@@ -34,7 +34,7 @@
import android.widget.RelativeLayout;
import android.widget.TextView;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.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 5a458ae..8e8d11b 100644
--- a/src/com/android/gallery3d/app/Config.java
+++ b/src/com/android/gallery3d/app/Config.java
@@ -19,7 +19,7 @@
import android.content.Context;
import android.content.res.Resources;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.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 af771c1..2c4c96c 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 org.codeaurora.gallery.R;
+import com.android.gallery3d.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 dcea7c4..eea8d61 100644
--- a/src/com/android/gallery3d/app/GalleryActionBar.java
+++ b/src/com/android/gallery3d/app/GalleryActionBar.java
@@ -38,7 +38,7 @@
import android.widget.Toolbar;
import android.widget.TwoLineListItem;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.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 5275df8..27e9f9a 100755
--- a/src/com/android/gallery3d/app/GalleryActivity.java
+++ b/src/com/android/gallery3d/app/GalleryActivity.java
@@ -52,7 +52,7 @@
import android.widget.Toast;
import android.widget.Toolbar;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.R;
import com.android.gallery3d.common.Utils;
import com.android.gallery3d.data.DataManager;
import com.android.gallery3d.data.MediaItem;
diff --git a/src/com/android/gallery3d/app/GestureControllerOverlay.java b/src/com/android/gallery3d/app/GestureControllerOverlay.java
index 9060490..eac8376 100755
--- a/src/com/android/gallery3d/app/GestureControllerOverlay.java
+++ b/src/com/android/gallery3d/app/GestureControllerOverlay.java
@@ -42,7 +42,7 @@
import android.widget.FrameLayout;
import android.widget.TextView;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.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 c945199..4f5c358 100644
--- a/src/com/android/gallery3d/app/ManageCachePage.java
+++ b/src/com/android/gallery3d/app/ManageCachePage.java
@@ -30,7 +30,7 @@
import android.widget.TextView;
import android.widget.Toast;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.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 fa4a0f9..6c569c8 100644
--- a/src/com/android/gallery3d/app/MovieActivity.java
+++ b/src/com/android/gallery3d/app/MovieActivity.java
@@ -50,15 +50,15 @@
import android.view.WindowManager;
import android.widget.ImageView;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.R;
import com.android.gallery3d.common.ApiHelper;
import com.android.gallery3d.common.Utils;
-import org.codeaurora.gallery3d.ext.IActivityHooker;
-import org.codeaurora.gallery3d.ext.IMovieItem;
-import org.codeaurora.gallery3d.ext.MovieItem;
-import org.codeaurora.gallery3d.ext.MovieUtils;
-import org.codeaurora.gallery3d.video.ExtensionHelper;
-import org.codeaurora.gallery3d.video.MovieTitleHelper;
+import com.android.gallery3d.ext.IActivityHooker;
+import com.android.gallery3d.ext.IMovieItem;
+import com.android.gallery3d.ext.MovieItem;
+import com.android.gallery3d.ext.MovieUtils;
+import com.android.gallery3d.video.ExtensionHelper;
+import com.android.gallery3d.video.MovieTitleHelper;
/**
* This activity plays a video from a specified URI.
diff --git a/src/com/android/gallery3d/app/MovieControllerOverlay.java b/src/com/android/gallery3d/app/MovieControllerOverlay.java
index 251c3a2..3170380 100755
--- a/src/com/android/gallery3d/app/MovieControllerOverlay.java
+++ b/src/com/android/gallery3d/app/MovieControllerOverlay.java
@@ -37,12 +37,12 @@
import android.widget.ImageView.ScaleType;
import android.widget.LinearLayout;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.R;
-import org.codeaurora.gallery3d.ext.IContrllerOverlayExt;
-import org.codeaurora.gallery3d.video.IControllerRewindAndForward;
-import org.codeaurora.gallery3d.video.ScreenModeManager;
-import org.codeaurora.gallery3d.video.ScreenModeManager.ScreenModeListener;
+import com.android.gallery3d.ext.IContrllerOverlayExt;
+import com.android.gallery3d.video.IControllerRewindAndForward;
+import com.android.gallery3d.video.ScreenModeManager;
+import com.android.gallery3d.video.ScreenModeManager.ScreenModeListener;
import java.util.Locale;
diff --git a/src/com/android/gallery3d/app/MovieControllerOverlayNew.java b/src/com/android/gallery3d/app/MovieControllerOverlayNew.java
index 6d127bb..b5b1183 100644
--- a/src/com/android/gallery3d/app/MovieControllerOverlayNew.java
+++ b/src/com/android/gallery3d/app/MovieControllerOverlayNew.java
@@ -37,10 +37,10 @@
import android.view.animation.Animation;
import android.view.animation.AnimationUtils;
import android.widget.ImageView;
-import org.codeaurora.gallery3d.video.IVideoSnapshotListener;
-import org.codeaurora.gallery3d.video.IControllerRewindAndForward;
+import com.android.gallery3d.video.IVideoSnapshotListener;
+import com.android.gallery3d.video.IControllerRewindAndForward;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.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 7db8dcf..1cd0bd3 100755
--- a/src/com/android/gallery3d/app/MoviePlayer.java
+++ b/src/com/android/gallery3d/app/MoviePlayer.java
@@ -43,23 +43,23 @@
import android.view.ViewGroup;
import android.widget.Toast;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.R;
import com.android.gallery3d.common.ApiHelper;
import com.android.gallery3d.common.BlobCache;
import com.android.gallery3d.util.CacheManager;
import com.android.gallery3d.util.GalleryUtils;
-import org.codeaurora.gallery3d.ext.IContrllerOverlayExt;
-import org.codeaurora.gallery3d.ext.IMovieItem;
-import org.codeaurora.gallery3d.ext.IMoviePlayer;
-import org.codeaurora.gallery3d.ext.MovieUtils;
-import org.codeaurora.gallery3d.video.BookmarkEnhance;
-import org.codeaurora.gallery3d.video.CodeauroraVideoView;
-import org.codeaurora.gallery3d.video.IControllerRewindAndForward;
-import org.codeaurora.gallery3d.video.IControllerRewindAndForward.IRewindAndForwardListener;
-import org.codeaurora.gallery3d.video.ScreenModeManager;
-import org.codeaurora.gallery3d.video.ScreenModeManager.ScreenModeListener;
-import org.codeaurora.gallery3d.video.VideoSnapshotExt;
+import com.android.gallery3d.ext.IContrllerOverlayExt;
+import com.android.gallery3d.ext.IMovieItem;
+import com.android.gallery3d.ext.IMoviePlayer;
+import com.android.gallery3d.ext.MovieUtils;
+import com.android.gallery3d.video.BookmarkEnhance;
+import com.android.gallery3d.video.CodeauroraVideoView;
+import com.android.gallery3d.video.IControllerRewindAndForward;
+import com.android.gallery3d.video.IControllerRewindAndForward.IRewindAndForwardListener;
+import com.android.gallery3d.video.ScreenModeManager;
+import com.android.gallery3d.video.ScreenModeManager.ScreenModeListener;
+import com.android.gallery3d.video.VideoSnapshotExt;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
diff --git a/src/com/android/gallery3d/app/MuteVideo.java b/src/com/android/gallery3d/app/MuteVideo.java
index 7f50c9c..3d184cf 100755
--- a/src/com/android/gallery3d/app/MuteVideo.java
+++ b/src/com/android/gallery3d/app/MuteVideo.java
@@ -26,7 +26,7 @@
import android.provider.MediaStore;
import android.widget.Toast;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.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 6108c8e..a498094 100755
--- a/src/com/android/gallery3d/app/PhotoPage.java
+++ b/src/com/android/gallery3d/app/PhotoPage.java
@@ -45,7 +45,7 @@
import android.widget.RelativeLayout;
import android.widget.Toast;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.R;
import com.android.gallery3d.app.dualcam3d.ThreeDimensionalActivity;
import com.android.gallery3d.common.ApiHelper;
diff --git a/src/com/android/gallery3d/app/PhotoPageBottomControls.java b/src/com/android/gallery3d/app/PhotoPageBottomControls.java
index 166224e..80ae387 100644
--- a/src/com/android/gallery3d/app/PhotoPageBottomControls.java
+++ b/src/com/android/gallery3d/app/PhotoPageBottomControls.java
@@ -28,7 +28,7 @@
import android.widget.RelativeLayout;
import android.widget.ImageButton;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.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 788a6b8..141fea6 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.LayoutParams;
import android.widget.RelativeLayout;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.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 78d0f25..28e77f0 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.OnClickListener;
import android.view.Window;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.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 29df606..33ed2b1 100644
--- a/src/com/android/gallery3d/app/SlideshowPage.java
+++ b/src/com/android/gallery3d/app/SlideshowPage.java
@@ -28,7 +28,7 @@
import android.os.Message;
import android.view.MotionEvent;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.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/ThreeDButton.java b/src/com/android/gallery3d/app/ThreeDButton.java
index 4cc146a..389bc8c 100644
--- a/src/com/android/gallery3d/app/ThreeDButton.java
+++ b/src/com/android/gallery3d/app/ThreeDButton.java
@@ -38,7 +38,7 @@
import android.view.animation.Animation;
import android.widget.RelativeLayout;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.R;
public class ThreeDButton implements OnClickListener {
interface Delegate {
diff --git a/src/com/android/gallery3d/app/TimeBar.java b/src/com/android/gallery3d/app/TimeBar.java
index 976335a..ee39ab8 100755
--- a/src/com/android/gallery3d/app/TimeBar.java
+++ b/src/com/android/gallery3d/app/TimeBar.java
@@ -28,7 +28,7 @@
import android.view.MotionEvent;
import android.view.View;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.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 28211d6..370b4c6 100644
--- a/src/com/android/gallery3d/app/TimeBarNew.java
+++ b/src/com/android/gallery3d/app/TimeBarNew.java
@@ -32,7 +32,7 @@
import android.content.Context;
import android.view.MotionEvent;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.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 a9abc81..3754f42 100755
--- 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.TimeLineSlotView;
import com.android.gallery3d.util.Future;
import com.android.gallery3d.util.GalleryUtils;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.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 4c90a97..5bf3b03 100644
--- a/src/com/android/gallery3d/app/TrimControllerOverlay.java
+++ b/src/com/android/gallery3d/app/TrimControllerOverlay.java
@@ -23,7 +23,7 @@
import android.view.MotionEvent;
import android.view.View;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.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 6fea3d6..2352f62 100644
--- a/src/com/android/gallery3d/app/TrimTimeBar.java
+++ b/src/com/android/gallery3d/app/TrimTimeBar.java
@@ -22,7 +22,7 @@
import android.graphics.Canvas;
import android.view.MotionEvent;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.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 527f6cf..1882854 100755
--- a/src/com/android/gallery3d/app/TrimVideo.java
+++ b/src/com/android/gallery3d/app/TrimVideo.java
@@ -37,7 +37,7 @@
import android.widget.VideoView;
import androidx.core.content.FileProvider;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.R;
import com.android.gallery3d.util.SaveVideoFileInfo;
import com.android.gallery3d.util.SaveVideoFileUtils;
diff --git a/src/com/android/gallery3d/app/dualcam3d/ThreeDimensionalActivity.java b/src/com/android/gallery3d/app/dualcam3d/ThreeDimensionalActivity.java
index ef5c0ef..3da4682 100644
--- a/src/com/android/gallery3d/app/dualcam3d/ThreeDimensionalActivity.java
+++ b/src/com/android/gallery3d/app/dualcam3d/ThreeDimensionalActivity.java
@@ -43,7 +43,7 @@
import com.android.gallery3d.filtershow.cache.ImageLoader;
import com.android.gallery3d.util.GDepth;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.R;
public class ThreeDimensionalActivity extends Activity {
private static final String TAG = ThreeDimensionalActivity.class.getSimpleName();
diff --git a/src/com/android/gallery3d/app/dualcam3d/threed/Controller.java b/src/com/android/gallery3d/app/dualcam3d/threed/Controller.java
index a3c6fda..60e13d6 100644
--- a/src/com/android/gallery3d/app/dualcam3d/threed/Controller.java
+++ b/src/com/android/gallery3d/app/dualcam3d/threed/Controller.java
@@ -36,7 +36,7 @@
import com.android.gallery3d.app.dualcam3d.GLView;
import com.android.gallery3d.app.dualcam3d.gl.Renderer;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.R;
public class Controller implements Gyro.Listener {
private static final String TAG = "Controller";
diff --git a/src/com/android/gallery3d/data/CameraShortcutImage.java b/src/com/android/gallery3d/data/CameraShortcutImage.java
index 0334c30..865270b 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 org.codeaurora.gallery.R;
+import com.android.gallery3d.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 1c50885..3f36745 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 org.codeaurora.gallery.R;
+import com.android.gallery3d.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 c055d57..6f8c37c 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 org.codeaurora.gallery.R;
+import com.android.gallery3d.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 0bdef08..a0d5679 100755
--- a/src/com/android/gallery3d/data/FaceClustering.java
+++ b/src/com/android/gallery3d/data/FaceClustering.java
@@ -19,7 +19,7 @@
import android.content.Context;
import android.graphics.Rect;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.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 3ebea81..bc2609c 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.Video;
import android.provider.MediaStore.Video.VideoColumns;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.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 81e7d80..b2b4b8c 100644
--- a/src/com/android/gallery3d/data/LocalAlbumSet.java
+++ b/src/com/android/gallery3d/data/LocalAlbumSet.java
@@ -21,7 +21,7 @@
import android.provider.MediaStore.Images;
import android.provider.MediaStore.Video;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.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 8cc2ad1..90ac41c 100644
--- a/src/com/android/gallery3d/data/LocationClustering.java
+++ b/src/com/android/gallery3d/data/LocationClustering.java
@@ -21,7 +21,7 @@
import android.os.Looper;
import android.widget.Toast;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.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 7f32473..dbb65fe 100755
--- 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 org.codeaurora.gallery.R;
+import com.android.gallery3d.R;
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 89c5503..b809c84 100644
--- a/src/com/android/gallery3d/data/SizeClustering.java
+++ b/src/com/android/gallery3d/data/SizeClustering.java
@@ -19,7 +19,7 @@
import android.content.Context;
import android.content.res.Resources;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.R;
import java.util.ArrayList;
diff --git a/src/com/android/gallery3d/data/TagClustering.java b/src/com/android/gallery3d/data/TagClustering.java
index c93c3c9..407ca84 100644
--- a/src/com/android/gallery3d/data/TagClustering.java
+++ b/src/com/android/gallery3d/data/TagClustering.java
@@ -18,7 +18,7 @@
import android.content.Context;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.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 02fa464..ed3b485 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 org.codeaurora.gallery.R;
+import com.android.gallery3d.R;
import com.android.gallery3d.app.GalleryApp;
public class UnlockImage extends ActionImage {
diff --git a/src/org/codeaurora/gallery3d/ext/ActivityHooker.java b/src/com/android/gallery3d/ext/ActivityHooker.java
similarity index 97%
rename from src/org/codeaurora/gallery3d/ext/ActivityHooker.java
rename to src/com/android/gallery3d/ext/ActivityHooker.java
index 65761ff..27804ed 100644
--- a/src/org/codeaurora/gallery3d/ext/ActivityHooker.java
+++ b/src/com/android/gallery3d/ext/ActivityHooker.java
@@ -1,4 +1,4 @@
-package org.codeaurora.gallery3d.ext;
+package com.android.gallery3d.ext;
import android.app.Activity;
import android.content.Intent;
diff --git a/src/org/codeaurora/gallery3d/ext/ActivityHookerGroup.java b/src/com/android/gallery3d/ext/ActivityHookerGroup.java
similarity index 98%
rename from src/org/codeaurora/gallery3d/ext/ActivityHookerGroup.java
rename to src/com/android/gallery3d/ext/ActivityHookerGroup.java
index 4bf8616..5bbe141 100644
--- a/src/org/codeaurora/gallery3d/ext/ActivityHookerGroup.java
+++ b/src/com/android/gallery3d/ext/ActivityHookerGroup.java
@@ -1,4 +1,4 @@
-package org.codeaurora.gallery3d.ext;
+package com.android.gallery3d.ext;
import android.app.Activity;
import android.content.Intent;
diff --git a/src/org/codeaurora/gallery3d/ext/IActivityHooker.java b/src/com/android/gallery3d/ext/IActivityHooker.java
similarity index 98%
rename from src/org/codeaurora/gallery3d/ext/IActivityHooker.java
rename to src/com/android/gallery3d/ext/IActivityHooker.java
index a837996..ac80dc9 100644
--- a/src/org/codeaurora/gallery3d/ext/IActivityHooker.java
+++ b/src/com/android/gallery3d/ext/IActivityHooker.java
@@ -1,4 +1,4 @@
-package org.codeaurora.gallery3d.ext;
+package com.android.gallery3d.ext;
import android.app.Activity;
import android.content.Intent;
diff --git a/src/org/codeaurora/gallery3d/ext/IContrllerOverlayExt.java b/src/com/android/gallery3d/ext/IContrllerOverlayExt.java
similarity index 96%
rename from src/org/codeaurora/gallery3d/ext/IContrllerOverlayExt.java
rename to src/com/android/gallery3d/ext/IContrllerOverlayExt.java
index 73bef5e..adeeb50 100644
--- a/src/org/codeaurora/gallery3d/ext/IContrllerOverlayExt.java
+++ b/src/com/android/gallery3d/ext/IContrllerOverlayExt.java
@@ -1,4 +1,4 @@
-package org.codeaurora.gallery3d.ext;
+package com.android.gallery3d.ext;
/**
* Controller overlay extension interface.
*/
diff --git a/src/org/codeaurora/gallery3d/ext/IMovieItem.java b/src/com/android/gallery3d/ext/IMovieItem.java
similarity index 95%
rename from src/org/codeaurora/gallery3d/ext/IMovieItem.java
rename to src/com/android/gallery3d/ext/IMovieItem.java
index dece4e8..b21fb2f 100644
--- a/src/org/codeaurora/gallery3d/ext/IMovieItem.java
+++ b/src/com/android/gallery3d/ext/IMovieItem.java
@@ -1,4 +1,4 @@
-package org.codeaurora.gallery3d.ext;
+package com.android.gallery3d.ext;
import android.net.Uri;
diff --git a/src/org/codeaurora/gallery3d/ext/IMovieList.java b/src/com/android/gallery3d/ext/IMovieList.java
similarity index 95%
rename from src/org/codeaurora/gallery3d/ext/IMovieList.java
rename to src/com/android/gallery3d/ext/IMovieList.java
index 404d24c..ece86e9 100644
--- a/src/org/codeaurora/gallery3d/ext/IMovieList.java
+++ b/src/com/android/gallery3d/ext/IMovieList.java
@@ -1,4 +1,4 @@
-package org.codeaurora.gallery3d.ext;
+package com.android.gallery3d.ext;
/**
* Movie list extension interface
*/
diff --git a/src/org/codeaurora/gallery3d/ext/IMovieListLoader.java b/src/com/android/gallery3d/ext/IMovieListLoader.java
similarity index 79%
rename from src/org/codeaurora/gallery3d/ext/IMovieListLoader.java
rename to src/com/android/gallery3d/ext/IMovieListLoader.java
index fe59998..667c246 100644
--- a/src/org/codeaurora/gallery3d/ext/IMovieListLoader.java
+++ b/src/com/android/gallery3d/ext/IMovieListLoader.java
@@ -1,4 +1,4 @@
-package org.codeaurora.gallery3d.ext;
+package com.android.gallery3d.ext;
import android.app.Activity;
import android.content.Context;
@@ -10,15 +10,15 @@
* "yes" means load all videos in all storages.
* "false" means load videos located in current video's folder.
*/
- String EXTRA_ALL_VIDEO_FOLDER = "org.codeaurora.intent.extra.ALL_VIDEO_FOLDER";
+ String EXTRA_ALL_VIDEO_FOLDER = "com.android.intent.extra.ALL_VIDEO_FOLDER";
/**
* Video list order by column name.[String]
*/
- String EXTRA_ORDERBY = "org.codeaurora.intent.extra.VIDEO_LIST_ORDERBY";
+ String EXTRA_ORDERBY = "com.android.intent.extra.VIDEO_LIST_ORDERBY";
/**
* Enable video list or not.[boolean]
*/
- String EXTRA_ENABLE_VIDEO_LIST = "org.codeaurora.intent.extra.ENABLE_VIDEO_LIST";
+ String EXTRA_ENABLE_VIDEO_LIST = "com.android.intent.extra.ENABLE_VIDEO_LIST";
/**
* Loader listener interface
*/
diff --git a/src/org/codeaurora/gallery3d/ext/IMoviePlayer.java b/src/com/android/gallery3d/ext/IMoviePlayer.java
similarity index 93%
rename from src/org/codeaurora/gallery3d/ext/IMoviePlayer.java
rename to src/com/android/gallery3d/ext/IMoviePlayer.java
index 32d400b..45c8d75 100644
--- a/src/org/codeaurora/gallery3d/ext/IMoviePlayer.java
+++ b/src/com/android/gallery3d/ext/IMoviePlayer.java
@@ -1,4 +1,4 @@
-package org.codeaurora.gallery3d.ext;
+package com.android.gallery3d.ext;
public interface IMoviePlayer {
diff --git a/src/org/codeaurora/gallery3d/ext/MovieItem.java b/src/com/android/gallery3d/ext/MovieItem.java
similarity index 98%
rename from src/org/codeaurora/gallery3d/ext/MovieItem.java
rename to src/com/android/gallery3d/ext/MovieItem.java
index 56afdda..c83fc7b 100644
--- a/src/org/codeaurora/gallery3d/ext/MovieItem.java
+++ b/src/com/android/gallery3d/ext/MovieItem.java
@@ -1,4 +1,4 @@
-package org.codeaurora.gallery3d.ext;
+package com.android.gallery3d.ext;
import android.net.Uri;
import android.provider.MediaStore;
diff --git a/src/org/codeaurora/gallery3d/ext/MovieList.java b/src/com/android/gallery3d/ext/MovieList.java
similarity index 97%
rename from src/org/codeaurora/gallery3d/ext/MovieList.java
rename to src/com/android/gallery3d/ext/MovieList.java
index ecb7f0d..242fa5b 100644
--- a/src/org/codeaurora/gallery3d/ext/MovieList.java
+++ b/src/com/android/gallery3d/ext/MovieList.java
@@ -1,4 +1,4 @@
-package org.codeaurora.gallery3d.ext;
+package com.android.gallery3d.ext;
import android.util.Log;
diff --git a/src/org/codeaurora/gallery3d/ext/MovieListLoader.java b/src/com/android/gallery3d/ext/MovieListLoader.java
similarity index 99%
rename from src/org/codeaurora/gallery3d/ext/MovieListLoader.java
rename to src/com/android/gallery3d/ext/MovieListLoader.java
index 237d7e1..a3f1e00 100644
--- a/src/org/codeaurora/gallery3d/ext/MovieListLoader.java
+++ b/src/com/android/gallery3d/ext/MovieListLoader.java
@@ -1,4 +1,4 @@
-package org.codeaurora.gallery3d.ext;
+package com.android.gallery3d.ext;
import android.app.Activity;
import android.content.ContentResolver;
diff --git a/src/org/codeaurora/gallery3d/ext/MovieUtils.java b/src/com/android/gallery3d/ext/MovieUtils.java
similarity index 98%
rename from src/org/codeaurora/gallery3d/ext/MovieUtils.java
rename to src/com/android/gallery3d/ext/MovieUtils.java
index 4bc70a3..05929c2 100644
--- a/src/org/codeaurora/gallery3d/ext/MovieUtils.java
+++ b/src/com/android/gallery3d/ext/MovieUtils.java
@@ -1,4 +1,4 @@
-package org.codeaurora.gallery3d.ext;
+package com.android.gallery3d.ext;
import android.net.Uri;
import android.util.Log;
diff --git a/src/com/android/gallery3d/filtershow/CenteredLinearLayout.java b/src/com/android/gallery3d/filtershow/CenteredLinearLayout.java
index c792c2c..bc9342d 100644
--- a/src/com/android/gallery3d/filtershow/CenteredLinearLayout.java
+++ b/src/com/android/gallery3d/filtershow/CenteredLinearLayout.java
@@ -23,7 +23,7 @@
import android.util.TypedValue;
import android.widget.LinearLayout;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.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 a9a1715..565c0f7 100755
--- a/src/com/android/gallery3d/filtershow/FilterShowActivity.java
+++ b/src/com/android/gallery3d/filtershow/FilterShowActivity.java
@@ -83,7 +83,7 @@
import android.widget.RelativeLayout;
import android.widget.Toast;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.R;
import com.android.gallery3d.app.AbstractPermissionActivity;
import com.android.gallery3d.app.PhotoPage;
diff --git a/src/com/android/gallery3d/filtershow/category/Action.java b/src/com/android/gallery3d/filtershow/category/Action.java
index 67a34ce..4d5532c 100644
--- a/src/com/android/gallery3d/filtershow/category/Action.java
+++ b/src/com/android/gallery3d/filtershow/category/Action.java
@@ -34,7 +34,7 @@
import android.widget.ArrayAdapter;
import android.widget.ListAdapter;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.R;
import com.android.gallery3d.filtershow.FilterShowActivity;
import com.android.gallery3d.filtershow.cache.BitmapCache;
import com.android.gallery3d.filtershow.filters.FilterDrawRepresentation;
diff --git a/src/com/android/gallery3d/filtershow/category/BasicGeometryPanel.java b/src/com/android/gallery3d/filtershow/category/BasicGeometryPanel.java
index d27954b..b2b55dd 100644
--- a/src/com/android/gallery3d/filtershow/category/BasicGeometryPanel.java
+++ b/src/com/android/gallery3d/filtershow/category/BasicGeometryPanel.java
@@ -40,7 +40,7 @@
import android.widget.TextView;
import com.android.gallery3d.filtershow.FilterShowActivity;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.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 22ffc04..a6bf58d 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.widget.ArrayAdapter;
import android.widget.ListView;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.R;
import com.android.gallery3d.filtershow.FilterShowActivity;
import com.android.gallery3d.filtershow.filters.FilterPresetRepresentation;
import com.android.gallery3d.filtershow.filters.FilterRepresentation;
diff --git a/src/com/android/gallery3d/filtershow/category/CategoryPanel.java b/src/com/android/gallery3d/filtershow/category/CategoryPanel.java
index f8669dc..7b0b25a 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.LinearLayout;
import android.widget.ListView;
import android.widget.TextView;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.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/CategoryPanelLevelTwo.java b/src/com/android/gallery3d/filtershow/category/CategoryPanelLevelTwo.java
index 26875f3..041b1df 100644
--- a/src/com/android/gallery3d/filtershow/category/CategoryPanelLevelTwo.java
+++ b/src/com/android/gallery3d/filtershow/category/CategoryPanelLevelTwo.java
@@ -36,7 +36,7 @@
import android.widget.LinearLayout;
import android.widget.TextView;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.R;
import com.android.gallery3d.filtershow.FilterShowActivity;
import com.android.gallery3d.filtershow.filters.FilterRepresentation;
diff --git a/src/com/android/gallery3d/filtershow/category/CategorySelected.java b/src/com/android/gallery3d/filtershow/category/CategorySelected.java
index 92848c1..42058c0 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.util.AttributeSet;
import android.view.View;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.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 a906df5..1371fe8 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.view.MotionEvent;
import android.view.View;
import android.widget.LinearLayout;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.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 d9788cf..a3655d0 100644
--- a/src/com/android/gallery3d/filtershow/category/CategoryView.java
+++ b/src/com/android/gallery3d/filtershow/category/CategoryView.java
@@ -31,7 +31,7 @@
import android.view.View;
import android.view.ActionMode;
import android.widget.PopupMenu;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.R;
import com.android.gallery3d.app.Log;
import com.android.gallery3d.filtershow.FilterShowActivity;
diff --git a/src/com/android/gallery3d/filtershow/category/EditorCropPanel.java b/src/com/android/gallery3d/filtershow/category/EditorCropPanel.java
index 37bc862..bd7384b 100644
--- a/src/com/android/gallery3d/filtershow/category/EditorCropPanel.java
+++ b/src/com/android/gallery3d/filtershow/category/EditorCropPanel.java
@@ -39,7 +39,7 @@
import androidx.annotation.Nullable;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.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 c952d43..1bfd2a7 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.Typeface;
import android.util.AttributeSet;
import android.view.View;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.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 505f556..efb8973 100755
--- a/src/com/android/gallery3d/filtershow/category/MainPanel.java
+++ b/src/com/android/gallery3d/filtershow/category/MainPanel.java
@@ -31,7 +31,7 @@
import android.widget.LinearLayout;
import android.widget.Toast;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.R;
import org.json.JSONObject;
import com.android.gallery3d.common.ApiHelper;
diff --git a/src/com/android/gallery3d/filtershow/category/StraightenPanel.java b/src/com/android/gallery3d/filtershow/category/StraightenPanel.java
index 6d6919f..1455201 100644
--- a/src/com/android/gallery3d/filtershow/category/StraightenPanel.java
+++ b/src/com/android/gallery3d/filtershow/category/StraightenPanel.java
@@ -38,7 +38,7 @@
import com.android.gallery3d.filtershow.FilterShowActivity;
import com.android.gallery3d.filtershow.editors.Editor;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.R;
public class StraightenPanel extends BasicGeometryPanel {
public static final String EDITOR_ID = "editor_id";
diff --git a/src/com/android/gallery3d/filtershow/category/TruePortraitMaskEditorPanel.java b/src/com/android/gallery3d/filtershow/category/TruePortraitMaskEditorPanel.java
index 891966c..317c6c4 100644
--- a/src/com/android/gallery3d/filtershow/category/TruePortraitMaskEditorPanel.java
+++ b/src/com/android/gallery3d/filtershow/category/TruePortraitMaskEditorPanel.java
@@ -39,7 +39,7 @@
import android.view.View;
import android.view.ViewGroup;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.R;
import com.android.gallery3d.filtershow.FilterShowActivity;
import com.android.gallery3d.filtershow.editors.EditorTruePortraitMask;
import com.android.gallery3d.filtershow.ui.DoNotShowAgainDialog;
diff --git a/src/com/android/gallery3d/filtershow/category/TrueScannerPanel.java b/src/com/android/gallery3d/filtershow/category/TrueScannerPanel.java
index 97c8c4b..dd4b1e2 100644
--- a/src/com/android/gallery3d/filtershow/category/TrueScannerPanel.java
+++ b/src/com/android/gallery3d/filtershow/category/TrueScannerPanel.java
@@ -38,7 +38,7 @@
import com.android.gallery3d.filtershow.FilterShowActivity;
import com.android.gallery3d.filtershow.editors.TrueScannerEditor;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.R;
public class TrueScannerPanel extends BasicGeometryPanel {
private TrueScannerEditor mTrueScannerEditor;
diff --git a/src/com/android/gallery3d/filtershow/category/WaterMarkTimeView.java b/src/com/android/gallery3d/filtershow/category/WaterMarkTimeView.java
index 86a8a76..f4165b7 100644
--- a/src/com/android/gallery3d/filtershow/category/WaterMarkTimeView.java
+++ b/src/com/android/gallery3d/filtershow/category/WaterMarkTimeView.java
@@ -37,7 +37,7 @@
import android.widget.EditText;
import android.widget.FrameLayout;
import android.widget.ImageView;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.R;
public class WaterMarkTimeView extends WaterMarkView {
public WaterMarkTimeView(Context context) {
diff --git a/src/com/android/gallery3d/filtershow/category/WaterMarkView.java b/src/com/android/gallery3d/filtershow/category/WaterMarkView.java
index 36ba392..3606cf6 100644
--- a/src/com/android/gallery3d/filtershow/category/WaterMarkView.java
+++ b/src/com/android/gallery3d/filtershow/category/WaterMarkView.java
@@ -48,7 +48,7 @@
import com.android.gallery3d.filtershow.imageshow.GeometryMathUtils;
import com.android.gallery3d.filtershow.imageshow.MasterImage;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.R;
import java.io.BufferedReader;
import java.io.IOException;
diff --git a/src/com/android/gallery3d/filtershow/colorpicker/ColorBrightnessView.java b/src/com/android/gallery3d/filtershow/colorpicker/ColorBrightnessView.java
index b270fa5..b2118e0 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.view.MotionEvent;
import android.view.View;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.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 c765b4d..1599671 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.view.MotionEvent;
import android.view.View;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.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 b93434a..0285994 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.ViewGroup;
import android.widget.Button;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.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 e3cafec..61b3621 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.view.MotionEvent;
import android.view.View;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.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 3d3c6a2..970a2ff 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.view.MotionEvent;
import android.view.View;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.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 478eb9d..ff36f5a 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.ImageButton;
import android.widget.ToggleButton;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.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 48ffa81..92f4ad8 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.view.MotionEvent;
import android.view.View;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.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 8a18f87..6ebb48b 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.view.MotionEvent;
import android.view.View;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.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 e9927d5..a29eee9 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.view.MotionEvent;
import android.view.View;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.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 0612048..0ace5d0 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.view.MotionEvent;
import android.view.View;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.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 ce74373..f80a1ca 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.ViewGroup;
import android.widget.ImageButton;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.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 d0d0fca..3dac736 100644
--- a/src/com/android/gallery3d/filtershow/controller/BasicSlider.java
+++ b/src/com/android/gallery3d/filtershow/controller/BasicSlider.java
@@ -23,7 +23,7 @@
import android.widget.SeekBar;
import android.widget.SeekBar.OnSeekBarChangeListener;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.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 cfa9260..82ce80b 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.widget.Button;
import android.widget.LinearLayout;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.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 4e704b1..2929d68 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.ViewGroup;
import android.widget.LinearLayout;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.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 dc0042f..1820ce2 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.SeekBar;
import android.widget.SeekBar.OnSeekBarChangeListener;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.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 06ed607..2a34aad 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.SeekBar;
import android.widget.SeekBar.OnSeekBarChangeListener;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.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 c99de25..6f3ae6e 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.SeekBar;
import android.widget.SeekBar.OnSeekBarChangeListener;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.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 674bedd..ab17d63 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.ImageView.ScaleType;
import android.widget.LinearLayout;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.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 ed7eaf9..8031b75 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.OnSeekBarChangeListener;
import android.widget.TextView;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.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 afb527d..cc8d3e2 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.WindowManager;
import android.widget.Toast;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.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 0430de6..ba25e1e 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.Region;
import android.graphics.drawable.Drawable;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.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 175fb82..3b51325 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.view.MotionEvent;
import android.view.View;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.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 b5f8bb2..6232a2d 100644
--- a/src/com/android/gallery3d/filtershow/data/UserPresetsManager.java
+++ b/src/com/android/gallery3d/filtershow/data/UserPresetsManager.java
@@ -3,7 +3,7 @@
import android.os.Handler;
import android.os.HandlerThread;
import android.os.Message;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.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 861ed48..af694d8 100644
--- a/src/com/android/gallery3d/filtershow/editors/BasicEditor.java
+++ b/src/com/android/gallery3d/filtershow/editors/BasicEditor.java
@@ -18,7 +18,7 @@
import android.content.Context;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.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 e5d9e48..7e2ccc6 100644
--- a/src/com/android/gallery3d/filtershow/editors/Editor.java
+++ b/src/com/android/gallery3d/filtershow/editors/Editor.java
@@ -34,7 +34,7 @@
import android.widget.SeekBar.OnSeekBarChangeListener;
import android.widget.TextView;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.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 664aa6c..6b7d47f 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.OnSeekBarChangeListener;
import android.widget.TextView;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.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 9025285..8249288 100644
--- a/src/com/android/gallery3d/filtershow/editors/EditorColorBorder.java
+++ b/src/com/android/gallery3d/filtershow/editors/EditorColorBorder.java
@@ -26,7 +26,7 @@
import android.widget.PopupMenu;
import android.widget.SeekBar;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.R;
import com.android.gallery3d.filtershow.FilterShowActivity;
import com.android.gallery3d.filtershow.controller.ColorChooser;
import com.android.gallery3d.filtershow.filters.FilterColorBorderRepresentation;
diff --git a/src/com/android/gallery3d/filtershow/editors/EditorColorBorderTabletUI.java b/src/com/android/gallery3d/filtershow/editors/EditorColorBorderTabletUI.java
index 8e7e8b0..9f1a11b 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.SeekBar;
import android.widget.TextView;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.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 e84be4b..291e4da 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.LinearLayout;
import android.widget.PopupMenu;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.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 e305f7a..985741e 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.view.View;
import android.widget.FrameLayout;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.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 5298cab..842984c 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.PopupMenu;
import android.widget.SeekBar;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.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 ea01e10..83d89c9 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.SeekBar;
import android.widget.TextView;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.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 ec6c8ae..e932f40 100644
--- a/src/com/android/gallery3d/filtershow/editors/EditorDualCamFusion.java
+++ b/src/com/android/gallery3d/filtershow/editors/EditorDualCamFusion.java
@@ -50,7 +50,7 @@
import com.android.gallery3d.filtershow.ui.DoNotShowAgainDialog;
import com.android.gallery3d.util.GalleryUtils;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.R;
import java.io.FileNotFoundException;
import java.io.IOException;
diff --git a/src/com/android/gallery3d/filtershow/editors/EditorDualCamSketch.java b/src/com/android/gallery3d/filtershow/editors/EditorDualCamSketch.java
index f721117..6d48002 100644
--- a/src/com/android/gallery3d/filtershow/editors/EditorDualCamSketch.java
+++ b/src/com/android/gallery3d/filtershow/editors/EditorDualCamSketch.java
@@ -32,7 +32,7 @@
import android.content.Context;
import android.widget.FrameLayout;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.R;
import com.android.gallery3d.filtershow.filters.FilterDualCamBasicRepresentation;
import com.android.gallery3d.filtershow.filters.FilterRepresentation;
diff --git a/src/com/android/gallery3d/filtershow/editors/EditorDualCamera.java b/src/com/android/gallery3d/filtershow/editors/EditorDualCamera.java
index f4e155e..ba19cc9 100644
--- a/src/com/android/gallery3d/filtershow/editors/EditorDualCamera.java
+++ b/src/com/android/gallery3d/filtershow/editors/EditorDualCamera.java
@@ -32,7 +32,7 @@
import android.content.Context;
import android.widget.FrameLayout;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.R;
import com.android.gallery3d.filtershow.filters.FilterBasicRepresentation;
import com.android.gallery3d.filtershow.filters.FilterDualCamBasicRepresentation;
diff --git a/src/com/android/gallery3d/filtershow/editors/EditorGrad.java b/src/com/android/gallery3d/filtershow/editors/EditorGrad.java
index 2500011..cc8f28c 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.TextView;
import android.widget.ToggleButton;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.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 50377c1..d6ec8b9 100644
--- a/src/com/android/gallery3d/filtershow/editors/EditorMakeup.java
+++ b/src/com/android/gallery3d/filtershow/editors/EditorMakeup.java
@@ -20,7 +20,7 @@
import android.view.View;
import android.widget.SeekBar;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.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 4be00d6..d6d9ee7 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.FrameLayout;
import android.widget.LinearLayout;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.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 a604e02..7923ac4 100644
--- a/src/com/android/gallery3d/filtershow/editors/EditorPanel.java
+++ b/src/com/android/gallery3d/filtershow/editors/EditorPanel.java
@@ -30,7 +30,7 @@
import android.widget.LinearLayout;
import android.widget.TextView;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.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 df381a5..b0e88dd 100644
--- a/src/com/android/gallery3d/filtershow/editors/EditorRedEye.java
+++ b/src/com/android/gallery3d/filtershow/editors/EditorRedEye.java
@@ -19,7 +19,7 @@
import android.content.Context;
import android.widget.FrameLayout;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.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 a12a41d..9452bf0 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.FrameLayout;
import android.widget.LinearLayout;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.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 5f33739..b2c0e9a 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.util.Log;
import android.widget.FrameLayout;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.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 d55f1d3..9376fbe 100644
--- a/src/com/android/gallery3d/filtershow/editors/EditorTinyPlanet.java
+++ b/src/com/android/gallery3d/filtershow/editors/EditorTinyPlanet.java
@@ -19,7 +19,7 @@
import android.content.Context;
import android.widget.FrameLayout;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.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/EditorTruePortraitBasic.java b/src/com/android/gallery3d/filtershow/editors/EditorTruePortraitBasic.java
index a09e216..7e5a64c 100644
--- a/src/com/android/gallery3d/filtershow/editors/EditorTruePortraitBasic.java
+++ b/src/com/android/gallery3d/filtershow/editors/EditorTruePortraitBasic.java
@@ -36,7 +36,7 @@
import android.view.View.OnClickListener;
import android.widget.LinearLayout;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.R;
import com.android.gallery3d.filtershow.FilterShowActivity;
import com.android.gallery3d.filtershow.filters.FilterRepresentation;
diff --git a/src/com/android/gallery3d/filtershow/editors/EditorTruePortraitFusion.java b/src/com/android/gallery3d/filtershow/editors/EditorTruePortraitFusion.java
index 20ff331..4e72b67 100644
--- a/src/com/android/gallery3d/filtershow/editors/EditorTruePortraitFusion.java
+++ b/src/com/android/gallery3d/filtershow/editors/EditorTruePortraitFusion.java
@@ -46,7 +46,7 @@
import android.widget.FrameLayout;
import android.widget.LinearLayout;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.R;
import com.android.gallery3d.filtershow.FilterShowActivity;
import com.android.gallery3d.filtershow.filters.FilterRepresentation;
diff --git a/src/com/android/gallery3d/filtershow/editors/EditorTruePortraitImageOnly.java b/src/com/android/gallery3d/filtershow/editors/EditorTruePortraitImageOnly.java
index 781b2e4..268f938 100644
--- a/src/com/android/gallery3d/filtershow/editors/EditorTruePortraitImageOnly.java
+++ b/src/com/android/gallery3d/filtershow/editors/EditorTruePortraitImageOnly.java
@@ -37,7 +37,7 @@
import android.widget.FrameLayout;
import android.widget.LinearLayout;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.R;
import com.android.gallery3d.filtershow.FilterShowActivity;
import com.android.gallery3d.filtershow.filters.FilterRepresentation;
import com.android.gallery3d.filtershow.imageshow.ImageShow;
diff --git a/src/com/android/gallery3d/filtershow/editors/EditorTruePortraitMask.java b/src/com/android/gallery3d/filtershow/editors/EditorTruePortraitMask.java
index c4a0f94..10d63d1 100644
--- a/src/com/android/gallery3d/filtershow/editors/EditorTruePortraitMask.java
+++ b/src/com/android/gallery3d/filtershow/editors/EditorTruePortraitMask.java
@@ -45,7 +45,7 @@
import android.widget.Toast;
import android.widget.ToggleButton;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.R;
import com.android.gallery3d.filtershow.FilterShowActivity;
import com.android.gallery3d.filtershow.imageshow.ImageTruePortraitMask;
import com.android.gallery3d.filtershow.imageshow.MasterImage;
diff --git a/src/com/android/gallery3d/filtershow/editors/EditorVignette.java b/src/com/android/gallery3d/filtershow/editors/EditorVignette.java
index e3dd7ff..c470231 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.SeekBar;
import android.widget.TextView;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.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 2d1d250..ea8e3d1 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 org.codeaurora.gallery.R;
+import com.android.gallery3d.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 8b7f4b8..78b5655 100644
--- a/src/com/android/gallery3d/filtershow/editors/HazeBusterEditor.java
+++ b/src/com/android/gallery3d/filtershow/editors/HazeBusterEditor.java
@@ -32,7 +32,7 @@
import android.content.Context;
import android.widget.FrameLayout;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.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 e48e7a6..0858a01 100644
--- a/src/com/android/gallery3d/filtershow/editors/ImageOnlyEditor.java
+++ b/src/com/android/gallery3d/filtershow/editors/ImageOnlyEditor.java
@@ -19,7 +19,7 @@
import android.content.Context;
import android.widget.FrameLayout;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.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 5f4c51c..d71ad41 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.LinearLayout;
import android.widget.SeekBar;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.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 f320b4b..12a8fe5 100644
--- a/src/com/android/gallery3d/filtershow/editors/SeeStraightEditor.java
+++ b/src/com/android/gallery3d/filtershow/editors/SeeStraightEditor.java
@@ -32,7 +32,7 @@
import android.content.Context;
import android.widget.FrameLayout;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.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 d184a3c..a2e9d29 100644
--- a/src/com/android/gallery3d/filtershow/editors/TrueScannerEditor.java
+++ b/src/com/android/gallery3d/filtershow/editors/TrueScannerEditor.java
@@ -45,7 +45,7 @@
import com.android.gallery3d.filtershow.imageshow.ImageTrueScanner;
import com.android.gallery3d.filtershow.imageshow.MasterImage;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.R;
/**
* The editor with no slider for filters without UI
diff --git a/src/com/android/gallery3d/filtershow/filters/BaseFiltersManager.java b/src/com/android/gallery3d/filtershow/filters/BaseFiltersManager.java
index 72fbdca..70f5018 100644
--- a/src/com/android/gallery3d/filtershow/filters/BaseFiltersManager.java
+++ b/src/com/android/gallery3d/filtershow/filters/BaseFiltersManager.java
@@ -23,7 +23,7 @@
import android.view.ContextThemeWrapper;
import android.view.Gravity;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.R;
import com.android.gallery3d.filtershow.FilterShowActivity;
import com.android.gallery3d.filtershow.data.FilterPresetDBHelper;
diff --git a/src/com/android/gallery3d/filtershow/filters/FilterChanSatRepresentation.java b/src/com/android/gallery3d/filtershow/filters/FilterChanSatRepresentation.java
index b009dfa..6c5274d 100644
--- a/src/com/android/gallery3d/filtershow/filters/FilterChanSatRepresentation.java
+++ b/src/com/android/gallery3d/filtershow/filters/FilterChanSatRepresentation.java
@@ -19,7 +19,7 @@
import android.util.JsonReader;
import android.util.JsonWriter;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.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 99e9223..5162927 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.util.JsonReader;
import android.util.JsonWriter;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.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 d209189..98afc3a 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.util.JsonReader;
import android.util.JsonWriter;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.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 9f77457..edab2a0 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.JsonWriter;
import android.util.Log;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.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 0e867ac..5c5e561 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.JsonWriter;
import android.util.Log;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.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 cd3a2e6..359bbcd 100644
--- a/src/com/android/gallery3d/filtershow/filters/FilterDualCamFusionRepresentation.java
+++ b/src/com/android/gallery3d/filtershow/filters/FilterDualCamFusionRepresentation.java
@@ -38,7 +38,7 @@
import com.android.gallery3d.filtershow.editors.EditorDualCamFusion;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.R;
public class FilterDualCamFusionRepresentation extends FilterDualCamBasicRepresentation
diff --git a/src/com/android/gallery3d/filtershow/filters/FilterGradRepresentation.java b/src/com/android/gallery3d/filtershow/filters/FilterGradRepresentation.java
index 34d8c94..928c3ea 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.util.JsonReader;
import android.util.JsonWriter;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.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 11b9a0f..f310a2b 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 org.codeaurora.gallery.R;
+import com.android.gallery3d.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 67d1959..c281443 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.JsonWriter;
import android.util.Log;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.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 68cf0d6..dd06a97 100644
--- a/src/com/android/gallery3d/filtershow/filters/FilterRedEyeRepresentation.java
+++ b/src/com/android/gallery3d/filtershow/filters/FilterRedEyeRepresentation.java
@@ -18,7 +18,7 @@
import android.graphics.RectF;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.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 9c321f0..7bbec4d 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.JsonWriter;
import android.util.Log;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.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 ebff5ab..1ba80e8 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.JsonWriter;
import android.util.Log;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.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 172e060..4f7bc6a 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 org.codeaurora.gallery.R;
+import com.android.gallery3d.R;
import com.android.gallery3d.filtershow.editors.EditorTinyPlanet;
public class FilterTinyPlanetRepresentation extends FilterBasicRepresentation {
diff --git a/src/com/android/gallery3d/filtershow/filters/FilterTruePortraitFusionRepresentation.java b/src/com/android/gallery3d/filtershow/filters/FilterTruePortraitFusionRepresentation.java
index 3864eac..b370902 100644
--- a/src/com/android/gallery3d/filtershow/filters/FilterTruePortraitFusionRepresentation.java
+++ b/src/com/android/gallery3d/filtershow/filters/FilterTruePortraitFusionRepresentation.java
@@ -35,7 +35,7 @@
import android.util.JsonReader;
import android.util.JsonWriter;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.R;
import com.android.gallery3d.filtershow.editors.EditorTruePortraitFusion;
diff --git a/src/com/android/gallery3d/filtershow/filters/FilterVignetteRepresentation.java b/src/com/android/gallery3d/filtershow/filters/FilterVignetteRepresentation.java
index e90e12f..512594f 100644
--- a/src/com/android/gallery3d/filtershow/filters/FilterVignetteRepresentation.java
+++ b/src/com/android/gallery3d/filtershow/filters/FilterVignetteRepresentation.java
@@ -19,7 +19,7 @@
import android.util.JsonReader;
import android.util.JsonWriter;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.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/FilterWatermarkRepresentation.java b/src/com/android/gallery3d/filtershow/filters/FilterWatermarkRepresentation.java
index 3774979..52c07ba 100644
--- a/src/com/android/gallery3d/filtershow/filters/FilterWatermarkRepresentation.java
+++ b/src/com/android/gallery3d/filtershow/filters/FilterWatermarkRepresentation.java
@@ -35,7 +35,7 @@
import com.android.gallery3d.filtershow.category.WaterMarkView;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.R;
public class FilterWatermarkRepresentation extends FilterRepresentation {
public static final String NAME_LOCATION = "LOCATION";
diff --git a/src/com/android/gallery3d/filtershow/filters/HazeBusterActs.java b/src/com/android/gallery3d/filtershow/filters/HazeBusterActs.java
index a62e0c9..0960d16 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.Rect;
import android.util.Log;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.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 8f22bbe..e2a0147 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.graphics.Bitmap;
import android.graphics.BitmapFactory;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.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 9a012d6..50837ca 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 org.codeaurora.gallery.R;
+import com.android.gallery3d.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 f49f883..6acf3d4 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.Script.LaunchOptions;
import android.renderscript.Type;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.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 c11cb79..27c0e08 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 org.codeaurora.gallery.R;
+import com.android.gallery3d.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 ad7cbd7..efb9cde 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.Canvas;
import android.graphics.Rect;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.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 77dfa17..da7de93 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.PorterDuff;
import android.graphics.PorterDuffColorFilter;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.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/ImageFilterDualCamera.java b/src/com/android/gallery3d/filtershow/filters/ImageFilterDualCamera.java
index 18659c4..b264629 100755
--- a/src/com/android/gallery3d/filtershow/filters/ImageFilterDualCamera.java
+++ b/src/com/android/gallery3d/filtershow/filters/ImageFilterDualCamera.java
@@ -41,7 +41,7 @@
import android.util.Size;
import android.widget.Toast;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.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 12e4384..2d0d765 100644
--- a/src/com/android/gallery3d/filtershow/filters/ImageFilterEdge.java
+++ b/src/com/android/gallery3d/filtershow/filters/ImageFilterEdge.java
@@ -18,7 +18,7 @@
import android.graphics.Bitmap;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.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 e65cbc2..69eab73 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 org.codeaurora.gallery.R;
+import com.android.gallery3d.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 84f9b88..4956c2c 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.Color;
import android.graphics.Matrix;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.R;
import com.android.gallery3d.filtershow.pipeline.FilterEnvironment;
import android.graphics.Bitmap;
@@ -33,7 +33,7 @@
import android.renderscript.Type;
import android.util.Log;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.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 c8af46b..4c837e0 100644
--- a/src/com/android/gallery3d/filtershow/filters/ImageFilterHighlights.java
+++ b/src/com/android/gallery3d/filtershow/filters/ImageFilterHighlights.java
@@ -18,7 +18,7 @@
import android.graphics.Bitmap;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.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 2ca2265..b87c254 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 org.codeaurora.gallery.R;
+import com.android.gallery3d.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 1eb58ff..9498456 100644
--- a/src/com/android/gallery3d/filtershow/filters/ImageFilterKMeans.java
+++ b/src/com/android/gallery3d/filtershow/filters/ImageFilterKMeans.java
@@ -18,7 +18,7 @@
import android.graphics.Bitmap;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.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 ab10d6a..6406788 100644
--- a/src/com/android/gallery3d/filtershow/filters/ImageFilterMakeupBigeye.java
+++ b/src/com/android/gallery3d/filtershow/filters/ImageFilterMakeupBigeye.java
@@ -19,7 +19,7 @@
import android.graphics.Bitmap;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.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 b92ab34..8587158 100644
--- a/src/com/android/gallery3d/filtershow/filters/ImageFilterMakeupSoften.java
+++ b/src/com/android/gallery3d/filtershow/filters/ImageFilterMakeupSoften.java
@@ -19,7 +19,7 @@
import android.graphics.Bitmap;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.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 d4a1e47..4b04990 100644
--- a/src/com/android/gallery3d/filtershow/filters/ImageFilterMakeupTrimface.java
+++ b/src/com/android/gallery3d/filtershow/filters/ImageFilterMakeupTrimface.java
@@ -19,7 +19,7 @@
import android.graphics.Bitmap;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.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 817a977..e60be84 100644
--- a/src/com/android/gallery3d/filtershow/filters/ImageFilterMakeupWhiten.java
+++ b/src/com/android/gallery3d/filtershow/filters/ImageFilterMakeupWhiten.java
@@ -19,7 +19,7 @@
import android.graphics.Bitmap;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.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 88cc08f..9a1a840 100644
--- a/src/com/android/gallery3d/filtershow/filters/ImageFilterNegative.java
+++ b/src/com/android/gallery3d/filtershow/filters/ImageFilterNegative.java
@@ -2,7 +2,7 @@
import android.graphics.Bitmap;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.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 e00c836..31d1575 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.renderscript.*;
import android.util.Log;
import android.content.res.Resources;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.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 7f5d7e8..c3124ff 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 org.codeaurora.gallery.R;
+import com.android.gallery3d.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 2b30030..bd119bb 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 org.codeaurora.gallery.R;
+import com.android.gallery3d.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 9f6af5a..e556c23 100755
--- a/src/com/android/gallery3d/filtershow/filters/ImageFilterSharpen.java
+++ b/src/com/android/gallery3d/filtershow/filters/ImageFilterSharpen.java
@@ -20,7 +20,7 @@
import android.renderscript.ScriptIntrinsicConvolve3x3;
import com.android.gallery3d.filtershow.editors.BasicEditor;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.R;
public class ImageFilterSharpen extends ImageFilterRS {
private static final String SERIALIZATION_NAME = "SHARPEN";
diff --git a/src/com/android/gallery3d/filtershow/filters/ImageFilterTruePortrait.java b/src/com/android/gallery3d/filtershow/filters/ImageFilterTruePortrait.java
index 7af5f6d..38d64ad 100644
--- a/src/com/android/gallery3d/filtershow/filters/ImageFilterTruePortrait.java
+++ b/src/com/android/gallery3d/filtershow/filters/ImageFilterTruePortrait.java
@@ -39,7 +39,7 @@
import android.util.Log;
import android.widget.Toast;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.R;
import com.android.gallery3d.app.GalleryAppImpl;
import com.android.gallery3d.filtershow.cache.BitmapCache;
diff --git a/src/com/android/gallery3d/filtershow/filters/ImageFilterVibrance.java b/src/com/android/gallery3d/filtershow/filters/ImageFilterVibrance.java
index 575bb43..86be9a1 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 org.codeaurora.gallery.R;
+import com.android.gallery3d.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 c4bd503..fd8b5bd 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.Canvas;
import android.graphics.Matrix;
import android.graphics.Rect;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.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 0ceaca3..7aa19a4 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 org.codeaurora.gallery.R;
+import com.android.gallery3d.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 f2eb81b..cfed5b8 100755
--- a/src/com/android/gallery3d/filtershow/filters/SeeStraightActs.java
+++ b/src/com/android/gallery3d/filtershow/filters/SeeStraightActs.java
@@ -33,7 +33,7 @@
import android.util.Log;
import android.widget.Toast;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.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 6260502..d3e4dfe 100755
--- a/src/com/android/gallery3d/filtershow/filters/TrueScannerActs.java
+++ b/src/com/android/gallery3d/filtershow/filters/TrueScannerActs.java
@@ -36,7 +36,7 @@
import android.widget.SeekBar;
import android.widget.Toast;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.R;
import com.android.gallery3d.app.GalleryActivity;
import com.android.gallery3d.filtershow.FilterShowActivity;
import com.android.gallery3d.filtershow.controller.Parameter;
diff --git a/src/com/android/gallery3d/filtershow/filters/TrueScannerWhiteBoardActs.java b/src/com/android/gallery3d/filtershow/filters/TrueScannerWhiteBoardActs.java
index a403c24..4ad90c9 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 org.codeaurora.gallery.R;
+import com.android.gallery3d.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 b67da46..06fc1dc 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.Shader;
import android.util.Log;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.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 4b1ab7b..2987015 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.Rect;
import android.graphics.Shader;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.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 baabbad..d078874 100644
--- a/src/com/android/gallery3d/filtershow/imageshow/ImageCrop.java
+++ b/src/com/android/gallery3d/filtershow/imageshow/ImageCrop.java
@@ -35,7 +35,7 @@
import com.android.gallery3d.filtershow.editors.EditorCrop;
import com.android.gallery3d.filtershow.filters.FilterCropRepresentation;
import com.android.gallery3d.filtershow.imageshow.GeometryMathUtils.GeometryHolder;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.R;
public class ImageCrop extends ImageShow {
private static final String TAG = ImageCrop.class.getSimpleName();
diff --git a/src/com/android/gallery3d/filtershow/imageshow/ImageCurves.java b/src/com/android/gallery3d/filtershow/imageshow/ImageCurves.java
index 11964df..3fb75c6 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.LinearLayout;
import android.widget.PopupMenu;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.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 e128069..795a247 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.util.AttributeSet;
import android.view.MotionEvent;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.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 d9b8a53..b55cc2b 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.util.AttributeSet;
import android.view.MotionEvent;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.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 02a50b4..48fe2ff 100755
--- a/src/com/android/gallery3d/filtershow/imageshow/ImageShow.java
+++ b/src/com/android/gallery3d/filtershow/imageshow/ImageShow.java
@@ -45,7 +45,7 @@
import android.view.View;
import android.widget.LinearLayout;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.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/imageshow/ImageStraighten.java b/src/com/android/gallery3d/filtershow/imageshow/ImageStraighten.java
index d83c0ad..3cc77ca 100644
--- a/src/com/android/gallery3d/filtershow/imageshow/ImageStraighten.java
+++ b/src/com/android/gallery3d/filtershow/imageshow/ImageStraighten.java
@@ -29,7 +29,7 @@
import android.util.AttributeSet;
import android.view.MotionEvent;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.R;
import com.android.gallery3d.filtershow.crop.CropDrawingUtils;
import com.android.gallery3d.filtershow.editors.EditorStraighten;
import com.android.gallery3d.filtershow.filters.FilterCropRepresentation;
diff --git a/src/com/android/gallery3d/filtershow/imageshow/ImageTrueScanner.java b/src/com/android/gallery3d/filtershow/imageshow/ImageTrueScanner.java
index d72ec37..2c18c6a 100755
--- a/src/com/android/gallery3d/filtershow/imageshow/ImageTrueScanner.java
+++ b/src/com/android/gallery3d/filtershow/imageshow/ImageTrueScanner.java
@@ -50,7 +50,7 @@
import com.android.gallery3d.filtershow.filters.FilterCropRepresentation;
import com.android.gallery3d.filtershow.filters.TrueScannerActs;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.R;
public class ImageTrueScanner extends ImageShow {
private static final String TAG = ImageTrueScanner.class.getSimpleName();
diff --git a/src/com/android/gallery3d/filtershow/info/InfoPanel.java b/src/com/android/gallery3d/filtershow/info/InfoPanel.java
index 700291a..ec4f346 100644
--- a/src/com/android/gallery3d/filtershow/info/InfoPanel.java
+++ b/src/com/android/gallery3d/filtershow/info/InfoPanel.java
@@ -29,7 +29,7 @@
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.TextView;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.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/mediapicker/MediaAdapter.java b/src/com/android/gallery3d/filtershow/mediapicker/MediaAdapter.java
index 9a53a93..761363f 100644
--- a/src/com/android/gallery3d/filtershow/mediapicker/MediaAdapter.java
+++ b/src/com/android/gallery3d/filtershow/mediapicker/MediaAdapter.java
@@ -44,7 +44,7 @@
import java.util.List;
import com.android.gallery3d.filtershow.mediapicker.imageloader.ImageLoaderStub;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.R;
/**
* Adapter for display media item list.
diff --git a/src/com/android/gallery3d/filtershow/mediapicker/MediaPicker.java b/src/com/android/gallery3d/filtershow/mediapicker/MediaPicker.java
index 7fa96fa..45c23b8 100644
--- a/src/com/android/gallery3d/filtershow/mediapicker/MediaPicker.java
+++ b/src/com/android/gallery3d/filtershow/mediapicker/MediaPicker.java
@@ -47,7 +47,7 @@
import com.android.photos.views.HeaderGridView;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.R;
public class MediaPicker extends ViewGroup {
diff --git a/src/com/android/gallery3d/filtershow/mediapicker/MediaPickerFragment.java b/src/com/android/gallery3d/filtershow/mediapicker/MediaPickerFragment.java
index 42a0fb9..74ae093 100644
--- a/src/com/android/gallery3d/filtershow/mediapicker/MediaPickerFragment.java
+++ b/src/com/android/gallery3d/filtershow/mediapicker/MediaPickerFragment.java
@@ -56,7 +56,7 @@
import com.android.gallery3d.filtershow.mediapicker.imageloader.ImageLoaderStub;
import com.android.photos.views.HeaderGridView;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.R;
/**
* Display list of videos, photos from {@link MediaStore} and select one or many
diff --git a/src/com/android/gallery3d/filtershow/mediapicker/SelectedImageView.java b/src/com/android/gallery3d/filtershow/mediapicker/SelectedImageView.java
index 11b4ee6..b836e79 100644
--- a/src/com/android/gallery3d/filtershow/mediapicker/SelectedImageView.java
+++ b/src/com/android/gallery3d/filtershow/mediapicker/SelectedImageView.java
@@ -35,7 +35,7 @@
import android.util.AttributeSet;
import android.widget.ImageView;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.R;
public class SelectedImageView extends ImageView {
diff --git a/src/com/android/gallery3d/filtershow/mediapicker/imageloader/ImageLoaderOptions.java b/src/com/android/gallery3d/filtershow/mediapicker/imageloader/ImageLoaderOptions.java
index 2e6261f..206360c 100644
--- a/src/com/android/gallery3d/filtershow/mediapicker/imageloader/ImageLoaderOptions.java
+++ b/src/com/android/gallery3d/filtershow/mediapicker/imageloader/ImageLoaderOptions.java
@@ -32,7 +32,7 @@
import android.content.res.Resources;
import android.graphics.drawable.Drawable;
import android.os.Handler;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.R;
public class ImageLoaderOptions {
diff --git a/src/com/android/gallery3d/filtershow/pipeline/ImagePreset.java b/src/com/android/gallery3d/filtershow/pipeline/ImagePreset.java
index f5a5689..cbfe197 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.JsonWriter;
import android.util.Log;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.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 cd3dfe7..39ae8c5 100755
--- a/src/com/android/gallery3d/filtershow/pipeline/ProcessingService.java
+++ b/src/com/android/gallery3d/filtershow/pipeline/ProcessingService.java
@@ -32,7 +32,7 @@
import android.os.IBinder;
import android.util.Log;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.R;
import com.android.gallery3d.filtershow.FilterShowActivity;
import com.android.gallery3d.filtershow.filters.FiltersManager;
import com.android.gallery3d.filtershow.filters.ImageFilter;
diff --git a/src/com/android/gallery3d/filtershow/presets/PresetManagementDialog.java b/src/com/android/gallery3d/filtershow/presets/PresetManagementDialog.java
index 1bfe2d1..cb20b6d 100755
--- 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.view.Window;
import android.widget.CheckBox;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.R;
import com.android.gallery3d.filtershow.FilterShowActivity;
import com.android.gallery3d.ui.BaseDialogFragment;
import com.android.gallery3d.util.GalleryUtils;
diff --git a/src/com/android/gallery3d/filtershow/presets/UserPresetsAdapter.java b/src/com/android/gallery3d/filtershow/presets/UserPresetsAdapter.java
index be48ccc..dab9ea4 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.EditText;
import android.widget.ImageButton;
import android.widget.ImageView;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.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 cf3499d..5225852 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.view.View;
import android.view.ViewGroup;
import android.widget.ArrayAdapter;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.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 7a4040b..cadb5ae 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.ViewGroup;
import android.widget.ImageButton;
import android.widget.LinearLayout;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.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 105c671..4ddb363 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.ViewGroup;
import android.widget.Adapter;
import android.widget.LinearLayout;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.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 9035b8a..a43cd47 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.view.MotionEvent;
import android.view.View;
import android.widget.LinearLayout;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.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 433af8b..443065f 100755
--- a/src/com/android/gallery3d/filtershow/tools/SaveImage.java
+++ b/src/com/android/gallery3d/filtershow/tools/SaveImage.java
@@ -46,7 +46,7 @@
import android.util.Log;
import android.widget.Toast;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.R;
import com.android.gallery3d.app.GalleryActivity;
import com.android.gallery3d.common.Utils;
diff --git a/src/com/android/gallery3d/filtershow/tools/TruePortraitNativeEngine.java b/src/com/android/gallery3d/filtershow/tools/TruePortraitNativeEngine.java
index 4322bb9..620e61b 100644
--- a/src/com/android/gallery3d/filtershow/tools/TruePortraitNativeEngine.java
+++ b/src/com/android/gallery3d/filtershow/tools/TruePortraitNativeEngine.java
@@ -44,7 +44,7 @@
import androidx.fragment.app.FragmentManager;
import android.util.Log;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.R;
import com.android.gallery3d.filtershow.filters.FilterDrawRepresentation.StrokeData;
import com.android.gallery3d.filtershow.ui.AlertMsgDialog;
diff --git a/src/com/android/gallery3d/filtershow/tools/XmpPresets.java b/src/com/android/gallery3d/filtershow/tools/XmpPresets.java
index dfb0bc2..7095e74 100644
--- a/src/com/android/gallery3d/filtershow/tools/XmpPresets.java
+++ b/src/com/android/gallery3d/filtershow/tools/XmpPresets.java
@@ -23,7 +23,7 @@
import com.adobe.xmp.XMPException;
import com.adobe.xmp.XMPMeta;
import com.adobe.xmp.XMPMetaFactory;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.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/AlertMsgDialog.java b/src/com/android/gallery3d/filtershow/ui/AlertMsgDialog.java
index 3a4ddac..38d5448 100644
--- a/src/com/android/gallery3d/filtershow/ui/AlertMsgDialog.java
+++ b/src/com/android/gallery3d/filtershow/ui/AlertMsgDialog.java
@@ -35,7 +35,7 @@
import com.android.gallery3d.ui.BaseDialogFragment;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.R;
public class AlertMsgDialog extends BaseDialogFragment {
private int mTitleId = -1;
diff --git a/src/com/android/gallery3d/filtershow/ui/DoNotShowAgainDialog.java b/src/com/android/gallery3d/filtershow/ui/DoNotShowAgainDialog.java
index 73561e1..98b679b 100644
--- a/src/com/android/gallery3d/filtershow/ui/DoNotShowAgainDialog.java
+++ b/src/com/android/gallery3d/filtershow/ui/DoNotShowAgainDialog.java
@@ -39,7 +39,7 @@
import android.widget.CheckBox;
import android.widget.TextView;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.R;
import com.android.gallery3d.ui.BaseDialogFragment;
import com.android.gallery3d.util.GalleryUtils;
diff --git a/src/com/android/gallery3d/filtershow/ui/ExportDialog.java b/src/com/android/gallery3d/filtershow/ui/ExportDialog.java
index 419d6bc..181e215 100755
--- a/src/com/android/gallery3d/filtershow/ui/ExportDialog.java
+++ b/src/com/android/gallery3d/filtershow/ui/ExportDialog.java
@@ -33,7 +33,7 @@
import android.widget.SeekBar;
import android.widget.TextView;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.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 8957f2d..c1e4109 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.util.AttributeSet;
import android.widget.ImageButton;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.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 0b26e48..91e5cbe 100644
--- a/src/com/android/gallery3d/gadget/PhotoAppWidgetProvider.java
+++ b/src/com/android/gallery3d/gadget/PhotoAppWidgetProvider.java
@@ -32,7 +32,7 @@
import android.view.View;
import android.widget.RemoteViews;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.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 4a90966..e5b0a37 100644
--- a/src/com/android/gallery3d/gadget/WidgetClickHandler.java
+++ b/src/com/android/gallery3d/gadget/WidgetClickHandler.java
@@ -26,7 +26,7 @@
import android.util.Log;
import android.widget.Toast;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.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 fd5aa6c..5253026 100755
--- a/src/com/android/gallery3d/gadget/WidgetConfigure.java
+++ b/src/com/android/gallery3d/gadget/WidgetConfigure.java
@@ -27,7 +27,7 @@
import android.widget.RemoteViews;
import android.widget.Toast;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.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 c139aff..b2f3113 100644
--- a/src/com/android/gallery3d/gadget/WidgetService.java
+++ b/src/com/android/gallery3d/gadget/WidgetService.java
@@ -26,7 +26,7 @@
import android.widget.RemoteViews;
import android.widget.RemoteViewsService;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.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 177817c..1694f1c 100644
--- a/src/com/android/gallery3d/gadget/WidgetTypeChooser.java
+++ b/src/com/android/gallery3d/gadget/WidgetTypeChooser.java
@@ -25,7 +25,7 @@
import android.widget.RadioGroup;
import android.widget.RadioGroup.OnCheckedChangeListener;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.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 8f37ecc..c20c186 100644
--- a/src/com/android/gallery3d/gadget/WidgetUtils.java
+++ b/src/com/android/gallery3d/gadget/WidgetUtils.java
@@ -24,7 +24,7 @@
import android.graphics.Paint;
import android.util.Log;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.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 be9f05c..b0b3e05 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 org.codeaurora.gallery.R;
+import com.android.gallery3d.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 3927cd7..262e410 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 org.codeaurora.gallery.R;
+import com.android.gallery3d.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 766bfef..c3ce59f 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 org.codeaurora.gallery.R;
+import com.android.gallery3d.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 241e595..6c1dd9f 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 org.codeaurora.gallery.R;
+import com.android.gallery3d.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 fc94e6a..cd31e82 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 org.codeaurora.gallery.R;
+import com.android.gallery3d.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 b41129d..00785dd 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 org.codeaurora.gallery.R;
+import com.android.gallery3d.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 f28d677..5362efd 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 org.codeaurora.gallery.R;
+import com.android.gallery3d.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 d78e41a..844a750 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 org.codeaurora.gallery.R;
+import com.android.gallery3d.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 d9a6bc0..0807814 100644
--- a/src/com/android/gallery3d/ui/AbstractSlotRenderer.java
+++ b/src/com/android/gallery3d/ui/AbstractSlotRenderer.java
@@ -19,7 +19,7 @@
import android.content.Context;
import android.graphics.Rect;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.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 b78b034..b46a393 100644
--- a/src/com/android/gallery3d/ui/ActionModeHandler.java
+++ b/src/com/android/gallery3d/ui/ActionModeHandler.java
@@ -32,7 +32,7 @@
import android.widget.Button;
import android.widget.Toolbar;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.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 72144ae..0216ffd 100644
--- a/src/com/android/gallery3d/ui/AlbumLabelMaker.java
+++ b/src/com/android/gallery3d/ui/AlbumLabelMaker.java
@@ -30,7 +30,7 @@
import android.text.TextUtils;
import android.view.View;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.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 4f462b4..8dd1496 100644
--- a/src/com/android/gallery3d/ui/AlbumSetSlidingWindow.java
+++ b/src/com/android/gallery3d/ui/AlbumSetSlidingWindow.java
@@ -19,7 +19,7 @@
import android.graphics.Bitmap;
import android.os.Message;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.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 264325a..5c817e6 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 org.codeaurora.gallery.R;
+import com.android.gallery3d.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 167615b..4f61040 100644
--- a/src/com/android/gallery3d/ui/DetailsHelper.java
+++ b/src/com/android/gallery3d/ui/DetailsHelper.java
@@ -20,7 +20,7 @@
import android.graphics.BitmapFactory;
import android.view.View.MeasureSpec;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.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 5b3a016..c9c7836 100644
--- a/src/com/android/gallery3d/ui/DialogDetailsView.java
+++ b/src/com/android/gallery3d/ui/DialogDetailsView.java
@@ -32,7 +32,7 @@
import android.widget.ListView;
import android.widget.TextView;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.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 1463655..87ff0c5 100644
--- a/src/com/android/gallery3d/ui/EdgeEffect.java
+++ b/src/com/android/gallery3d/ui/EdgeEffect.java
@@ -22,7 +22,7 @@
import android.view.animation.DecelerateInterpolator;
import android.view.animation.Interpolator;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.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 579fd05..0fc7e3c 100755
--- a/src/com/android/gallery3d/ui/GLRootView.java
+++ b/src/com/android/gallery3d/ui/GLRootView.java
@@ -29,7 +29,7 @@
import android.view.SurfaceHolder;
import android.view.View;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.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/ManageCacheDrawer.java b/src/com/android/gallery3d/ui/ManageCacheDrawer.java
index 68a201b..d210bd1 100644
--- a/src/com/android/gallery3d/ui/ManageCacheDrawer.java
+++ b/src/com/android/gallery3d/ui/ManageCacheDrawer.java
@@ -18,7 +18,7 @@
import android.content.Context;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.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 bb8f1b1..2d8697e 100644
--- a/src/com/android/gallery3d/ui/MenuExecutor.java
+++ b/src/com/android/gallery3d/ui/MenuExecutor.java
@@ -34,7 +34,7 @@
import android.view.Menu;
import android.view.MenuItem;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.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 246e647..a4facfc 100755
--- a/src/com/android/gallery3d/ui/PhotoView.java
+++ b/src/com/android/gallery3d/ui/PhotoView.java
@@ -27,7 +27,7 @@
import android.view.View.MeasureSpec;
import android.view.animation.AccelerateInterpolator;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.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 404aac0..a51b517 100644
--- a/src/com/android/gallery3d/ui/PopupList.java
+++ b/src/com/android/gallery3d/ui/PopupList.java
@@ -33,7 +33,7 @@
import android.widget.PopupWindow;
import android.widget.TextView;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.R;
import java.util.ArrayList;
diff --git a/src/com/android/gallery3d/ui/ProgressSpinner.java b/src/com/android/gallery3d/ui/ProgressSpinner.java
index 1d2f3cb..1b31af2 100644
--- a/src/com/android/gallery3d/ui/ProgressSpinner.java
+++ b/src/com/android/gallery3d/ui/ProgressSpinner.java
@@ -18,7 +18,7 @@
import android.content.Context;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.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 07815cd..a8e5207 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.OnClickListener;
import android.widget.Button;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.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 65abffd..95d8364 100644
--- a/src/com/android/gallery3d/ui/SlotView.java
+++ b/src/com/android/gallery3d/ui/SlotView.java
@@ -25,7 +25,7 @@
import android.view.View;
import android.view.animation.DecelerateInterpolator;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.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 52a3af2..7a2c9e0 100755
--- a/src/com/android/gallery3d/ui/TimeLineTitleMaker.java
+++ b/src/com/android/gallery3d/ui/TimeLineTitleMaker.java
@@ -33,7 +33,7 @@
import com.android.gallery3d.util.ThreadPool;
import com.android.gallery3d.util.ThreadPool.JobContext;
import com.android.photos.data.GalleryBitmapPool;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.R;
import java.util.Locale;
diff --git a/src/com/android/gallery3d/ui/UndoBarView.java b/src/com/android/gallery3d/ui/UndoBarView.java
index 6ac2428..42f12ae 100644
--- a/src/com/android/gallery3d/ui/UndoBarView.java
+++ b/src/com/android/gallery3d/ui/UndoBarView.java
@@ -19,7 +19,7 @@
import android.content.Context;
import android.view.MotionEvent;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.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/GIFView.java b/src/com/android/gallery3d/util/GIFView.java
index 7bcc52d..f8e1ec9 100755
--- a/src/com/android/gallery3d/util/GIFView.java
+++ b/src/com/android/gallery3d/util/GIFView.java
@@ -1,6 +1,6 @@
package com.android.gallery3d.util;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.R;
import android.content.Context;
import android.content.ContentResolver;
diff --git a/src/com/android/gallery3d/util/GalleryUtils.java b/src/com/android/gallery3d/util/GalleryUtils.java
index 3507b08..4ad394e 100644
--- a/src/com/android/gallery3d/util/GalleryUtils.java
+++ b/src/com/android/gallery3d/util/GalleryUtils.java
@@ -40,7 +40,7 @@
import android.view.WindowManager;
import android.widget.Toast;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.R;
import com.android.gallery3d.app.GalleryActivity;
import com.android.gallery3d.common.ApiHelper;
import com.android.gallery3d.data.DataManager;
diff --git a/src/com/android/gallery3d/util/ViewGifImage.java b/src/com/android/gallery3d/util/ViewGifImage.java
index a85af56..cdd5092 100755
--- a/src/com/android/gallery3d/util/ViewGifImage.java
+++ b/src/com/android/gallery3d/util/ViewGifImage.java
@@ -1,6 +1,6 @@
package com.android.gallery3d.util;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.R;
import android.app.Activity;
import android.content.res.Configuration;
diff --git a/src/org/codeaurora/gallery3d/video/AbstractPermissionPreferenceActivity.java b/src/com/android/gallery3d/video/AbstractPermissionPreferenceActivity.java
similarity index 98%
rename from src/org/codeaurora/gallery3d/video/AbstractPermissionPreferenceActivity.java
rename to src/com/android/gallery3d/video/AbstractPermissionPreferenceActivity.java
index a6be5af..be104c9 100644
--- a/src/org/codeaurora/gallery3d/video/AbstractPermissionPreferenceActivity.java
+++ b/src/com/android/gallery3d/video/AbstractPermissionPreferenceActivity.java
@@ -26,7 +26,7 @@
* OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
* IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-package org.codeaurora.gallery3d.video;
+package com.android.gallery3d.video;
import android.Manifest;
import android.content.pm.PackageManager;
diff --git a/src/org/codeaurora/gallery3d/video/BookmarkActivity.java b/src/com/android/gallery3d/video/BookmarkActivity.java
similarity index 98%
rename from src/org/codeaurora/gallery3d/video/BookmarkActivity.java
rename to src/com/android/gallery3d/video/BookmarkActivity.java
index 75e4562..fb8df5a 100644
--- a/src/org/codeaurora/gallery3d/video/BookmarkActivity.java
+++ b/src/com/android/gallery3d/video/BookmarkActivity.java
@@ -1,4 +1,4 @@
-package org.codeaurora.gallery3d.video;
+package com.android.gallery3d.video;
import android.app.Activity;
import android.app.AlertDialog;
@@ -28,7 +28,7 @@
import android.widget.SimpleCursorAdapter;
import android.widget.TextView;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.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/com/android/gallery3d/video/BookmarkEnhance.java
similarity index 98%
rename from src/org/codeaurora/gallery3d/video/BookmarkEnhance.java
rename to src/com/android/gallery3d/video/BookmarkEnhance.java
index a5424d6..f5c2e0e 100644
--- a/src/org/codeaurora/gallery3d/video/BookmarkEnhance.java
+++ b/src/com/android/gallery3d/video/BookmarkEnhance.java
@@ -1,4 +1,4 @@
-package org.codeaurora.gallery3d.video;
+package com.android.gallery3d.video;
import android.content.ContentResolver;
import android.content.ContentUris;
@@ -8,7 +8,7 @@
import android.net.Uri;
import android.util.Log;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.R;
public class BookmarkEnhance {
private static final String TAG = "BookmarkEnhance";
diff --git a/src/org/codeaurora/gallery3d/video/BookmarkHooker.java b/src/com/android/gallery3d/video/BookmarkHooker.java
similarity index 92%
rename from src/org/codeaurora/gallery3d/video/BookmarkHooker.java
rename to src/com/android/gallery3d/video/BookmarkHooker.java
index 867ca11..e148909 100644
--- a/src/org/codeaurora/gallery3d/video/BookmarkHooker.java
+++ b/src/com/android/gallery3d/video/BookmarkHooker.java
@@ -1,18 +1,18 @@
-package org.codeaurora.gallery3d.video;
+package com.android.gallery3d.video;
import android.content.Intent;
import android.graphics.Bitmap;
import android.view.Menu;
import android.view.MenuItem;
-import org.codeaurora.gallery.R;
-import org.codeaurora.gallery3d.ext.MovieUtils;
+import com.android.gallery3d.R;
+import com.android.gallery3d.ext.MovieUtils;
public class BookmarkHooker extends MovieHooker {
private static final String TAG = "BookmarkHooker";
private static final boolean LOG = false;
- private static final String ACTION_BOOKMARK = "org.codeaurora.bookmark.VIEW";
+ private static final String ACTION_BOOKMARK = "com.android.bookmark.VIEW";
private static final int MENU_BOOKMARK_ADD = 1;
private static final int MENU_BOOKMARK_DISPLAY = 2;
private MenuItem mMenuBookmarks;
diff --git a/src/org/codeaurora/gallery3d/video/CodeauroraVideoView.java b/src/com/android/gallery3d/video/CodeauroraVideoView.java
similarity index 99%
rename from src/org/codeaurora/gallery3d/video/CodeauroraVideoView.java
rename to src/com/android/gallery3d/video/CodeauroraVideoView.java
index 415972a..bcf641c 100644
--- a/src/org/codeaurora/gallery3d/video/CodeauroraVideoView.java
+++ b/src/com/android/gallery3d/video/CodeauroraVideoView.java
@@ -1,4 +1,4 @@
-package org.codeaurora.gallery3d.video;
+package com.android.gallery3d.video;
import android.app.AlertDialog;
import android.app.KeyguardManager;
@@ -32,7 +32,7 @@
import com.android.gallery3d.common.ApiHelper;
import com.android.gallery3d.common.ApiHelper.Metadata;
-import org.codeaurora.gallery3d.video.ScreenModeManager.ScreenModeListener;
+import com.android.gallery3d.video.ScreenModeManager.ScreenModeListener;
import java.io.IOException;
import java.util.Map;
diff --git a/src/org/codeaurora/gallery3d/video/DmReceiver.java b/src/com/android/gallery3d/video/DmReceiver.java
similarity index 98%
rename from src/org/codeaurora/gallery3d/video/DmReceiver.java
rename to src/com/android/gallery3d/video/DmReceiver.java
index 616ce33..4faa60b 100644
--- a/src/org/codeaurora/gallery3d/video/DmReceiver.java
+++ b/src/com/android/gallery3d/video/DmReceiver.java
@@ -1,4 +1,4 @@
-package org.codeaurora.gallery3d.video;
+package com.android.gallery3d.video;
import android.app.Notification;
import android.app.NotificationManager;
diff --git a/src/org/codeaurora/gallery3d/video/ExtensionHelper.java b/src/com/android/gallery3d/video/ExtensionHelper.java
similarity index 93%
rename from src/org/codeaurora/gallery3d/video/ExtensionHelper.java
rename to src/com/android/gallery3d/video/ExtensionHelper.java
index 414520b..c5bd5aa 100755
--- a/src/org/codeaurora/gallery3d/video/ExtensionHelper.java
+++ b/src/com/android/gallery3d/video/ExtensionHelper.java
@@ -26,15 +26,15 @@
OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-package org.codeaurora.gallery3d.video;
+package com.android.gallery3d.video;
import android.content.Context;
import com.android.gallery3d.app.MovieActivity;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.R;
-import org.codeaurora.gallery3d.ext.ActivityHookerGroup;
-import org.codeaurora.gallery3d.ext.IActivityHooker;
+import com.android.gallery3d.ext.ActivityHookerGroup;
+import com.android.gallery3d.ext.IActivityHooker;
import java.util.ArrayList;
import java.util.List;
diff --git a/src/org/codeaurora/gallery3d/video/IControllerRewindAndForward.java b/src/com/android/gallery3d/video/IControllerRewindAndForward.java
similarity index 96%
rename from src/org/codeaurora/gallery3d/video/IControllerRewindAndForward.java
rename to src/com/android/gallery3d/video/IControllerRewindAndForward.java
index 1fc7f70..433c03d 100644
--- a/src/org/codeaurora/gallery3d/video/IControllerRewindAndForward.java
+++ b/src/com/android/gallery3d/video/IControllerRewindAndForward.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.codeaurora.gallery3d.video;
+package com.android.gallery3d.video;
import com.android.gallery3d.app.ControllerOverlay;
import com.android.gallery3d.app.ControllerOverlay.Listener;
diff --git a/src/org/codeaurora/gallery3d/video/IVideoSnapshotListener.java b/src/com/android/gallery3d/video/IVideoSnapshotListener.java
similarity index 97%
rename from src/org/codeaurora/gallery3d/video/IVideoSnapshotListener.java
rename to src/com/android/gallery3d/video/IVideoSnapshotListener.java
index b8675ce..a006a3d 100644
--- a/src/org/codeaurora/gallery3d/video/IVideoSnapshotListener.java
+++ b/src/com/android/gallery3d/video/IVideoSnapshotListener.java
@@ -27,7 +27,7 @@
* IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-package org.codeaurora.gallery3d.video;
+package com.android.gallery3d.video;
public interface IVideoSnapshotListener {
void onVideoSnapshot();
diff --git a/src/org/codeaurora/gallery3d/video/LoopVideoHooker.java b/src/com/android/gallery3d/video/LoopVideoHooker.java
similarity index 93%
rename from src/org/codeaurora/gallery3d/video/LoopVideoHooker.java
rename to src/com/android/gallery3d/video/LoopVideoHooker.java
index ec660b9..93917f4 100644
--- a/src/org/codeaurora/gallery3d/video/LoopVideoHooker.java
+++ b/src/com/android/gallery3d/video/LoopVideoHooker.java
@@ -1,10 +1,10 @@
-package org.codeaurora.gallery3d.video;
+package com.android.gallery3d.video;
import android.view.Menu;
import android.view.MenuItem;
-import org.codeaurora.gallery.R;
-import org.codeaurora.gallery3d.ext.MovieUtils;
+import com.android.gallery3d.R;
+import com.android.gallery3d.ext.MovieUtils;
public class LoopVideoHooker extends MovieHooker {
diff --git a/src/org/codeaurora/gallery3d/video/MovieHooker.java b/src/com/android/gallery3d/video/MovieHooker.java
similarity index 84%
rename from src/org/codeaurora/gallery3d/video/MovieHooker.java
rename to src/com/android/gallery3d/video/MovieHooker.java
index a859d44..55fdb0c 100644
--- a/src/org/codeaurora/gallery3d/video/MovieHooker.java
+++ b/src/com/android/gallery3d/video/MovieHooker.java
@@ -1,10 +1,10 @@
-package org.codeaurora.gallery3d.video;
+package com.android.gallery3d.video;
import android.util.Log;
-import org.codeaurora.gallery3d.ext.ActivityHooker;
-import org.codeaurora.gallery3d.ext.IMovieItem;
-import org.codeaurora.gallery3d.ext.IMoviePlayer;
+import com.android.gallery3d.ext.ActivityHooker;
+import com.android.gallery3d.ext.IMovieItem;
+import com.android.gallery3d.ext.IMoviePlayer;
public class MovieHooker extends ActivityHooker {
diff --git a/src/org/codeaurora/gallery3d/video/MovieListHooker.java b/src/com/android/gallery3d/video/MovieListHooker.java
similarity index 90%
rename from src/org/codeaurora/gallery3d/video/MovieListHooker.java
rename to src/com/android/gallery3d/video/MovieListHooker.java
index 1020981..6745c1e 100644
--- a/src/org/codeaurora/gallery3d/video/MovieListHooker.java
+++ b/src/com/android/gallery3d/video/MovieListHooker.java
@@ -1,16 +1,16 @@
-package org.codeaurora.gallery3d.video;
+package com.android.gallery3d.video;
import android.os.Bundle;
import android.util.Log;
import android.view.Menu;
import android.view.MenuItem;
-import org.codeaurora.gallery.R;
-import org.codeaurora.gallery3d.ext.IMovieItem;
-import org.codeaurora.gallery3d.ext.IMovieList;
-import org.codeaurora.gallery3d.ext.IMovieListLoader;
-import org.codeaurora.gallery3d.ext.IMovieListLoader.LoaderListener;
-import org.codeaurora.gallery3d.ext.MovieListLoader;
+import com.android.gallery3d.R;
+import com.android.gallery3d.ext.IMovieItem;
+import com.android.gallery3d.ext.IMovieList;
+import com.android.gallery3d.ext.IMovieListLoader;
+import com.android.gallery3d.ext.IMovieListLoader.LoaderListener;
+import com.android.gallery3d.ext.MovieListLoader;
public class MovieListHooker extends MovieHooker implements LoaderListener {
private static final String TAG = "MovieListHooker";
diff --git a/src/org/codeaurora/gallery3d/video/MovieTitleHelper.java b/src/com/android/gallery3d/video/MovieTitleHelper.java
similarity index 98%
rename from src/org/codeaurora/gallery3d/video/MovieTitleHelper.java
rename to src/com/android/gallery3d/video/MovieTitleHelper.java
index 4f23e81..757b9f2 100644
--- a/src/org/codeaurora/gallery3d/video/MovieTitleHelper.java
+++ b/src/com/android/gallery3d/video/MovieTitleHelper.java
@@ -1,4 +1,4 @@
-package org.codeaurora.gallery3d.video;
+package com.android.gallery3d.video;
import android.content.Context;
import android.database.Cursor;
diff --git a/src/org/codeaurora/gallery3d/video/ScreenModeManager.java b/src/com/android/gallery3d/video/ScreenModeManager.java
similarity index 98%
rename from src/org/codeaurora/gallery3d/video/ScreenModeManager.java
rename to src/com/android/gallery3d/video/ScreenModeManager.java
index a1c04c6..24d6501 100644
--- a/src/org/codeaurora/gallery3d/video/ScreenModeManager.java
+++ b/src/com/android/gallery3d/video/ScreenModeManager.java
@@ -1,4 +1,4 @@
-package org.codeaurora.gallery3d.video;
+package com.android.gallery3d.video;
import android.util.Log;
diff --git a/src/org/codeaurora/gallery3d/video/SettingsActivity.java b/src/com/android/gallery3d/video/SettingsActivity.java
similarity index 99%
rename from src/org/codeaurora/gallery3d/video/SettingsActivity.java
rename to src/com/android/gallery3d/video/SettingsActivity.java
index bf7b7d7..1b7dcbe 100755
--- a/src/org/codeaurora/gallery3d/video/SettingsActivity.java
+++ b/src/com/android/gallery3d/video/SettingsActivity.java
@@ -1,4 +1,4 @@
-package org.codeaurora.gallery3d.video;
+package com.android.gallery3d.video;
import android.app.ActionBar;
import android.content.Context;
@@ -20,7 +20,7 @@
import android.text.method.DigitsKeyListener;
import android.util.Log;
import android.view.MenuItem;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.R;
import com.android.gallery3d.common.ApiHelper;
import com.android.gallery3d.common.ApiHelper.SystemProperties;
diff --git a/src/org/codeaurora/gallery3d/video/SpeakerHooker.java b/src/com/android/gallery3d/video/SpeakerHooker.java
similarity index 98%
rename from src/org/codeaurora/gallery3d/video/SpeakerHooker.java
rename to src/com/android/gallery3d/video/SpeakerHooker.java
index 3ba641e..a583657 100755
--- a/src/org/codeaurora/gallery3d/video/SpeakerHooker.java
+++ b/src/com/android/gallery3d/video/SpeakerHooker.java
@@ -26,7 +26,7 @@
OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-package org.codeaurora.gallery3d.video;
+package com.android.gallery3d.video;
import android.bluetooth.BluetoothClass;
import android.bluetooth.BluetoothDevice;
@@ -40,7 +40,7 @@
import android.view.MenuItem;
import android.widget.Toast;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.R;
import com.android.gallery3d.common.ApiHelper.AudioSystem;
public class SpeakerHooker extends MovieHooker {
diff --git a/src/org/codeaurora/gallery3d/video/StepOptionDialogFragment.java b/src/com/android/gallery3d/video/StepOptionDialogFragment.java
similarity index 98%
rename from src/org/codeaurora/gallery3d/video/StepOptionDialogFragment.java
rename to src/com/android/gallery3d/video/StepOptionDialogFragment.java
index 50bd8a6..11584f8 100644
--- a/src/org/codeaurora/gallery3d/video/StepOptionDialogFragment.java
+++ b/src/com/android/gallery3d/video/StepOptionDialogFragment.java
@@ -1,4 +1,4 @@
-package org.codeaurora.gallery3d.video;
+package com.android.gallery3d.video;
import android.app.AlertDialog;
import android.app.Dialog;
diff --git a/src/org/codeaurora/gallery3d/video/StepOptionSettingsHooker.java b/src/com/android/gallery3d/video/StepOptionSettingsHooker.java
similarity index 86%
rename from src/org/codeaurora/gallery3d/video/StepOptionSettingsHooker.java
rename to src/com/android/gallery3d/video/StepOptionSettingsHooker.java
index 3291ad6..98d8a4c 100644
--- a/src/org/codeaurora/gallery3d/video/StepOptionSettingsHooker.java
+++ b/src/com/android/gallery3d/video/StepOptionSettingsHooker.java
@@ -1,13 +1,13 @@
-package org.codeaurora.gallery3d.video;
+package com.android.gallery3d.video;
import android.content.Intent;
import android.view.Menu;
import android.view.MenuItem;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.R;
import com.android.gallery3d.app.MovieActivity;
-import org.codeaurora.gallery3d.ext.ActivityHooker;
-import org.codeaurora.gallery3d.video.VideoSettingsActivity;
+import com.android.gallery3d.ext.ActivityHooker;
+import com.android.gallery3d.video.VideoSettingsActivity;
public class StepOptionSettingsHooker extends ActivityHooker {
private static final int MENU_STEP_OPTION_SETTING = 1;
diff --git a/src/org/codeaurora/gallery3d/video/StereoAudioHooker.java b/src/com/android/gallery3d/video/StereoAudioHooker.java
similarity index 97%
rename from src/org/codeaurora/gallery3d/video/StereoAudioHooker.java
rename to src/com/android/gallery3d/video/StereoAudioHooker.java
index a660480..473f4dd 100755
--- a/src/org/codeaurora/gallery3d/video/StereoAudioHooker.java
+++ b/src/com/android/gallery3d/video/StereoAudioHooker.java
@@ -1,4 +1,4 @@
-package org.codeaurora.gallery3d.video;
+package com.android.gallery3d.video;
import android.content.Context;
import android.media.AudioManager;
@@ -6,7 +6,7 @@
import android.view.Menu;
import android.view.MenuItem;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.R;
public class StereoAudioHooker extends MovieHooker {
private static final String TAG = "StereoAudioHooker";
diff --git a/src/org/codeaurora/gallery3d/video/StreamingHooker.java b/src/com/android/gallery3d/video/StreamingHooker.java
similarity index 92%
rename from src/org/codeaurora/gallery3d/video/StreamingHooker.java
rename to src/com/android/gallery3d/video/StreamingHooker.java
index b8b1136..2b588fe 100755
--- a/src/org/codeaurora/gallery3d/video/StreamingHooker.java
+++ b/src/com/android/gallery3d/video/StreamingHooker.java
@@ -1,4 +1,4 @@
-package org.codeaurora.gallery3d.video;
+package com.android.gallery3d.video;
import android.content.ActivityNotFoundException;
import android.content.Intent;
@@ -9,14 +9,14 @@
import android.view.MenuItem;
import android.widget.Toast;
-import org.codeaurora.gallery.R;
-import org.codeaurora.gallery3d.ext.MovieUtils;
+import com.android.gallery3d.R;
+import com.android.gallery3d.ext.MovieUtils;
public class StreamingHooker extends MovieHooker {
private static final String TAG = "StreamingHooker";
private static final boolean LOG = false;
- private static final String ACTION_STREAMING = "org.codeaurora.settings.streaming";
+ private static final String ACTION_STREAMING = "com.android.settings.streaming";
private static final int MENU_INPUT_URL = 1;
private static final int MENU_SETTINGS = 2;
private static final int MENU_DETAIL = 3;
diff --git a/src/org/codeaurora/gallery3d/video/VideoSettingsActivity.java b/src/com/android/gallery3d/video/VideoSettingsActivity.java
similarity index 98%
rename from src/org/codeaurora/gallery3d/video/VideoSettingsActivity.java
rename to src/com/android/gallery3d/video/VideoSettingsActivity.java
index ad73765..fa430d7 100644
--- a/src/org/codeaurora/gallery3d/video/VideoSettingsActivity.java
+++ b/src/com/android/gallery3d/video/VideoSettingsActivity.java
@@ -1,4 +1,4 @@
-package org.codeaurora.gallery3d.video;
+package com.android.gallery3d.video;
import android.app.ListActivity;
@@ -31,7 +31,7 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.R;
public class VideoSettingsActivity extends ListActivity {
private String OPTION_NAME = "option_name";
diff --git a/src/org/codeaurora/gallery3d/video/VideoSnapshotExt.java b/src/com/android/gallery3d/video/VideoSnapshotExt.java
similarity index 98%
rename from src/org/codeaurora/gallery3d/video/VideoSnapshotExt.java
rename to src/com/android/gallery3d/video/VideoSnapshotExt.java
index 82620df..1dc87b4 100644
--- a/src/org/codeaurora/gallery3d/video/VideoSnapshotExt.java
+++ b/src/com/android/gallery3d/video/VideoSnapshotExt.java
@@ -27,7 +27,7 @@
* IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-package org.codeaurora.gallery3d.video;
+package com.android.gallery3d.video;
import android.content.ContentResolver;
import android.content.ContentValues;
@@ -42,7 +42,7 @@
import android.util.Log;
import android.webkit.URLUtil;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.R;
import com.android.gallery3d.app.GalleryActivity;
import com.android.gallery3d.app.MovieControllerOverlay;
diff --git a/src/com/android/photos/AlbumFragment.java b/src/com/android/photos/AlbumFragment.java
index 312b295..886ca68 100644
--- a/src/com/android/photos/AlbumFragment.java
+++ b/src/com/android/photos/AlbumFragment.java
@@ -30,7 +30,7 @@
import android.widget.ImageView;
import android.widget.TextView;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.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 69025ac..bc5289e 100644
--- a/src/com/android/photos/AlbumSetFragment.java
+++ b/src/com/android/photos/AlbumSetFragment.java
@@ -29,7 +29,7 @@
import android.view.ViewGroup;
import android.widget.GridView;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.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 a02adac..51c78d6 100644
--- a/src/com/android/photos/GalleryActivity.java
+++ b/src/com/android/photos/GalleryActivity.java
@@ -29,7 +29,7 @@
import android.view.MenuItem;
import android.view.ViewGroup;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.R;
import java.util.ArrayList;
diff --git a/src/com/android/photos/MultiChoiceManager.java b/src/com/android/photos/MultiChoiceManager.java
index 137898c..6ec4a61 100644
--- a/src/com/android/photos/MultiChoiceManager.java
+++ b/src/com/android/photos/MultiChoiceManager.java
@@ -29,7 +29,7 @@
import android.view.MenuItem;
import android.widget.AbsListView.MultiChoiceModeListener;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.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 ccf7e0e..dda9fe4 100644
--- a/src/com/android/photos/MultiSelectGridFragment.java
+++ b/src/com/android/photos/MultiSelectGridFragment.java
@@ -30,7 +30,7 @@
import android.widget.ListAdapter;
import android.widget.TextView;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.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 58a78f7..ab99cde 100644
--- a/src/com/android/photos/adapters/AlbumSetCursorAdapter.java
+++ b/src/com/android/photos/adapters/AlbumSetCursorAdapter.java
@@ -28,7 +28,7 @@
import android.widget.ProgressBar;
import android.widget.TextView;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.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 1c124d9..1190b8c 100644
--- a/src/com/android/photos/adapters/PhotoThumbnailAdapter.java
+++ b/src/com/android/photos/adapters/PhotoThumbnailAdapter.java
@@ -25,7 +25,7 @@
import android.widget.CursorAdapter;
import android.widget.ImageView;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.R;
import com.android.photos.data.PhotoSetLoader;
import com.android.photos.shims.LoaderCompatShim;
import com.android.photos.views.GalleryThumbnailView.GalleryThumbnailAdapter;
diff --git a/src_pd/com/android/gallery3d/filtershow/filters/FiltersManager.java b/src_pd/com/android/gallery3d/filtershow/filters/FiltersManager.java
index bc3b625..cde615e 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.res.Resources;
import android.graphics.Color;
-import org.codeaurora.gallery.R;
+import com.android.gallery3d.R;
import java.util.ArrayList;
import java.util.HashMap;