diff options
author | John Reck <jreck@google.com> | 2013-02-15 14:32:08 -0800 |
---|---|---|
committer | John Reck <jreck@google.com> | 2013-02-22 15:09:35 -0800 |
commit | 5f30b98d6ac98c6aa863d48f47e9b8e2b77a1820 (patch) | |
tree | b2494b57af472736cdc3805771177a9772f9c3dd /AndroidManifest.xml | |
parent | e77198985fc22ed2cf24f5d497309742165bc69f (diff) | |
download | android_packages_apps_Gallery2-5f30b98d6ac98c6aa863d48f47e9b8e2b77a1820.tar.gz android_packages_apps_Gallery2-5f30b98d6ac98c6aa863d48f47e9b8e2b77a1820.tar.bz2 android_packages_apps_Gallery2-5f30b98d6ac98c6aa863d48f47e9b8e2b77a1820.zip |
Start of photos
Change-Id: Id53dd96d8873e0fe6c2685e07cd7bdc0cde7ea75
Diffstat (limited to 'AndroidManifest.xml')
-rw-r--r-- | AndroidManifest.xml | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 508aefe9f..3cd30cbac 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -88,8 +88,11 @@ </intent-filter> </activity> - <activity android:name="com.android.gallery3d.app.Gallery" android:label="@string/app_name" - android:configChanges="keyboardHidden|orientation|screenSize"> + <activity android:name="com.android.photos.GalleryActivity" + android:label="@string/app_name" + android:configChanges="keyboardHidden|orientation|screenSize" + android:theme="@style/Theme.Photos.Gallery" + android:uiOptions="splitActionBarWhenNarrow"> <intent-filter> <action android:name="android.intent.action.MAIN" /> <category android:name="android.intent.category.DEFAULT" /> @@ -164,17 +167,6 @@ </intent-filter> </activity> - <!-- we add this activity-alias for shortcut backward compatibility --> - <!-- Note: The alias must put after the target activity --> - <activity-alias android:name="com.cooliris.media.Gallery" - android:targetActivity="com.android.gallery3d.app.Gallery" - android:configChanges="keyboardHidden|orientation|screenSize" - android:label="@string/app_name"> - <intent-filter> - <action android:name="android.intent.action.MAIN" /> - </intent-filter> - </activity-alias> - <!-- This activity receives USB_DEVICE_ATTACHED intents and allows importing media from attached MTP devices, like cameras and camera phones --> <activity android:launchMode="singleInstance" |