From d6c2fb7a38fcdb58742fcfffd67a4594487ec71c Mon Sep 17 00:00:00 2001 From: Owen Lin Date: Thu, 15 Oct 2009 03:43:44 -0700 Subject: Hide Camera's activities by removing their intent-filters. Also change the android package name for Gallery, otherwise it will conflicts with Camera's. Change-Id: I1fb24c931388e90d0edbd38078609781bdb849e1 --- src/com/android/camera/ActionMenuButton.java | 2 ++ src/com/android/camera/Camera.java | 2 ++ src/com/android/camera/CameraSettings.java | 2 ++ src/com/android/camera/CropImage.java | 2 ++ src/com/android/camera/DeleteImage.java | 2 ++ src/com/android/camera/EvenlySpacedLayout.java | 2 ++ src/com/android/camera/GalleryPicker.java | 2 ++ src/com/android/camera/GalleryPickerItem.java | 2 ++ src/com/android/camera/GallerySettings.java | 2 ++ src/com/android/camera/GridViewSpecial.java | 2 ++ src/com/android/camera/HighlightView.java | 2 ++ src/com/android/camera/IconIndicator.java | 2 ++ src/com/android/camera/IconListPreference.java | 2 ++ src/com/android/camera/ImageGallery.java | 2 ++ src/com/android/camera/MenuHelper.java | 2 ++ src/com/android/camera/MovieView.java | 2 ++ src/com/android/camera/MovieViewControl.java | 2 ++ src/com/android/camera/OnScreenHint.java | 2 ++ src/com/android/camera/OnScreenSettings.java | 2 ++ src/com/android/camera/PhotoAppWidgetProvider.java | 2 ++ src/com/android/camera/PreviewFrameLayout.java | 2 ++ src/com/android/camera/ReviewImage.java | 2 ++ src/com/android/camera/Util.java | 2 ++ src/com/android/camera/VideoCamera.java | 2 ++ src/com/android/camera/ViewImage.java | 2 ++ 25 files changed, 50 insertions(+) (limited to 'src/com/android/camera') diff --git a/src/com/android/camera/ActionMenuButton.java b/src/com/android/camera/ActionMenuButton.java index e9033cc..622652c 100644 --- a/src/com/android/camera/ActionMenuButton.java +++ b/src/com/android/camera/ActionMenuButton.java @@ -16,6 +16,8 @@ package com.android.camera; +import com.android.gallery.R; + import android.content.Context; import android.graphics.Canvas; import android.graphics.Paint; diff --git a/src/com/android/camera/Camera.java b/src/com/android/camera/Camera.java index 33dfa08..3aee44f 100644 --- a/src/com/android/camera/Camera.java +++ b/src/com/android/camera/Camera.java @@ -16,6 +16,8 @@ package com.android.camera; +import com.android.gallery.R; + import android.app.Activity; import android.content.ActivityNotFoundException; import android.content.BroadcastReceiver; diff --git a/src/com/android/camera/CameraSettings.java b/src/com/android/camera/CameraSettings.java index e7d7d0e..46f1ed5 100644 --- a/src/com/android/camera/CameraSettings.java +++ b/src/com/android/camera/CameraSettings.java @@ -1,5 +1,7 @@ package com.android.camera; +import com.android.gallery.R; + import android.app.Activity; import android.content.Context; import android.content.SharedPreferences; diff --git a/src/com/android/camera/CropImage.java b/src/com/android/camera/CropImage.java index 6a52d72..fccb626 100644 --- a/src/com/android/camera/CropImage.java +++ b/src/com/android/camera/CropImage.java @@ -16,6 +16,8 @@ package com.android.camera; +import com.android.gallery.R; + import com.android.camera.gallery.IImage; import com.android.camera.gallery.IImageList; diff --git a/src/com/android/camera/DeleteImage.java b/src/com/android/camera/DeleteImage.java index 3a13466..1c1b07e 100644 --- a/src/com/android/camera/DeleteImage.java +++ b/src/com/android/camera/DeleteImage.java @@ -16,6 +16,8 @@ package com.android.camera; +import com.android.gallery.R; + import android.app.Activity; import android.content.ContentResolver; import android.content.Intent; diff --git a/src/com/android/camera/EvenlySpacedLayout.java b/src/com/android/camera/EvenlySpacedLayout.java index d994fe4..0b0f87e 100644 --- a/src/com/android/camera/EvenlySpacedLayout.java +++ b/src/com/android/camera/EvenlySpacedLayout.java @@ -16,6 +16,8 @@ package com.android.camera; +import com.android.gallery.R; + import android.content.Context; import android.content.res.TypedArray; import android.util.AttributeSet; diff --git a/src/com/android/camera/GalleryPicker.java b/src/com/android/camera/GalleryPicker.java index 39d1d1e..33101fd 100644 --- a/src/com/android/camera/GalleryPicker.java +++ b/src/com/android/camera/GalleryPicker.java @@ -16,6 +16,8 @@ package com.android.camera; +import com.android.gallery.R; + import com.android.camera.gallery.IImage; import com.android.camera.gallery.IImageList; diff --git a/src/com/android/camera/GalleryPickerItem.java b/src/com/android/camera/GalleryPickerItem.java index 99e4a58..a55ff6b 100644 --- a/src/com/android/camera/GalleryPickerItem.java +++ b/src/com/android/camera/GalleryPickerItem.java @@ -16,6 +16,8 @@ package com.android.camera; +import com.android.gallery.R; + import android.content.Context; import android.graphics.Canvas; import android.graphics.Rect; diff --git a/src/com/android/camera/GallerySettings.java b/src/com/android/camera/GallerySettings.java index 32c806c..3590e59 100644 --- a/src/com/android/camera/GallerySettings.java +++ b/src/com/android/camera/GallerySettings.java @@ -16,6 +16,8 @@ package com.android.camera; +import com.android.gallery.R; + import android.os.Bundle; import android.preference.PreferenceActivity; diff --git a/src/com/android/camera/GridViewSpecial.java b/src/com/android/camera/GridViewSpecial.java index 5326ebb..3c3caf1 100644 --- a/src/com/android/camera/GridViewSpecial.java +++ b/src/com/android/camera/GridViewSpecial.java @@ -16,6 +16,8 @@ package com.android.camera; +import com.android.gallery.R; + import static com.android.camera.Util.Assert; import android.app.Activity; diff --git a/src/com/android/camera/HighlightView.java b/src/com/android/camera/HighlightView.java index c05a4b2..d5478e0 100644 --- a/src/com/android/camera/HighlightView.java +++ b/src/com/android/camera/HighlightView.java @@ -16,6 +16,8 @@ package com.android.camera; +import com.android.gallery.R; + import android.graphics.Canvas; import android.graphics.Matrix; import android.graphics.Paint; diff --git a/src/com/android/camera/IconIndicator.java b/src/com/android/camera/IconIndicator.java index c3f0392..e180a3d 100644 --- a/src/com/android/camera/IconIndicator.java +++ b/src/com/android/camera/IconIndicator.java @@ -16,6 +16,8 @@ package com.android.camera; +import com.android.gallery.R; + import android.content.Context; import android.content.res.Resources; import android.content.res.TypedArray; diff --git a/src/com/android/camera/IconListPreference.java b/src/com/android/camera/IconListPreference.java index 314b7a9..6e5d8d8 100644 --- a/src/com/android/camera/IconListPreference.java +++ b/src/com/android/camera/IconListPreference.java @@ -16,6 +16,8 @@ package com.android.camera; +import com.android.gallery.R; + import android.content.Context; import android.content.res.Resources; import android.content.res.TypedArray; diff --git a/src/com/android/camera/ImageGallery.java b/src/com/android/camera/ImageGallery.java index 680d186..e62c05b 100644 --- a/src/com/android/camera/ImageGallery.java +++ b/src/com/android/camera/ImageGallery.java @@ -16,6 +16,8 @@ package com.android.camera; +import com.android.gallery.R; + import android.app.Activity; import android.app.AlertDialog; import android.app.Dialog; diff --git a/src/com/android/camera/MenuHelper.java b/src/com/android/camera/MenuHelper.java index 3fed674..a5d50eb 100644 --- a/src/com/android/camera/MenuHelper.java +++ b/src/com/android/camera/MenuHelper.java @@ -16,6 +16,8 @@ package com.android.camera; +import com.android.gallery.R; + import android.app.Activity; import android.app.AlertDialog; import android.content.ActivityNotFoundException; diff --git a/src/com/android/camera/MovieView.java b/src/com/android/camera/MovieView.java index 48001b8..57e62ba 100644 --- a/src/com/android/camera/MovieView.java +++ b/src/com/android/camera/MovieView.java @@ -16,6 +16,8 @@ package com.android.camera; +import com.android.gallery.R; + import android.app.Activity; import android.content.Intent; diff --git a/src/com/android/camera/MovieViewControl.java b/src/com/android/camera/MovieViewControl.java index 737433b..012134c 100644 --- a/src/com/android/camera/MovieViewControl.java +++ b/src/com/android/camera/MovieViewControl.java @@ -16,6 +16,8 @@ package com.android.camera; +import com.android.gallery.R; + import android.app.AlertDialog; import android.content.ContentResolver; import android.content.ContentValues; diff --git a/src/com/android/camera/OnScreenHint.java b/src/com/android/camera/OnScreenHint.java index 9918428..fdda528 100644 --- a/src/com/android/camera/OnScreenHint.java +++ b/src/com/android/camera/OnScreenHint.java @@ -16,6 +16,8 @@ package com.android.camera; +import com.android.gallery.R; + import android.content.Context; import android.graphics.PixelFormat; import android.os.Handler; diff --git a/src/com/android/camera/OnScreenSettings.java b/src/com/android/camera/OnScreenSettings.java index ffd309d..2fd00c0 100644 --- a/src/com/android/camera/OnScreenSettings.java +++ b/src/com/android/camera/OnScreenSettings.java @@ -1,5 +1,7 @@ package com.android.camera; +import com.android.gallery.R; + import android.content.Context; import android.graphics.PixelFormat; import android.os.Handler; diff --git a/src/com/android/camera/PhotoAppWidgetProvider.java b/src/com/android/camera/PhotoAppWidgetProvider.java index da680b4..ec1f924 100644 --- a/src/com/android/camera/PhotoAppWidgetProvider.java +++ b/src/com/android/camera/PhotoAppWidgetProvider.java @@ -16,6 +16,8 @@ package com.android.camera; +import com.android.gallery.R; + import android.appwidget.AppWidgetManager; import android.appwidget.AppWidgetProvider; import android.content.ContentValues; diff --git a/src/com/android/camera/PreviewFrameLayout.java b/src/com/android/camera/PreviewFrameLayout.java index 7ef9206..49a39ef 100644 --- a/src/com/android/camera/PreviewFrameLayout.java +++ b/src/com/android/camera/PreviewFrameLayout.java @@ -16,6 +16,8 @@ package com.android.camera; +import com.android.gallery.R; + import android.app.Activity; import android.content.Context; import android.util.AttributeSet; diff --git a/src/com/android/camera/ReviewImage.java b/src/com/android/camera/ReviewImage.java index 0633b18..ef629da 100644 --- a/src/com/android/camera/ReviewImage.java +++ b/src/com/android/camera/ReviewImage.java @@ -16,6 +16,8 @@ package com.android.camera; +import com.android.gallery.R; + import android.app.Activity; import android.content.Context; import android.content.Intent; diff --git a/src/com/android/camera/Util.java b/src/com/android/camera/Util.java index d44435a..69e608a 100644 --- a/src/com/android/camera/Util.java +++ b/src/com/android/camera/Util.java @@ -16,6 +16,8 @@ package com.android.camera; +import com.android.gallery.R; + import android.app.Activity; import android.app.AlertDialog; import android.app.ProgressDialog; diff --git a/src/com/android/camera/VideoCamera.java b/src/com/android/camera/VideoCamera.java index afd4cdd..0786fa5 100644 --- a/src/com/android/camera/VideoCamera.java +++ b/src/com/android/camera/VideoCamera.java @@ -16,6 +16,8 @@ package com.android.camera; +import com.android.gallery.R; + import android.app.Activity; import android.content.ActivityNotFoundException; import android.content.BroadcastReceiver; diff --git a/src/com/android/camera/ViewImage.java b/src/com/android/camera/ViewImage.java index 3ee3029..2992f7a 100644 --- a/src/com/android/camera/ViewImage.java +++ b/src/com/android/camera/ViewImage.java @@ -16,6 +16,8 @@ package com.android.camera; +import com.android.gallery.R; + import android.app.Activity; import android.content.Context; import android.content.Intent; -- cgit v1.2.3