Gallery: rename project and make it build

Change-Id: I18f3b067694be923a263732a90b8e59904db0186

13 files changed, 18 insertions, 14 deletions

diff --git a/src/org/codeaurora/gallery3d/video/BookmarkActivity.java b/src/org/codeaurora/gallery3d/video/BookmarkActivity.java
index ed653f63a..386593158 100644
--- a/src/org/codeaurora/gallery3d/video/BookmarkActivity.java
+++ b/src/org/codeaurora/gallery3d/video/BookmarkActivity.java
@@ -28,7 +28,7 @@ import android.widget.ListView;
 import android.widget.SimpleCursorAdapter;
 import android.widget.TextView;
 
-import com.android.gallery3d.R;
+import org.codeaurora.gallery.R;
 import com.android.gallery3d.app.MovieActivity;
 
 public class BookmarkActivity extends Activity implements OnItemClickListener {
diff --git a/src/org/codeaurora/gallery3d/video/BookmarkEnhance.java b/src/org/codeaurora/gallery3d/video/BookmarkEnhance.java
index fc3ed9b0f..855cea343 100644
--- a/src/org/codeaurora/gallery3d/video/BookmarkEnhance.java
+++ b/src/org/codeaurora/gallery3d/video/BookmarkEnhance.java
@@ -8,7 +8,7 @@ import android.database.Cursor;
 import android.net.Uri;
 import android.util.Log;
 
-import com.android.gallery3d.R;
+import org.codeaurora.gallery.R;
 
 public class BookmarkEnhance {
     private static final String TAG = "BookmarkEnhance";
diff --git a/src/org/codeaurora/gallery3d/video/BookmarkHooker.java b/src/org/codeaurora/gallery3d/video/BookmarkHooker.java
index 9d7697d7a..c6d014efa 100644
--- a/src/org/codeaurora/gallery3d/video/BookmarkHooker.java
+++ b/src/org/codeaurora/gallery3d/video/BookmarkHooker.java
@@ -1,10 +1,11 @@
 package org.codeaurora.gallery3d.video;
 
 import android.content.Intent;
+import android.graphics.Bitmap;
 import android.view.Menu;
 import android.view.MenuItem;
 
-import com.android.gallery3d.R;
+import org.codeaurora.gallery.R;
 import org.codeaurora.gallery3d.ext.MovieUtils;
 
 public class BookmarkHooker extends MovieHooker {
@@ -70,7 +71,10 @@ public class BookmarkHooker extends MovieHooker {
         intent.addCategory(Intent.CATEGORY_DEFAULT);
         intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP
                 | Intent.FLAG_ACTIVITY_LAUNCHED_FROM_HISTORY);
-        intent.putExtra(KEY_LOGO_BITMAP, getIntent().getParcelableExtra(KEY_LOGO_BITMAP));
+        Bitmap bitmap = getIntent().getParcelableExtra(KEY_LOGO_BITMAP);
+        if (bitmap != null) {
+            intent.putExtra(KEY_LOGO_BITMAP, bitmap);
+        }
         getContext().startActivity(intent);
     }
 }
diff --git a/src/org/codeaurora/gallery3d/video/ExtensionHelper.java b/src/org/codeaurora/gallery3d/video/ExtensionHelper.java
index 598351215..8c945bdce 100755
--- a/src/org/codeaurora/gallery3d/video/ExtensionHelper.java
+++ b/src/org/codeaurora/gallery3d/video/ExtensionHelper.java
@@ -31,7 +31,7 @@ package org.codeaurora.gallery3d.video;
 import android.content.Context;
 
 import com.android.gallery3d.app.MovieActivity;
-import com.android.gallery3d.R;
+import org.codeaurora.gallery.R;
 
 import org.codeaurora.gallery3d.ext.ActivityHookerGroup;
 import org.codeaurora.gallery3d.ext.IActivityHooker;
diff --git a/src/org/codeaurora/gallery3d/video/LoopVideoHooker.java b/src/org/codeaurora/gallery3d/video/LoopVideoHooker.java
index 468e8a878..64463cc69 100644
--- a/src/org/codeaurora/gallery3d/video/LoopVideoHooker.java
+++ b/src/org/codeaurora/gallery3d/video/LoopVideoHooker.java
@@ -3,7 +3,7 @@ package org.codeaurora.gallery3d.video;
 import android.view.Menu;
 import android.view.MenuItem;
 
-import com.android.gallery3d.R;
+import org.codeaurora.gallery.R;
 import org.codeaurora.gallery3d.ext.MovieUtils;
 
 public class LoopVideoHooker extends MovieHooker {
diff --git a/src/org/codeaurora/gallery3d/video/MovieListHooker.java b/src/org/codeaurora/gallery3d/video/MovieListHooker.java
index 3da15b1dd..244f40190 100644
--- a/src/org/codeaurora/gallery3d/video/MovieListHooker.java
+++ b/src/org/codeaurora/gallery3d/video/MovieListHooker.java
@@ -5,7 +5,7 @@ import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
 
-import com.android.gallery3d.R;
+import org.codeaurora.gallery.R;
 import org.codeaurora.gallery3d.ext.IMovieItem;
 import org.codeaurora.gallery3d.ext.IMovieList;
 import org.codeaurora.gallery3d.ext.IMovieListLoader;
diff --git a/src/org/codeaurora/gallery3d/video/SettingsActivity.java b/src/org/codeaurora/gallery3d/video/SettingsActivity.java
index 262e761a6..b9f594e8c 100755
--- a/src/org/codeaurora/gallery3d/video/SettingsActivity.java
+++ b/src/org/codeaurora/gallery3d/video/SettingsActivity.java
@@ -26,7 +26,7 @@ import android.text.method.DigitsKeyListener;
 import android.util.Log;
 import android.view.KeyEvent;
 import android.view.MenuItem;
-import com.android.gallery3d.R;
+import org.codeaurora.gallery.R;
 
 import java.util.ArrayList;
 
diff --git a/src/org/codeaurora/gallery3d/video/SpeakerHooker.java b/src/org/codeaurora/gallery3d/video/SpeakerHooker.java
index 1592195f7..4825436c1 100644
--- a/src/org/codeaurora/gallery3d/video/SpeakerHooker.java
+++ b/src/org/codeaurora/gallery3d/video/SpeakerHooker.java
@@ -42,7 +42,7 @@ import android.media.AudioManager;
 import android.media.AudioSystem;
 import android.os.Bundle;
 
-import com.android.gallery3d.R;
+import org.codeaurora.gallery.R;
 
 public class SpeakerHooker extends MovieHooker {
 
diff --git a/src/org/codeaurora/gallery3d/video/StepOptionSettingsHooker.java b/src/org/codeaurora/gallery3d/video/StepOptionSettingsHooker.java
index eff8057bd..3291ad6b5 100644
--- a/src/org/codeaurora/gallery3d/video/StepOptionSettingsHooker.java
+++ b/src/org/codeaurora/gallery3d/video/StepOptionSettingsHooker.java
@@ -4,7 +4,7 @@ import android.content.Intent;
 import android.view.Menu;
 import android.view.MenuItem;
 
-import com.android.gallery3d.R;
+import org.codeaurora.gallery.R;
 import com.android.gallery3d.app.MovieActivity;
 import org.codeaurora.gallery3d.ext.ActivityHooker;
 import org.codeaurora.gallery3d.video.VideoSettingsActivity;
diff --git a/src/org/codeaurora/gallery3d/video/StereoAudioHooker.java b/src/org/codeaurora/gallery3d/video/StereoAudioHooker.java
index 88012fa7d..43d277b7d 100755
--- a/src/org/codeaurora/gallery3d/video/StereoAudioHooker.java
+++ b/src/org/codeaurora/gallery3d/video/StereoAudioHooker.java
@@ -6,7 +6,7 @@ import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
 
-import com.android.gallery3d.R;
+import org.codeaurora.gallery.R;
 
 public class StereoAudioHooker extends MovieHooker {
     private static final String TAG = "StereoAudioHooker";
diff --git a/src/org/codeaurora/gallery3d/video/StreamingHooker.java b/src/org/codeaurora/gallery3d/video/StreamingHooker.java
index 7def5d8a0..5fa9191f9 100755
--- a/src/org/codeaurora/gallery3d/video/StreamingHooker.java
+++ b/src/org/codeaurora/gallery3d/video/StreamingHooker.java
@@ -9,7 +9,7 @@ import android.view.Menu;
 import android.view.MenuItem;
 import android.widget.Toast;
 
-import com.android.gallery3d.R;
+import org.codeaurora.gallery.R;
 import org.codeaurora.gallery3d.ext.MovieUtils;
 
 public class StreamingHooker extends MovieHooker {
diff --git a/src/org/codeaurora/gallery3d/video/VideoSettingsActivity.java b/src/org/codeaurora/gallery3d/video/VideoSettingsActivity.java
index 941263c99..c3e54ffc2 100644
--- a/src/org/codeaurora/gallery3d/video/VideoSettingsActivity.java
+++ b/src/org/codeaurora/gallery3d/video/VideoSettingsActivity.java
@@ -31,7 +31,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import com.android.gallery3d.R;
+import org.codeaurora.gallery.R;
 
 public class VideoSettingsActivity extends ListActivity {
     private String OPTION_NAME = "option_name";
diff --git a/src/org/codeaurora/gallery3d/video/VideoSnapshotExt.java b/src/org/codeaurora/gallery3d/video/VideoSnapshotExt.java
index 7788e79d5..c6bcc6a3f 100644
--- a/src/org/codeaurora/gallery3d/video/VideoSnapshotExt.java
+++ b/src/org/codeaurora/gallery3d/video/VideoSnapshotExt.java
@@ -40,7 +40,7 @@ import android.os.Environment;
 import android.provider.MediaStore.Images;
 import android.provider.MediaStore.Images.ImageColumns;
 import android.util.Log;
-import com.android.gallery3d.R;
+import org.codeaurora.gallery.R;
 import com.android.gallery3d.app.MovieControllerOverlay;
 import com.android.gallery3d.app.MovieControllerOverlayNew;