AndroidManifest.xml (zxing-zxing-3.4.1) | : | AndroidManifest.xml (zxing-zxing-3.5.0) | ||
---|---|---|---|---|
skipping to change at line 51 | skipping to change at line 51 | |||
<application android:icon="@drawable/launcher_icon" | <application android:icon="@drawable/launcher_icon" | |||
android:logo="@drawable/launcher_icon" | android:logo="@drawable/launcher_icon" | |||
android:label="@string/app_name" | android:label="@string/app_name" | |||
android:allowBackup="true"> | android:allowBackup="true"> | |||
<activity android:name=".CaptureActivity" | <activity android:name=".CaptureActivity" | |||
android:screenOrientation="sensorLandscape" | android:screenOrientation="sensorLandscape" | |||
android:clearTaskOnLaunch="true" | android:clearTaskOnLaunch="true" | |||
android:stateNotNeeded="true" | android:stateNotNeeded="true" | |||
android:theme="@style/CaptureTheme" | android:theme="@style/CaptureTheme" | |||
android:windowSoftInputMode="stateAlwaysHidden"> | android:windowSoftInputMode="stateAlwaysHidden" | |||
android:exported="false"> | ||||
<intent-filter> | <intent-filter> | |||
<action android:name="android.intent.action.MAIN"/> | <action android:name="android.intent.action.MAIN"/> | |||
<category android:name="android.intent.category.LAUNCHER"/> | <category android:name="android.intent.category.LAUNCHER"/> | |||
</intent-filter> | </intent-filter> | |||
<intent-filter> | <intent-filter> | |||
<action android:name="com.google.zxing.client.android.SCAN"/> | <action android:name="com.google.zxing.client.android.SCAN"/> | |||
<category android:name="android.intent.category.DEFAULT"/> | <category android:name="android.intent.category.DEFAULT"/> | |||
</intent-filter> | </intent-filter> | |||
<!-- Allow web apps to launch Barcode Scanner by linking to http://zxing.a ppspot.com/scan. --> | <!-- Allow web apps to launch Barcode Scanner by linking to http://zxing.a ppspot.com/scan. --> | |||
<intent-filter> | <intent-filter> | |||
skipping to change at line 93 | skipping to change at line 94 | |||
<action android:name="android.intent.action.VIEW"/> | <action android:name="android.intent.action.VIEW"/> | |||
<category android:name="android.intent.category.DEFAULT"/> | <category android:name="android.intent.category.DEFAULT"/> | |||
<category android:name="android.intent.category.BROWSABLE"/> | <category android:name="android.intent.category.BROWSABLE"/> | |||
<data android:scheme="zxing" android:host="scan" android:path="/"/> | <data android:scheme="zxing" android:host="scan" android:path="/"/> | |||
</intent-filter> | </intent-filter> | |||
</activity> | </activity> | |||
<activity android:name=".PreferencesActivity" | <activity android:name=".PreferencesActivity" | |||
android:label="@string/preferences_name" | android:label="@string/preferences_name" | |||
android:stateNotNeeded="true"/> | android:stateNotNeeded="true"/> | |||
<activity android:name=".encode.EncodeActivity" | <activity android:name=".encode.EncodeActivity" | |||
android:stateNotNeeded="true"> | android:stateNotNeeded="true" | |||
android:exported="false"> | ||||
<intent-filter> | <intent-filter> | |||
<action android:name="com.google.zxing.client.android.ENCODE"/> | <action android:name="com.google.zxing.client.android.ENCODE"/> | |||
<category android:name="android.intent.category.DEFAULT"/> | <category android:name="android.intent.category.DEFAULT"/> | |||
</intent-filter> | </intent-filter> | |||
<!-- This allows us to handle the Share button in Contacts. --> | <!-- This allows us to handle the Share button in Contacts. --> | |||
<intent-filter> | <intent-filter> | |||
<action android:name="android.intent.action.SEND"/> | <action android:name="android.intent.action.SEND"/> | |||
<category android:name="android.intent.category.DEFAULT"/> | <category android:name="android.intent.category.DEFAULT"/> | |||
<data android:mimeType="text/x-vcard"/> | <data android:mimeType="text/x-vcard"/> | |||
</intent-filter> | </intent-filter> | |||
<!-- This allows us to handle sharing any plain text . --> | <!-- This allows us to handle sharing any plain text . --> | |||
<intent-filter> | <intent-filter> | |||
<action android:name="android.intent.action.SEND"/> | <action android:name="android.intent.action.SEND"/> | |||
<category android:name="android.intent.category.DEFAULT"/> | <category android:name="android.intent.category.DEFAULT"/> | |||
<data android:mimeType="text/plain"/> | <data android:mimeType="text/plain"/> | |||
</intent-filter> | </intent-filter> | |||
</activity> | </activity> | |||
<activity android:name=".book.SearchBookContentsActivity" | <activity android:name=".book.SearchBookContentsActivity" | |||
android:label="@string/sbc_name" | android:label="@string/sbc_name" | |||
android:stateNotNeeded="true" | android:stateNotNeeded="true" | |||
android:screenOrientation="sensorLandscape"> | android:screenOrientation="sensorLandscape" | |||
android:exported="false"> | ||||
<intent-filter> | <intent-filter> | |||
<action android:name="com.google.zxing.client.android.SEARCH_BOOK_CONTEN TS"/> | <action android:name="com.google.zxing.client.android.SEARCH_BOOK_CONTEN TS"/> | |||
<category android:name="android.intent.category.DEFAULT"/> | <category android:name="android.intent.category.DEFAULT"/> | |||
</intent-filter> | </intent-filter> | |||
</activity> | </activity> | |||
<activity android:name=".share.ShareActivity" | <activity android:name=".share.ShareActivity" | |||
android:stateNotNeeded="true" | android:stateNotNeeded="true" | |||
android:screenOrientation="user"> | android:screenOrientation="user" | |||
android:exported="false"> | ||||
<intent-filter> | <intent-filter> | |||
<action android:name="com.google.zxing.client.android.SHARE"/> | <action android:name="com.google.zxing.client.android.SHARE"/> | |||
<category android:name="android.intent.category.DEFAULT"/> | <category android:name="android.intent.category.DEFAULT"/> | |||
</intent-filter> | </intent-filter> | |||
</activity> | </activity> | |||
<activity android:name=".history.HistoryActivity" | <activity android:name=".history.HistoryActivity" | |||
android:label="@string/history_title" | android:label="@string/history_title" | |||
android:stateNotNeeded="true"/> | android:stateNotNeeded="true"/> | |||
<activity android:name=".share.BookmarkPickerActivity" | <activity android:name=".share.BookmarkPickerActivity" | |||
android:label="@string/bookmark_picker_name" | android:label="@string/bookmark_picker_name" | |||
End of changes. 4 change blocks. | ||||
4 lines changed or deleted | 8 lines changed or added |