diff options
| author | Marvin Borner | 2018-08-29 14:29:57 +0200 |
|---|---|---|
| committer | Marvin Borner | 2018-08-29 14:29:57 +0200 |
| commit | f1426122d797e0c55883d0f128e8d24d6a7e7e6f (patch) | |
| tree | da5d3c4956a630be36f0928e935558dc1e1bdc3d /app/src/main | |
| parent | 2559293b1dd978a8998bd5290cdef14b909ac8b4 (diff) | |
Added support for Android Pie
Diffstat (limited to 'app/src/main')
| -rw-r--r-- | app/src/main/AndroidManifest.xml | 15 | ||||
| -rw-r--r-- | app/src/main/res/xml/network_security_config.xml | 6 |
2 files changed, 18 insertions, 3 deletions
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1ce29c3..59ff422 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -13,12 +13,13 @@ android:allowBackup="true" android:icon="@mipmap/ic_launcher" android:label="@string/app_name" + android:networkSecurityConfig="@xml/network_security_config" android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/AppTheme" tools:replace="android:allowBackup"> <activity - android:name=".InitialActivity" + android:name=".RoutingActivity" android:label="@string/loading"> <intent-filter> <action android:name="android.intent.action.MAIN" /> @@ -29,10 +30,18 @@ <activity android:name=".MainActivity" android:label="@string/app_name" - android:theme="@style/AppTheme.NoActionBar"></activity> + android:theme="@style/AppTheme.NoActionBar" /> <activity android:name=".LoginActivity" - android:label="@string/title_activity_login"></activity> + android:label="@string/title_activity_login" /> + <activity + android:name=".AppSettingsActivity" + android:label="@string/title_activity_app_settings" + android:parentActivityName=".MainActivity"> + <meta-data + android:name="android.support.PARENT_ACTIVITY" + android:value="com.no_name.no_name.MainActivity" /> + </activity> </application> </manifest>
\ No newline at end of file diff --git a/app/src/main/res/xml/network_security_config.xml b/app/src/main/res/xml/network_security_config.xml new file mode 100644 index 0000000..fc31d2f --- /dev/null +++ b/app/src/main/res/xml/network_security_config.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="utf-8"?> +<network-security-config> + <domain-config cleartextTrafficPermitted="true"> + <domain includeSubdomains="true">192.168.0.102</domain> + </domain-config> +</network-security-config>
\ No newline at end of file |