diff options
| author | Scott Main <smain@google.com> | 2012-10-18 18:26:10 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-10-18 18:26:10 -0700 |
| commit | 807179eafbc9428e647bcfde9062eb4e1c84cab2 (patch) | |
| tree | 34a912b99f2faaa608d79253f9d23dfe19cc3da5 | |
| parent | 2551de952f76901d9d942197458bbd7d1efecdbd (diff) | |
| download | android_packages_apps_Camera2-807179eafbc9428e647bcfde9062eb4e1c84cab2.tar.gz android_packages_apps_Camera2-807179eafbc9428e647bcfde9062eb4e1c84cab2.tar.bz2 android_packages_apps_Camera2-807179eafbc9428e647bcfde9062eb4e1c84cab2.zip | |
am 9baf2fd5: (-s ours) DO NOT MERGE cherrypick from Change-Id: I51c6a730e8663586153750a1cda6ea65aad592e8 remove old fashioned Dream, no longer supported
* commit '9baf2fd55613ce3f545da2d341c8e8a36b82ee78':
DO NOT MERGE cherrypick from Change-Id: I51c6a730e8663586153750a1cda6ea65aad592e8 remove old fashioned Dream, no longer supported
| -rw-r--r-- | AndroidManifest.xml | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 88981d175..be6408d6b 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -267,6 +267,17 @@ <uses-library android:name="com.google.android.media.effects" android:required="false" /> + <activity android:name="com.android.gallery3d.app.SlideshowDream" + android:label="@string/slideshow_dream_name" + android:theme="@android:style/Theme.Black.NoTitleBar.Fullscreen" + android:hardwareAccelerated="true"> + <intent-filter> + <action android:name="android.intent.action.MAIN" /> + <category android:name="android.intent.category.DEFAULT" /> + <category android:name="android.intent.category.DREAM" /> + </intent-filter> + </activity> + <activity android:name="com.android.gallery3d.settings.GallerySettings" android:theme="@style/Theme.Gallery" android:configChanges="orientation|keyboardHidden|screenSize" /> |