OSDN Git Service
(root)
/
android-x86
/
packages-apps-Camera2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Include v4, use AAPT2" into oc-dev am: a09a333fd2
[android-x86/packages-apps-Camera2.git]
/
AndroidManifest.xml
diff --git
a/AndroidManifest.xml
b/AndroidManifest.xml
index
6e5d38f
..
2d0aeeb
100644
(file)
--- a/
AndroidManifest.xml
+++ b/
AndroidManifest.xml
@@
-6,7
+6,7
@@
<uses-sdk
android:minSdkVersion="19"
<uses-sdk
android:minSdkVersion="19"
- android:targetSdkVersion="2
3
" />
+ android:targetSdkVersion="2
4
" />
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
@@
-42,6
+42,7
@@
android:icon="@mipmap/logo_camera_color_44in48dp"
android:label="@string/app_name"
android:largeHeap="true"
android:icon="@mipmap/logo_camera_color_44in48dp"
android:label="@string/app_name"
android:largeHeap="true"
+ android:resizeableActivity="false"
android:restoreAnyVersion="true"
android:supportsRtl="true"
android:theme="@style/Theme.Camera"
android:restoreAnyVersion="true"
android:supportsRtl="true"
android:theme="@style/Theme.Camera"