[Parent][R-2.0.5] Don't require camera hardware and version code bump (…

…#311)
instructure · Sep 13, 2019 · f791ccf · f791ccf
1 parent f071c99
commit f791ccf
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/apps/parent/build.gradle b/apps/parent/build.gradle
@@ -36,7 +36,7 @@ android {
         applicationId "com.instructure.parentapp"
         minSdkVersion Versions.MIN_SDK
         targetSdkVersion Versions.TARGET_SDK
-        versionCode = 22
+        versionCode = 23
         versionName = "2.0.5"
 
         multiDexEnabled = true

diff --git a/apps/parent/src/main/AndroidManifest.xml b/apps/parent/src/main/AndroidManifest.xml
@@ -26,6 +26,8 @@
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 
+    <uses-feature android:name="android.hardware.camera" android:required="false" tools:replace="required"/>
+
     <application
         android:name=".util.ApplicationManager"
         android:allowBackup="false"

diff --git a/apps/student/src/main/AndroidManifest.xml b/apps/student/src/main/AndroidManifest.xml
@@ -46,8 +46,8 @@
         android:name="com.google.android.apps.common.testing.testrunner.GoogleInstrumentationTestRunner"
         android:targetPackage="com.instructure.candroid"/>
 
-    <uses-feature android:name="android.hardware.camera" android:required="false"/>
-    <uses-feature android:name="android.hardware.camera.autofocus" android:required="false"/>
+    <uses-feature android:name="android.hardware.camera" android:required="false" tools:replace="required"/>
+    <uses-feature android:name="android.hardware.camera.autofocus" android:required="false" tools:replace="required"/>
 
     <supports-screens
         android:anyDensity="true"

diff --git a/apps/teacher/src/main/AndroidManifest.xml b/apps/teacher/src/main/AndroidManifest.xml
@@ -24,8 +24,8 @@
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
     <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" /> <!-- For Studio -->
 
-    <uses-feature android:name="android.hardware.camera" android:required="false"/>
-    <uses-feature android:name="android.hardware.camera.autofocus" android:required="false"/>
+    <uses-feature android:name="android.hardware.camera" android:required="false" tools:replace="required"/>
+    <uses-feature android:name="android.hardware.camera.autofocus" android:required="false" tools:replace="required"/>
 
     <supports-screens
         android:anyDensity="true"