diff options
author | Wu-cheng Li <wuchengli@google.com> | 2012-10-14 21:28:31 +0800 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-10-16 00:09:06 -0700 |
commit | 84440670da46866867ace3be2c358a54db984a6d (patch) | |
tree | 92f91797e46199326f2e080e4416fd517525c5b7 | |
parent | 030f8dad6aefc42d0af39bc1b93f370937d3e2ab (diff) | |
download | android_packages_apps_Gallery2-84440670da46866867ace3be2c358a54db984a6d.tar.gz android_packages_apps_Gallery2-84440670da46866867ace3be2c358a54db984a6d.tar.bz2 android_packages_apps_Gallery2-84440670da46866867ace3be2c358a54db984a6d.zip |
Remove old camera classes.
bug:7201108
Change-Id: I539d02c411c654238d7e5e0c34e9ec3e6e6d4d90
-rw-r--r-- | AndroidManifest.xml | 17 | ||||
-rw-r--r-- | proguard.flags | 5 | ||||
-rw-r--r-- | src/com/android/gallery3d/data/DataManager.java | 12 | ||||
-rw-r--r-- | src/com/android/gallery3d/data/LocalAlbum.java | 1 | ||||
-rw-r--r-- | src/com/android/gallery3d/data/LocalImage.java | 1 | ||||
-rw-r--r-- | src/com/android/gallery3d/data/LocalVideo.java | 1 |
6 files changed, 1 insertions, 36 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index b96042fa2..30c079709 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -354,23 +354,6 @@ </intent-filter> </activity-alias> - <activity android:name="com.android.camera.VideoCamera" - android:taskAffinity="com.android.camera" - android:label="@string/video_camera_label" - android:theme="@style/Theme.Camera" - android:configChanges="orientation|screenSize|keyboardHidden" - android:icon="@mipmap/ic_launcher_video_camera" - android:clearTaskOnLaunch="true" - android:windowSoftInputMode="stateAlwaysHidden|adjustPan"> - </activity> - <activity android:name="com.android.camera.PanoramaActivity" - android:taskAffinity="com.android.camera" - android:label="@string/pano_dialog_title" - android:theme="@style/Theme.Camera" - android:configChanges="orientation|screenSize|keyboardHidden" - android:clearTaskOnLaunch="true" - android:windowSoftInputMode="stateAlwaysHidden|adjustPan"> - </activity> <receiver android:name="com.android.gallery3d.gadget.PhotoAppWidgetProvider" android:label="@string/appwidget_title"> <intent-filter> diff --git a/proguard.flags b/proguard.flags index 21b617957..d5a2d1f26 100644 --- a/proguard.flags +++ b/proguard.flags @@ -19,14 +19,11 @@ public android.content.Intent getResultData(); } --keep class com.android.camera.VideoCamera { +-keep class com.android.camera.CameraActivity { public boolean isRecording(); - public void onCancelBgTraining(...); - public void onProtectiveCurtainClick(...); } -keep class com.android.camera.VideoModule { - public boolean isRecording(); public void onCancelBgTraining(...); public void onProtectiveCurtainClick(...); } diff --git a/src/com/android/gallery3d/data/DataManager.java b/src/com/android/gallery3d/data/DataManager.java index 3d2c0c2f0..408a24b13 100644 --- a/src/com/android/gallery3d/data/DataManager.java +++ b/src/com/android/gallery3d/data/DataManager.java @@ -85,9 +85,6 @@ public class DataManager { private static final String TOP_LOCAL_VIDEO_SET_PATH = "/local/video"; - private static final String ACTION_DELETE_PICTURE = - "com.android.gallery3d.action.DELETE_PICTURE"; - public static final Comparator<MediaItem> sDateTakenComparator = new DateTakenComparator(); @@ -335,15 +332,6 @@ public class DataManager { } } - // Sends a local broadcast if a local image or video is deleted. This is - // used to update the thumbnail shown in the camera app. - public void broadcastLocalDeletion() { - LocalBroadcastManager manager = LocalBroadcastManager.getInstance( - mApplication.getAndroidContext()); - Intent intent = new Intent(ACTION_DELETE_PICTURE); - manager.sendBroadcast(intent); - } - private static class NotifyBroker extends ContentObserver { private WeakHashMap<ChangeNotifier, Object> mNotifiers = new WeakHashMap<ChangeNotifier, Object>(); diff --git a/src/com/android/gallery3d/data/LocalAlbum.java b/src/com/android/gallery3d/data/LocalAlbum.java index 4682e7792..8bbc364ec 100644 --- a/src/com/android/gallery3d/data/LocalAlbum.java +++ b/src/com/android/gallery3d/data/LocalAlbum.java @@ -267,7 +267,6 @@ public class LocalAlbum extends MediaSet { GalleryUtils.assertNotInRenderThread(); mResolver.delete(mBaseUri, mWhereClause, new String[]{String.valueOf(mBucketId)}); - mApplication.getDataManager().broadcastLocalDeletion(); } @Override diff --git a/src/com/android/gallery3d/data/LocalImage.java b/src/com/android/gallery3d/data/LocalImage.java index 2ba784de7..61961d87a 100644 --- a/src/com/android/gallery3d/data/LocalImage.java +++ b/src/com/android/gallery3d/data/LocalImage.java @@ -322,7 +322,6 @@ public class LocalImage extends LocalMediaItem { Uri baseUri = Images.Media.EXTERNAL_CONTENT_URI; mApplication.getContentResolver().delete(baseUri, "_id=?", new String[]{String.valueOf(id)}); - mApplication.getDataManager().broadcastLocalDeletion(); } private static String getExifOrientation(int orientation) { diff --git a/src/com/android/gallery3d/data/LocalVideo.java b/src/com/android/gallery3d/data/LocalVideo.java index 5b6ee4b33..c876d81b1 100644 --- a/src/com/android/gallery3d/data/LocalVideo.java +++ b/src/com/android/gallery3d/data/LocalVideo.java @@ -187,7 +187,6 @@ public class LocalVideo extends LocalMediaItem { Uri baseUri = Video.Media.EXTERNAL_CONTENT_URI; mApplication.getContentResolver().delete(baseUri, "_id=?", new String[]{String.valueOf(id)}); - mApplication.getDataManager().broadcastLocalDeletion(); } @Override |