DO NOT MERGE

cherrypick from Change-Id: I51c6a730e8663586153750a1cda6ea65aad592e8
remove old fashioned Dream, no longer supported

Change-Id: I51c6a730e8663586153750a1cda6ea65aad592e8

Conflicts:

	AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index be6408d..88981d1 100644 (file)
--- 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" />

diff --git a/src/com/android/gallery3d/app/SlideshowDream.java b/src/com/android/gallery3d/app/SlideshowDream.java
deleted file mode 100644 (file)
index 9963da6..0000000
--- a/src/com/android/gallery3d/app/SlideshowDream.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.android.gallery3d.app;
-
-import android.content.Intent;
-import android.os.Bundle;
-import android.support.v13.dreams.BasicDream;
-
-public class SlideshowDream extends BasicDream {
-    @Override
-    public void onCreate(Bundle bndl) {
-        super.onCreate(bndl);
-        Intent i = new Intent(
-            Intent.ACTION_VIEW,
-            android.provider.MediaStore.Images.Media.EXTERNAL_CONTENT_URI)
-//            Uri.fromFile(Environment.getExternalStoragePublicDirectory(
-//                        Environment.DIRECTORY_PICTURES)))
-                .putExtra(Gallery.EXTRA_SLIDESHOW, true)
-                .putExtra(Gallery.EXTRA_DREAM, true)
-                .setFlags(getIntent().getFlags());
-        startActivity(i);
-        finish();
-    }
-}