diff options
author | Scott Main <smain@google.com> | 2012-10-18 11:59:47 -0700 |
---|---|---|
committer | Scott Main <smain@google.com> | 2012-10-18 18:02:00 -0700 |
commit | 9baf2fd55613ce3f545da2d341c8e8a36b82ee78 (patch) | |
tree | ae55e96fd54a71122348ef4fa16a6bb3edec7382 /AndroidManifest.xml | |
parent | 79704855fb9b83acf9dc505f9ab1989ec1c770bc (diff) | |
download | android_packages_apps_Gallery2-9baf2fd55613ce3f545da2d341c8e8a36b82ee78.tar.gz android_packages_apps_Gallery2-9baf2fd55613ce3f545da2d341c8e8a36b82ee78.tar.bz2 android_packages_apps_Gallery2-9baf2fd55613ce3f545da2d341c8e8a36b82ee78.zip |
DO NOT MERGE
cherrypick from Change-Id: I51c6a730e8663586153750a1cda6ea65aad592e8
remove old fashioned Dream, no longer supported
Change-Id: I51c6a730e8663586153750a1cda6ea65aad592e8
Conflicts:
AndroidManifest.xml
Diffstat (limited to 'AndroidManifest.xml')
-rw-r--r-- | AndroidManifest.xml | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index be6408d6b..88981d175 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -267,17 +267,6 @@ <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" /> |