-
-
Notifications
You must be signed in to change notification settings - Fork 23
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #81 from beeware/revert-80-revert-79-permissions
Restore "Add extension points for permissions."
- Loading branch information
Showing
3 changed files
with
25 additions
and
9 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
22 changes: 14 additions & 8 deletions
22
{{ cookiecutter.format }}/app/src/main/AndroidManifest.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,25 +1,31 @@ | ||
<?xml version="1.0" encoding="utf-8"?> | ||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"> | ||
<uses-permission android:name="android.permission.INTERNET" /> | ||
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> | ||
<manifest xmlns:android="http://schemas.android.com/apk/res/android" {{ cookiecutter.android_manifest_attrs_extra_content }}> | ||
{%- for permission in cookiecutter.permissions %} | ||
<uses-permission android:name="{{ permission }}" /> | ||
{%- endfor %} | ||
{%- for feature, value in cookiecutter.features.items() %} | ||
<uses-feature android:name="{{ feature }}" android:required="{{ value|bool_attr }}" /> | ||
{%- endfor %} | ||
<application | ||
android:allowBackup="true" | ||
android:icon="@mipmap/ic_launcher" | ||
android:label="@string/formal_name" | ||
android:networkSecurityConfig="@xml/network_security_config" | ||
android:roundIcon="@mipmap/ic_launcher_round" | ||
android:supportsRtl="true" | ||
android:theme="@style/AppTheme.Launcher"> | ||
<!-- https://developer.android.com/guide/topics/resources/runtime-changes#HandlingTheChange --> | ||
<activity | ||
android:theme="@style/AppTheme.Launcher" {{ cookiecutter.android_manifest_application_attrs_extra_content }}> | ||
<!-- https://developer.android.com/guide/topics/resources/runtime-changes#HandlingTheChange --> | ||
<activity | ||
android:configChanges="orientation|screenSize|screenLayout|keyboardHidden" | ||
android:name="org.beeware.android.MainActivity" | ||
android:exported="true"> | ||
android:exported="true" {{ cookiecutter.android_manifest_activity_attrs_extra_content }}> | ||
<intent-filter> | ||
<action android:name="android.intent.action.MAIN" /> | ||
<category android:name="android.intent.category.LAUNCHER" /> | ||
</intent-filter> | ||
{{ cookiecutter.android_manifest_activity_extra_content }} | ||
</activity> | ||
{{ cookiecutter.android_manifest_application_extra_content }} | ||
</application> | ||
|
||
{{ cookiecutter.android_manifest_extra_content }} | ||
</manifest> |