Permalink
Browse files

Update Android apps to need API 16+; remove stale Manifest config

1 parent 7476237 commit 87f00d41a747382a1dc34a6e67bfb3b21c4c4236 @srowen srowen committed Sep 16, 2016
@@ -16,8 +16,8 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.google.zxing.client.android"
- android:versionName="4.7.6"
- android:versionCode="106"
+ android:versionName="4.7.7"
+ android:versionCode="107"
android:installLocation="auto">
<uses-permission android:name="android.permission.CAMERA"/>
@@ -31,26 +31,13 @@
<uses-permission android:name="android.permission.CHANGE_WIFI_STATE"/>
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
- <uses-sdk android:minSdkVersion="15" android:targetSdkVersion="22"/>
+ <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="22"/>
- <!-- Don't require camera, as this requires a rear camera. This allows it to work on the Nexus 7 -->
- <uses-feature android:name="android.hardware.camera" android:required="false"/>
- <uses-feature android:name="android.hardware.camera.front" android:required="false"/>
- <!-- TODO replace above two with next line after Android 4.2 -->
- <!-- <uses-feature android:name="android.hardware.camera.any"/> -->
+ <uses-feature android:name="android.hardware.camera.any"/>
@schildbach
schildbach Oct 10, 2016

Just a reminder, API level 16 is Android 4.1 not 4.2. Just because in the removed comment you mentioned to make this change after Android 4.2.

@srowen
srowen Oct 10, 2016 Contributor

Yeah, I think I wrote that on account of https://code.google.com/p/android/issues/detail?id=35166 but it should be the case that this filter works correctly even with older Android versions now.

<uses-feature android:name="android.hardware.camera.autofocus" android:required="false"/>
<uses-feature android:name="android.hardware.camera.flash" android:required="false"/>
<uses-feature android:name="android.hardware.screen.landscape"/>
<uses-feature android:name="android.hardware.wifi" android:required="false"/>
- <!-- This excludes Google TV, which is unfortunately included by virtue of not requiring a camera -->
- <uses-feature android:name="android.hardware.touchscreen"/>
- <!-- TODO make this not required again after android.hardware.camera.any is available -->
-
- <supports-screens android:xlargeScreens="true"
- android:largeScreens="true"
- android:normalScreens="true"
- android:smallScreens="true"
- android:anyDensity="true"/>
<application android:icon="@drawable/launcher_icon"
android:logo="@drawable/launcher_icon"
View
@@ -18,7 +18,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>android</artifactId>
- <version>4.7.6</version>
+ <version>4.7.7</version>
<packaging>apk</packaging>
<dependencies>
@@ -22,15 +22,9 @@
<uses-permission android:name="android.permission.CAMERA"/>
- <uses-sdk android:minSdkVersion="15" android:targetSdkVersion="23"/>
+ <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="24"/>
- <supports-screens android:xlargeScreens="true"
- android:largeScreens="true"
- android:normalScreens="true"
- android:smallScreens="true"
- android:anyDensity="true"/>
-
- <uses-feature android:name="android.hardware.camera"/>
+ <uses-feature android:name="android.hardware.camera.any"/>
<application android:label="@string/app_name"
android:icon="@drawable/icon"
@@ -19,7 +19,6 @@
android:layout_height="fill_parent"
android:orientation="vertical">
<Button android:id="@+id/benchmark_run"
- style="@android:style/Widget.Holo.Button.Borderless"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:text="@string/benchmark_run"/>
@@ -19,79 +19,65 @@
android:layout_height="fill_parent">
<LinearLayout android:layout_width="fill_parent"
android:layout_height="wrap_content"
+ android:background="@android:color/background_dark"
android:orientation="vertical">
<Button android:id="@+id/run_benchmark"
- style="@android:style/Widget.Holo.Button.Borderless"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:text="@string/benchmark_run"/>
<Button android:id="@+id/get_camera_parameters"
- style="@android:style/Widget.Holo.Button.Borderless"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:text="@string/get_camera_parameters"/>
<Button android:id="@+id/scan_product"
- style="@android:style/Widget.Holo.Button.Borderless"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:text="@string/scan_product"/>
<Button android:id="@+id/scan_qr_code"
- style="@android:style/Widget.Holo.Button.Borderless"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:text="@string/scan_qr_code"/>
<Button android:id="@+id/scan_anything"
- style="@android:style/Widget.Holo.Button.Borderless"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:text="@string/scan_anything"/>
<Button android:id="@+id/search_book_contents"
- style="@android:style/Widget.Holo.Button.Borderless"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:text="@string/search_book_contents"/>
<Button android:id="@+id/encode_url"
- style="@android:style/Widget.Holo.Button.Borderless"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:text="@string/encode_url"/>
<Button android:id="@+id/encode_email"
- style="@android:style/Widget.Holo.Button.Borderless"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:text="@string/encode_email"/>
<Button android:id="@+id/encode_phone"
- style="@android:style/Widget.Holo.Button.Borderless"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:text="@string/encode_phone"/>
<Button android:id="@+id/encode_sms"
- style="@android:style/Widget.Holo.Button.Borderless"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:text="@string/encode_sms"/>
<Button android:id="@+id/encode_contact"
- style="@android:style/Widget.Holo.Button.Borderless"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:text="@string/encode_contact"/>
<Button android:id="@+id/encode_location"
- style="@android:style/Widget.Holo.Button.Borderless"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:text="@string/encode_location"/>
<Button android:id="@+id/encode_hidden_data"
- style="@android:style/Widget.Holo.Button.Borderless"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:text="@string/encode_hidden_data"/>
<Button android:id="@+id/encode_bad_data"
- style="@android:style/Widget.Holo.Button.Borderless"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:text="@string/encode_bad_data"/>
<Button android:id="@+id/share_via_barcode"
- style="@android:style/Widget.Holo.Button.Borderless"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:text="@string/share_via_barcode"/>

0 comments on commit 87f00d4

Please sign in to comment.