Skip to content

Commit d277fd5

Browse files
committed
New camera branch
-Updated Android Manifest for camera permissions
1 parent dddd439 commit d277fd5

12 files changed

Lines changed: 40 additions & 10 deletions

File tree

SimpleScan/.classpath

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
<classpathentry kind="src" path="gen"/>
55
<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
66
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
7-
<classpathentry kind="lib" path="C:/Users/kevin/Downloads/adt-bundle-windows-x86_64-20140702/sdk/extras/android/support/v4/android-support-v4.jar"/>
87
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
98
<classpathentry kind="output" path="bin/classes"/>
109
</classpath>

SimpleScan/AndroidManifest.xml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,16 @@
66

77
<uses-sdk
88
android:minSdkVersion="14"
9-
android:targetSdkVersion="21" />
9+
android:targetSdkVersion="21" />
10+
11+
<uses-permission android:name="android.permission.CAMERA" />
12+
<uses-feature android:name="android.hardware.camera.autofocus" />
13+
<uses-feature
14+
android:name="android.hardware.camera.flash"
15+
android:required="false" />
16+
<uses-feature android:name="android.hardware.camera" />
17+
18+
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
1019

1120
<application
1221
android:allowBackup="true"

SimpleScan/bin/AndroidManifest.xml

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,16 @@
66

77
<uses-sdk
88
android:minSdkVersion="14"
9-
android:targetSdkVersion="21" />
9+
android:targetSdkVersion="21" />
10+
11+
<uses-permission android:name="android.permission.CAMERA" />
12+
<uses-feature android:name="android.hardware.camera.autofocus" />
13+
<uses-feature
14+
android:name="android.hardware.camera.flash"
15+
android:required="false" />
16+
<uses-feature android:name="android.hardware.camera" />
17+
18+
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
1019

1120
<application
1221
android:allowBackup="true"
@@ -22,8 +31,10 @@
2231
<category android:name="android.intent.category.LAUNCHER" />
2332
</intent-filter>
2433
</activity>
34+
35+
<!-- lock the screenOrientation for now. May implement this if we have more time on the UI design -->
2536
<activity
26-
android:name=".Main"
37+
android:name=".Main"
2738
android:screenOrientation="portrait"
2839
/>
2940
</application>
-43 Bytes
Binary file not shown.
377 Bytes
Binary file not shown.
46 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.

SimpleScan/gen/android/support/v7/appcompat/R.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -444,7 +444,7 @@ public static final class layout {
444444
public static final int abc_search_dropdown_item_icons_2line = 0x7f030014;
445445
public static final int abc_search_view = 0x7f030015;
446446
public static final int abc_simple_dropdown_hint = 0x7f030016;
447-
public static final int support_simple_spinner_dropdown_item = 0x7f03001d;
447+
public static final int support_simple_spinner_dropdown_item = 0x7f03001e;
448448
}
449449
public static final class string {
450450
public static final int abc_action_bar_home_description = 0x7f0a0001;

0 commit comments

Comments
 (0)