From c83b5b7faee8117f7f83ca931db0040610ace976 Mon Sep 17 00:00:00 2001 From: Likai Ding Date: Wed, 25 May 2016 14:48:41 +0800 Subject: Gallery: rename project and make it build Change-Id: I18f3b067694be923a263732a90b8e59904db0186 --- Android.mk | 6 +++--- AndroidManifest.xml | 2 +- gallerycommon/Android.mk | 2 +- .../src/com/android/gallery3d/jpegstream/JPEGInputStream.java | 2 +- .../src/com/android/gallery3d/jpegstream/JPEGOutputStream.java | 2 +- jni/Android.mk | 4 ++-- jni_jpegstream/Android.mk | 2 +- res/layout/audio_effects_dialog.xml | 2 +- res/layout/filtershow_activity.xml | 2 +- res/layout/filtershow_category_panel_new.xml | 4 ++-- res/layout/filtershow_state_panel_new.xml | 2 +- res/xml/camera_preferences.xml | 2 +- res/xml/video_preferences.xml | 2 +- src/com/android/gallery3d/app/AbstractGalleryActivity.java | 2 +- src/com/android/gallery3d/app/ActivityState.java | 2 +- src/com/android/gallery3d/app/AlbumPage.java | 2 +- src/com/android/gallery3d/app/AlbumPicker.java | 2 +- src/com/android/gallery3d/app/AlbumSetPage.java | 2 +- src/com/android/gallery3d/app/CommonControllerOverlay.java | 2 +- src/com/android/gallery3d/app/Config.java | 2 +- src/com/android/gallery3d/app/FilterUtils.java | 2 +- src/com/android/gallery3d/app/GalleryActionBar.java | 2 +- src/com/android/gallery3d/app/GalleryActivity.java | 4 ++-- src/com/android/gallery3d/app/GestureControllerOverlay.java | 2 +- src/com/android/gallery3d/app/ManageCachePage.java | 2 +- src/com/android/gallery3d/app/MovieActivity.java | 2 +- src/com/android/gallery3d/app/MovieControllerOverlay.java | 2 +- src/com/android/gallery3d/app/MovieControllerOverlayNew.java | 2 +- src/com/android/gallery3d/app/MoviePlayer.java | 2 +- src/com/android/gallery3d/app/MuteVideo.java | 2 +- src/com/android/gallery3d/app/PhotoPage.java | 2 +- src/com/android/gallery3d/app/PhotoPageBottomControls.java | 2 +- src/com/android/gallery3d/app/PhotoPageProgressBar.java | 2 +- src/com/android/gallery3d/app/PickerActivity.java | 2 +- src/com/android/gallery3d/app/SlideshowPage.java | 2 +- src/com/android/gallery3d/app/TimeBar.java | 2 +- src/com/android/gallery3d/app/TimeBarNew.java | 2 +- src/com/android/gallery3d/app/TimeLinePage.java | 2 +- src/com/android/gallery3d/app/TrimControllerOverlay.java | 2 +- src/com/android/gallery3d/app/TrimTimeBar.java | 2 +- src/com/android/gallery3d/app/TrimVideo.java | 2 +- src/com/android/gallery3d/data/CameraShortcutImage.java | 2 +- src/com/android/gallery3d/data/ComboAlbumSet.java | 2 +- src/com/android/gallery3d/data/EmptyAlbumImage.java | 2 +- src/com/android/gallery3d/data/FaceClustering.java | 2 +- src/com/android/gallery3d/data/LocalAlbum.java | 2 +- src/com/android/gallery3d/data/LocalAlbumSet.java | 2 +- src/com/android/gallery3d/data/LocationClustering.java | 2 +- src/com/android/gallery3d/data/MediaDetails.java | 2 +- src/com/android/gallery3d/data/SizeClustering.java | 2 +- src/com/android/gallery3d/data/TagClustering.java | 2 +- src/com/android/gallery3d/data/UnlockImage.java | 2 +- src/com/android/gallery3d/filtershow/CenteredLinearLayout.java | 2 +- src/com/android/gallery3d/filtershow/FilterShowActivity.java | 2 +- src/com/android/gallery3d/filtershow/category/Action.java | 2 +- .../android/gallery3d/filtershow/category/BasicGeometryPanel.java | 2 +- .../android/gallery3d/filtershow/category/CategoryAdapter.java | 2 +- src/com/android/gallery3d/filtershow/category/CategoryPanel.java | 2 +- .../android/gallery3d/filtershow/category/CategorySelected.java | 2 +- src/com/android/gallery3d/filtershow/category/CategoryTrack.java | 2 +- src/com/android/gallery3d/filtershow/category/CategoryView.java | 2 +- .../android/gallery3d/filtershow/category/EditorCropPanel.java | 2 +- src/com/android/gallery3d/filtershow/category/IconView.java | 2 +- src/com/android/gallery3d/filtershow/category/MainPanel.java | 2 +- .../android/gallery3d/filtershow/category/StraightenPanel.java | 2 +- .../gallery3d/filtershow/colorpicker/ColorBrightnessView.java | 2 +- .../gallery3d/filtershow/colorpicker/ColorCompareView.java | 2 +- .../android/gallery3d/filtershow/colorpicker/ColorGridDialog.java | 2 +- .../android/gallery3d/filtershow/colorpicker/ColorHueView.java | 2 +- .../gallery3d/filtershow/colorpicker/ColorOpacityView.java | 2 +- .../gallery3d/filtershow/colorpicker/ColorPickerDialog.java | 2 +- .../android/gallery3d/filtershow/colorpicker/ColorRectView.java | 2 +- .../android/gallery3d/filtershow/colorpicker/ColorSVRectView.java | 2 +- .../gallery3d/filtershow/colorpicker/ColorSaturationView.java | 2 +- .../android/gallery3d/filtershow/colorpicker/ColorValueView.java | 2 +- src/com/android/gallery3d/filtershow/controller/ActionSlider.java | 2 +- src/com/android/gallery3d/filtershow/controller/BasicSlider.java | 2 +- src/com/android/gallery3d/filtershow/controller/ColorChooser.java | 2 +- .../android/gallery3d/filtershow/controller/SliderBrightness.java | 2 +- src/com/android/gallery3d/filtershow/controller/SliderHue.java | 2 +- .../android/gallery3d/filtershow/controller/SliderOpacity.java | 2 +- .../android/gallery3d/filtershow/controller/SliderSaturation.java | 2 +- src/com/android/gallery3d/filtershow/controller/StyleChooser.java | 2 +- src/com/android/gallery3d/filtershow/controller/TitledSlider.java | 2 +- src/com/android/gallery3d/filtershow/crop/CropActivity.java | 2 +- src/com/android/gallery3d/filtershow/crop/CropDrawingUtils.java | 2 +- src/com/android/gallery3d/filtershow/crop/CropView.java | 2 +- src/com/android/gallery3d/filtershow/data/UserPresetsManager.java | 2 +- src/com/android/gallery3d/filtershow/editors/BasicEditor.java | 2 +- src/com/android/gallery3d/filtershow/editors/Editor.java | 2 +- src/com/android/gallery3d/filtershow/editors/EditorChanSat.java | 2 +- .../android/gallery3d/filtershow/editors/EditorColorBorder.java | 2 +- .../gallery3d/filtershow/editors/EditorColorBorderTabletUI.java | 2 +- src/com/android/gallery3d/filtershow/editors/EditorCrop.java | 2 +- src/com/android/gallery3d/filtershow/editors/EditorCurves.java | 2 +- src/com/android/gallery3d/filtershow/editors/EditorDraw.java | 2 +- .../android/gallery3d/filtershow/editors/EditorDrawTabletUI.java | 2 +- .../android/gallery3d/filtershow/editors/EditorDualCamFusion.java | 2 +- .../android/gallery3d/filtershow/editors/EditorDualCamSketch.java | 2 +- .../android/gallery3d/filtershow/editors/EditorDualCamera.java | 2 +- src/com/android/gallery3d/filtershow/editors/EditorGrad.java | 2 +- src/com/android/gallery3d/filtershow/editors/EditorMakeup.java | 2 +- src/com/android/gallery3d/filtershow/editors/EditorMirror.java | 2 +- src/com/android/gallery3d/filtershow/editors/EditorPanel.java | 2 +- src/com/android/gallery3d/filtershow/editors/EditorRedEye.java | 2 +- src/com/android/gallery3d/filtershow/editors/EditorRotate.java | 2 +- .../android/gallery3d/filtershow/editors/EditorStraighten.java | 2 +- .../android/gallery3d/filtershow/editors/EditorTinyPlanet.java | 2 +- src/com/android/gallery3d/filtershow/editors/EditorVignette.java | 2 +- src/com/android/gallery3d/filtershow/editors/EditorZoom.java | 2 +- .../android/gallery3d/filtershow/editors/HazeBusterEditor.java | 2 +- src/com/android/gallery3d/filtershow/editors/ImageOnlyEditor.java | 2 +- .../android/gallery3d/filtershow/editors/ParametricEditor.java | 2 +- .../android/gallery3d/filtershow/editors/SeeStraightEditor.java | 2 +- .../android/gallery3d/filtershow/editors/TrueScannerEditor.java | 2 +- .../android/gallery3d/filtershow/filters/BaseFiltersManager.java | 2 +- .../gallery3d/filtershow/filters/FilterChanSatRepresentation.java | 2 +- .../filtershow/filters/FilterColorBorderRepresentation.java | 2 +- .../gallery3d/filtershow/filters/FilterCropRepresentation.java | 2 +- .../gallery3d/filtershow/filters/FilterCurvesRepresentation.java | 2 +- .../gallery3d/filtershow/filters/FilterDrawRepresentation.java | 2 +- .../filtershow/filters/FilterDualCamFusionRepresentation.java | 2 +- .../gallery3d/filtershow/filters/FilterGradRepresentation.java | 2 +- .../filtershow/filters/FilterImageBorderRepresentation.java | 2 +- .../gallery3d/filtershow/filters/FilterMirrorRepresentation.java | 2 +- .../gallery3d/filtershow/filters/FilterRedEyeRepresentation.java | 2 +- .../gallery3d/filtershow/filters/FilterRotateRepresentation.java | 2 +- .../filtershow/filters/FilterStraightenRepresentation.java | 2 +- .../filtershow/filters/FilterTinyPlanetRepresentation.java | 2 +- .../filtershow/filters/FilterVignetteRepresentation.java | 2 +- src/com/android/gallery3d/filtershow/filters/HazeBusterActs.java | 2 +- src/com/android/gallery3d/filtershow/filters/IconUtilities.java | 2 +- .../android/gallery3d/filtershow/filters/ImageFilterBwFilter.java | 2 +- .../android/gallery3d/filtershow/filters/ImageFilterChanSat.java | 2 +- .../android/gallery3d/filtershow/filters/ImageFilterContrast.java | 2 +- .../gallery3d/filtershow/filters/ImageFilterDownsample.java | 2 +- src/com/android/gallery3d/filtershow/filters/ImageFilterDraw.java | 2 +- .../gallery3d/filtershow/filters/ImageFilterDualCamFusion.java | 2 +- .../gallery3d/filtershow/filters/ImageFilterDualCamSketch.java | 2 +- .../gallery3d/filtershow/filters/ImageFilterDualCamera.java | 2 +- src/com/android/gallery3d/filtershow/filters/ImageFilterEdge.java | 2 +- .../android/gallery3d/filtershow/filters/ImageFilterExposure.java | 2 +- src/com/android/gallery3d/filtershow/filters/ImageFilterGrad.java | 4 ++-- .../gallery3d/filtershow/filters/ImageFilterHighlights.java | 2 +- src/com/android/gallery3d/filtershow/filters/ImageFilterHue.java | 2 +- .../android/gallery3d/filtershow/filters/ImageFilterKMeans.java | 2 +- .../gallery3d/filtershow/filters/ImageFilterMakeupBigeye.java | 2 +- .../gallery3d/filtershow/filters/ImageFilterMakeupSoften.java | 2 +- .../gallery3d/filtershow/filters/ImageFilterMakeupTrimface.java | 2 +- .../gallery3d/filtershow/filters/ImageFilterMakeupWhiten.java | 2 +- .../android/gallery3d/filtershow/filters/ImageFilterNegative.java | 2 +- src/com/android/gallery3d/filtershow/filters/ImageFilterRS.java | 2 +- .../gallery3d/filtershow/filters/ImageFilterSaturated.java | 2 +- .../android/gallery3d/filtershow/filters/ImageFilterShadows.java | 2 +- .../android/gallery3d/filtershow/filters/ImageFilterSharpen.java | 2 +- .../android/gallery3d/filtershow/filters/ImageFilterVibrance.java | 2 +- .../android/gallery3d/filtershow/filters/ImageFilterVignette.java | 2 +- .../android/gallery3d/filtershow/filters/ImageFilterWBalance.java | 2 +- src/com/android/gallery3d/filtershow/filters/SeeStraightActs.java | 2 +- src/com/android/gallery3d/filtershow/filters/TrueScannerActs.java | 2 +- .../gallery3d/filtershow/filters/TrueScannerWhiteBoardActs.java | 2 +- .../android/gallery3d/filtershow/imageshow/EclipseControl.java | 2 +- src/com/android/gallery3d/filtershow/imageshow/GradControl.java | 2 +- src/com/android/gallery3d/filtershow/imageshow/ImageCrop.java | 2 +- src/com/android/gallery3d/filtershow/imageshow/ImageCurves.java | 2 +- src/com/android/gallery3d/filtershow/imageshow/ImageDraw.java | 2 +- src/com/android/gallery3d/filtershow/imageshow/ImageGrad.java | 2 +- src/com/android/gallery3d/filtershow/imageshow/ImageShow.java | 2 +- src/com/android/gallery3d/filtershow/info/InfoPanel.java | 2 +- src/com/android/gallery3d/filtershow/pipeline/ImagePreset.java | 2 +- .../android/gallery3d/filtershow/pipeline/ProcessingService.java | 4 ++-- .../gallery3d/filtershow/presets/PresetManagementDialog.java | 2 +- .../android/gallery3d/filtershow/presets/UserPresetsAdapter.java | 2 +- src/com/android/gallery3d/filtershow/state/StateAdapter.java | 2 +- src/com/android/gallery3d/filtershow/state/StatePanel.java | 2 +- src/com/android/gallery3d/filtershow/state/StatePanelTrack.java | 2 +- src/com/android/gallery3d/filtershow/state/StateView.java | 2 +- src/com/android/gallery3d/filtershow/tools/SaveImage.java | 2 +- src/com/android/gallery3d/filtershow/tools/XmpPresets.java | 2 +- src/com/android/gallery3d/filtershow/ui/ExportDialog.java | 2 +- src/com/android/gallery3d/filtershow/ui/FramedTextButton.java | 2 +- src/com/android/gallery3d/gadget/PhotoAppWidgetProvider.java | 2 +- src/com/android/gallery3d/gadget/WidgetClickHandler.java | 2 +- src/com/android/gallery3d/gadget/WidgetConfigure.java | 2 +- src/com/android/gallery3d/gadget/WidgetService.java | 2 +- src/com/android/gallery3d/gadget/WidgetTypeChooser.java | 2 +- src/com/android/gallery3d/gadget/WidgetUtils.java | 2 +- src/com/android/gallery3d/ingest/IngestActivity.java | 2 +- src/com/android/gallery3d/ingest/IngestService.java | 2 +- src/com/android/gallery3d/ingest/adapter/MtpAdapter.java | 2 +- src/com/android/gallery3d/ingest/adapter/MtpPagerAdapter.java | 2 +- src/com/android/gallery3d/ingest/ui/DateTileView.java | 2 +- src/com/android/gallery3d/ingest/ui/MtpFullscreenView.java | 2 +- src/com/android/gallery3d/ingest/ui/MtpImageView.java | 2 +- src/com/android/gallery3d/ingest/ui/MtpThumbnailTileView.java | 2 +- src/com/android/gallery3d/ui/AbstractSlotRenderer.java | 2 +- src/com/android/gallery3d/ui/ActionModeHandler.java | 2 +- src/com/android/gallery3d/ui/AlbumLabelMaker.java | 2 +- src/com/android/gallery3d/ui/AlbumSetSlidingWindow.java | 2 +- src/com/android/gallery3d/ui/AlbumSetSlotRenderer.java | 2 +- src/com/android/gallery3d/ui/DetailsHelper.java | 2 +- src/com/android/gallery3d/ui/DialogDetailsView.java | 2 +- src/com/android/gallery3d/ui/EdgeEffect.java | 2 +- src/com/android/gallery3d/ui/GLRootView.java | 2 +- src/com/android/gallery3d/ui/Knob.java | 2 +- src/com/android/gallery3d/ui/ManageCacheDrawer.java | 2 +- src/com/android/gallery3d/ui/MenuExecutor.java | 2 +- src/com/android/gallery3d/ui/PhotoView.java | 2 +- src/com/android/gallery3d/ui/PopupList.java | 2 +- src/com/android/gallery3d/ui/ProgressSpinner.java | 2 +- src/com/android/gallery3d/ui/SelectionMenu.java | 2 +- src/com/android/gallery3d/ui/SlotView.java | 2 +- src/com/android/gallery3d/ui/TimeLineTitleMaker.java | 2 +- src/com/android/gallery3d/ui/UndoBarView.java | 2 +- src/com/android/gallery3d/util/GalleryUtils.java | 2 +- src/com/android/photos/AlbumFragment.java | 2 +- src/com/android/photos/AlbumSetFragment.java | 2 +- src/com/android/photos/GalleryActivity.java | 2 +- src/com/android/photos/MultiChoiceManager.java | 2 +- src/com/android/photos/MultiSelectGridFragment.java | 2 +- src/com/android/photos/adapters/AlbumSetCursorAdapter.java | 2 +- src/com/android/photos/adapters/PhotoThumbnailAdapter.java | 2 +- src/org/codeaurora/gallery3d/video/BookmarkActivity.java | 2 +- src/org/codeaurora/gallery3d/video/BookmarkEnhance.java | 2 +- src/org/codeaurora/gallery3d/video/BookmarkHooker.java | 8 ++++++-- src/org/codeaurora/gallery3d/video/ExtensionHelper.java | 2 +- src/org/codeaurora/gallery3d/video/LoopVideoHooker.java | 2 +- src/org/codeaurora/gallery3d/video/MovieListHooker.java | 2 +- src/org/codeaurora/gallery3d/video/SettingsActivity.java | 2 +- src/org/codeaurora/gallery3d/video/SpeakerHooker.java | 2 +- src/org/codeaurora/gallery3d/video/StepOptionSettingsHooker.java | 2 +- src/org/codeaurora/gallery3d/video/StereoAudioHooker.java | 2 +- src/org/codeaurora/gallery3d/video/StreamingHooker.java | 2 +- src/org/codeaurora/gallery3d/video/VideoSettingsActivity.java | 2 +- src/org/codeaurora/gallery3d/video/VideoSnapshotExt.java | 2 +- .../com/android/gallery3d/filtershow/filters/FiltersManager.java | 2 +- 236 files changed, 248 insertions(+), 244 deletions(-) diff --git a/Android.mk b/Android.mk index 3a425d213..54f8e0e43 100644 --- a/Android.mk +++ b/Android.mk @@ -7,7 +7,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_JAVA_LIBRARIES := telephony-common LOCAL_STATIC_JAVA_LIBRARIES := android-support-v13 -LOCAL_STATIC_JAVA_LIBRARIES += com.android.gallery3d.common2 +LOCAL_STATIC_JAVA_LIBRARIES += org.codeaurora.gallery.common LOCAL_STATIC_JAVA_LIBRARIES += xmp_toolkit LOCAL_STATIC_JAVA_LIBRARIES += mp4parser #LOCAL_STATIC_JAVA_LIBRARIES += android-support-v8-renderscript @@ -35,11 +35,11 @@ LOCAL_RESOURCE_DIR += $(LOCAL_PATH)/res LOCAL_AAPT_FLAGS := --auto-add-overlay -LOCAL_PACKAGE_NAME := Gallery2 +LOCAL_PACKAGE_NAME := SnapdragonGallery LOCAL_PRIVILEGED_MODULE := true -LOCAL_OVERRIDES_PACKAGES := Gallery Gallery3D GalleryNew3D +LOCAL_OVERRIDES_PACKAGES := Gallery Gallery3D GalleryNew3D Gallery2 LOCAL_PROGUARD_ENABLED := disabled diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 1eda90bf7..37c925c4b 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -20,7 +20,7 @@ + package="org.codeaurora.gallery"> diff --git a/gallerycommon/Android.mk b/gallerycommon/Android.mk index 1d341472c..97b6faf43 100644 --- a/gallerycommon/Android.mk +++ b/gallerycommon/Android.mk @@ -20,7 +20,7 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) -LOCAL_MODULE := com.android.gallery3d.common2 +LOCAL_MODULE := org.codeaurora.gallery.common LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_SDK_VERSION := 16 diff --git a/gallerycommon/src/com/android/gallery3d/jpegstream/JPEGInputStream.java b/gallerycommon/src/com/android/gallery3d/jpegstream/JPEGInputStream.java index 44ccd4c6b..71c3eb438 100644 --- a/gallerycommon/src/com/android/gallery3d/jpegstream/JPEGInputStream.java +++ b/gallerycommon/src/com/android/gallery3d/jpegstream/JPEGInputStream.java @@ -188,6 +188,6 @@ public class JPEGInputStream extends FilterInputStream { native private int skipDecodedBytes(int bytes); static { - System.loadLibrary("jni_jpegstream"); + System.loadLibrary("jni_gallery_jpegstream"); } } diff --git a/gallerycommon/src/com/android/gallery3d/jpegstream/JPEGOutputStream.java b/gallerycommon/src/com/android/gallery3d/jpegstream/JPEGOutputStream.java index c49d3759c..ab5c3a93d 100644 --- a/gallerycommon/src/com/android/gallery3d/jpegstream/JPEGOutputStream.java +++ b/gallerycommon/src/com/android/gallery3d/jpegstream/JPEGOutputStream.java @@ -139,6 +139,6 @@ public class JPEGOutputStream extends FilterOutputStream { native private int writeInputBytes(byte[] inBuffer, int offset, int inCount); static { - System.loadLibrary("jni_jpegstream"); + System.loadLibrary("jni_gallery_jpegstream"); } } diff --git a/jni/Android.mk b/jni/Android.mk index 2d7a0c398..1a45a90be 100644 --- a/jni/Android.mk +++ b/jni/Android.mk @@ -10,7 +10,7 @@ LOCAL_SDK_VERSION := 9 LOCAL_MODULE_TAGS := optional -LOCAL_MODULE := libjni_eglfence +LOCAL_MODULE := libjni_gallery_eglfence LOCAL_LDLIBS := -llog -lEGL @@ -23,7 +23,7 @@ include $(CLEAR_VARS) LOCAL_CPP_EXTENSION := .cc LOCAL_SDK_VERSION := 9 -LOCAL_MODULE := libjni_filtershow_filters +LOCAL_MODULE := libjni_gallery_filters LOCAL_SRC_FILES := filters/gradient.c \ filters/saturated.c \ filters/exposure.c \ diff --git a/jni_jpegstream/Android.mk b/jni_jpegstream/Android.mk index 97d57eeba..ef499baf4 100644 --- a/jni_jpegstream/Android.mk +++ b/jni_jpegstream/Android.mk @@ -4,7 +4,7 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) -LOCAL_MODULE := libjni_jpegstream +LOCAL_MODULE := libjni_gallery_jpegstream LOCAL_NDK_STL_VARIANT := stlport_static diff --git a/res/layout/audio_effects_dialog.xml b/res/layout/audio_effects_dialog.xml index a14cd1e54..be72d69cd 100644 --- a/res/layout/audio_effects_dialog.xml +++ b/res/layout/audio_effects_dialog.xml @@ -29,7 +29,7 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. --> - \ No newline at end of file + diff --git a/res/layout/filtershow_state_panel_new.xml b/res/layout/filtershow_state_panel_new.xml index 4ea7c8ae7..ac67ccbed 100644 --- a/res/layout/filtershow_state_panel_new.xml +++ b/res/layout/filtershow_state_panel_new.xml @@ -1,7 +1,7 @@