Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2bc71d89 authored by Steve Kondik's avatar Steve Kondik
Browse files

Merge tag 'android-4.2.2_r1' of... 

Merge tag 'android-4.2.2_r1' of https://android.googlesource.com/platform/packages/apps/Gallery2 into 1.1

Android 4.2.2 release 1
parents 982d7f35 643443e1

AndroidManifest.xml

+2 −2
Original line number Diff line number Diff line
@@ -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>

res/drawable/filtershow_border_film2.9.png

deleted100644 → 0
−22.1 KiB
Loading image diff...

res/drawable/filtershow_border_grunge.9.png

0 → 100644
+84.6 KiB
Loading image diff...

res/drawable/filtershow_border_sumi_e.9.png

0 → 100644
+44 KiB
Loading image diff...

res/drawable/filtershow_border_tape.9.png

0 → 100644
+211 KiB
Loading image diff...