diff options
| author | Steve Kondik <shade@chemlab.org> | 2013-02-12 22:42:10 -0800 |
|---|---|---|
| committer | Steve Kondik <shade@chemlab.org> | 2013-02-12 22:42:10 -0800 |
| commit | 2bc71d89c3ff2a9e0ee4e764d8fe30ca0d5b3035 (patch) | |
| tree | f824d1c2165a274cea672998a3603791dec2951d /AndroidManifest.xml | |
| parent | 982d7f35c88385aafce3f7a547b0ec9e569d78ba (diff) | |
| parent | 643443e1cc8e827ff011c5e6885e5e713c1a481f (diff) | |
| download | android_packages_apps_Gallery2-2bc71d89c3ff2a9e0ee4e764d8fe30ca0d5b3035.tar.gz android_packages_apps_Gallery2-2bc71d89c3ff2a9e0ee4e764d8fe30ca0d5b3035.tar.bz2 android_packages_apps_Gallery2-2bc71d89c3ff2a9e0ee4e764d8fe30ca0d5b3035.zip | |
Merge tag 'android-4.2.2_r1' of https://android.googlesource.com/platform/packages/apps/Gallery2 into 1.1mr1.1-staging
Android 4.2.2 release 1
Diffstat (limited to 'AndroidManifest.xml')
| -rw-r--r-- | AndroidManifest.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index b7e785ca0..3a756a31b 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -232,7 +232,7 @@ <activity android:name="com.android.gallery3d.filtershow.FilterShowActivity" android:label="@string/title_activity_filter_show" - android:theme="@style/Theme.Gallery" + android:theme="@style/Theme.FilterShow" android:configChanges="keyboardHidden|orientation|screenSize"> <intent-filter> <action android:name="android.intent.action.EDIT" /> @@ -395,7 +395,7 @@ </intent-filter> </activity> <activity android:name="com.android.camera.ProxyLauncher" - android:theme="@android:style/Theme.NoDisplay"> + android:theme="@style/Theme.ProxyLauncher"> </activity> </application> </manifest> |