diff options
5 files changed, 61 insertions, 101 deletions
diff --git a/gallerycommon/src/com/android/gallery3d/common/LightCycleHelper.java b/gallerycommon/src/com/android/gallery3d/common/LightCycleHelper.java deleted file mode 100644 index c4fb61a52..000000000 --- a/gallerycommon/src/com/android/gallery3d/common/LightCycleHelper.java +++ /dev/null @@ -1,97 +0,0 @@ -/* - * Copyright (C) 2012 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.gallery3d.common; - -import android.app.Activity; -import android.content.Context; -import android.content.Intent; -import android.content.pm.PackageManager; -import android.net.Uri; - -public class LightCycleHelper { - public static final String EXTRA_OUTPUT_DIR = "output_dir"; - private static final String PANORAMA_FILENAME_PREFIX = "panorama_"; - public static final String LIGHTCYCLE_PACKAGE = - "com.google.android.apps.lightcycle"; - public static final String LIGHTCYCLE_CAPTURE_CLASS = - "com.google.android.apps.lightcycle.PanoramaCaptureActivity"; - private static final String LIGHTCYCLE_VIEW_CLASS = - "com.google.android.apps.lightcycle.PanoramaViewActivity"; - - private static boolean sUpdated; - private static boolean sHasViewActivity; - private static boolean sHasCaptureActivity; - - private static boolean hasLightCycleActivity(PackageManager pm, String activityClass) { - Intent it = new Intent(); - it.setClassName(LIGHTCYCLE_PACKAGE, activityClass); - return (pm.resolveActivity(it, 0) != null); - } - - private static void update(PackageManager pm) { - sUpdated = true; - sHasViewActivity = hasLightCycleActivity(pm, LIGHTCYCLE_VIEW_CLASS); - sHasCaptureActivity = hasLightCycleActivity(pm, LIGHTCYCLE_CAPTURE_CLASS); - } - - public static synchronized boolean hasLightCycleView(PackageManager pm) { - if (!sUpdated) { - update(pm); - } - return sHasViewActivity; - } - - public static synchronized boolean hasLightCycleCapture(PackageManager pm) { - if (!sUpdated) { - update(pm); - } - return sHasCaptureActivity; - } - - public static synchronized void onPackageAdded(Context context, String packageName) { - if (LIGHTCYCLE_PACKAGE.equals(packageName)) { - update(context.getPackageManager()); - } - } - - public static synchronized void onPackageRemoved(Context context, String packageName) { - if (LIGHTCYCLE_PACKAGE.equals(packageName)) { - update(context.getPackageManager()); - } - } - - public static synchronized void onPackageChanged(Context context, String packageName) { - if (LIGHTCYCLE_PACKAGE.equals(packageName)) { - update(context.getPackageManager()); - } - } - - public static void viewPanorama(Activity activity, Uri uri, String type) { - try { - Intent intent = new Intent(Intent.ACTION_VIEW) - .setDataAndType(uri, type) - .setClassName(LIGHTCYCLE_PACKAGE, LIGHTCYCLE_VIEW_CLASS); - activity.startActivity(intent); - } catch (Exception e) { - throw new RuntimeException(e); - } - } - - public static boolean isPanorama(String filename) { - return filename.startsWith(PANORAMA_FILENAME_PREFIX); - } -} diff --git a/src/com/android/gallery3d/app/PackagesMonitor.java b/src/com/android/gallery3d/app/PackagesMonitor.java index 05a2bd7f6..66f1f5f04 100644 --- a/src/com/android/gallery3d/app/PackagesMonitor.java +++ b/src/com/android/gallery3d/app/PackagesMonitor.java @@ -23,8 +23,8 @@ import android.content.Intent; import android.content.SharedPreferences; import android.preference.PreferenceManager; -import com.android.gallery3d.common.LightCycleHelper; import com.android.gallery3d.picasasource.PicasaSource; +import com.android.gallery3d.util.LightCycleHelper; public class PackagesMonitor extends BroadcastReceiver { public static final String KEY_PACKAGES_VERSION = "packages-version"; diff --git a/src/com/android/gallery3d/app/PhotoPage.java b/src/com/android/gallery3d/app/PhotoPage.java index b9726e786..292933372 100644 --- a/src/com/android/gallery3d/app/PhotoPage.java +++ b/src/com/android/gallery3d/app/PhotoPage.java @@ -37,7 +37,6 @@ import com.actionbarsherlock.view.MenuItem; import com.android.gallery3d.R; import com.android.gallery3d.anim.FloatAnimation; import com.android.gallery3d.common.ApiHelper; -import com.android.gallery3d.common.LightCycleHelper; import com.android.gallery3d.common.Utils; import com.android.gallery3d.data.DataManager; import com.android.gallery3d.data.FilterDeleteSet; @@ -71,6 +70,7 @@ import com.android.gallery3d.ui.RawTexture; import com.android.gallery3d.ui.SelectionManager; import com.android.gallery3d.ui.SynchronizedHandler; import com.android.gallery3d.util.GalleryUtils; +import com.android.gallery3d.util.LightCycleHelper; import com.android.gallery3d.util.MediaSetUtils; public class PhotoPage extends ActivityState implements diff --git a/src/com/android/gallery3d/data/LocalImage.java b/src/com/android/gallery3d/data/LocalImage.java index 93287bca1..299cc1f0d 100644 --- a/src/com/android/gallery3d/data/LocalImage.java +++ b/src/com/android/gallery3d/data/LocalImage.java @@ -34,8 +34,8 @@ import android.util.Log; import com.android.gallery3d.app.GalleryApp; import com.android.gallery3d.common.ApiHelper; import com.android.gallery3d.common.BitmapUtils; -import com.android.gallery3d.common.LightCycleHelper; import com.android.gallery3d.util.GalleryUtils; +import com.android.gallery3d.util.LightCycleHelper; import com.android.gallery3d.util.ThreadPool.Job; import com.android.gallery3d.util.ThreadPool.JobContext; import com.android.gallery3d.util.UpdateHelper; @@ -243,7 +243,7 @@ public class LocalImage extends LocalMediaItem { if (LightCycleHelper.isPanorama(caption) && LightCycleHelper.hasLightCycleView( - mApplication.getAndroidContext().getPackageManager())) { + mApplication.getAndroidContext())) { operation |= SUPPORT_VIEW_PANORAMA; } return operation; diff --git a/src_pd/com/android/gallery3d/util/LightCycleHelper.java b/src_pd/com/android/gallery3d/util/LightCycleHelper.java new file mode 100644 index 000000000..82bd647fd --- /dev/null +++ b/src_pd/com/android/gallery3d/util/LightCycleHelper.java @@ -0,0 +1,57 @@ +/* + * Copyright (C) 2012 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.gallery3d.util; + +import android.app.Activity; +import android.content.Context; +import android.content.Intent; +import android.net.Uri; + +public class LightCycleHelper { + + public static void setupCaptureIntent(Intent it, String outputDir) { + /* Do nothing */ + } + + public static synchronized boolean hasLightCycleView(Context context) { + return false; + } + + public static synchronized boolean hasLightCycleCapture(Context context) { + return false; + } + + public static synchronized void onPackageAdded(Context context, String packageName) { + /* Do nothing */ + } + + public static synchronized void onPackageRemoved(Context context, String packageName) { + /* Do nothing */ + } + + public static synchronized void onPackageChanged(Context context, String packageName) { + /* Do nothing */ + } + + public static void viewPanorama(Activity activity, Uri uri, String type) { + /* Do nothing */ + } + + public static boolean isPanorama(String filename) { + return false; + } +} |