aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJason A. Donenfeld <Jason@zx2c4.com>2020-01-23 15:31:44 +0100
committerJason A. Donenfeld <Jason@zx2c4.com>2020-01-23 16:10:34 +0100
commit44409d0d609b9653bbb010fc68f26cce195c1d40 (patch)
treefb77bfcfca59195581625053f76476290feffe91
parenttools: update deps (diff)
downloadwireguard-android-44409d0d609b9653bbb010fc68f26cce195c1d40.tar.xz
wireguard-android-44409d0d609b9653bbb010fc68f26cce195c1d40.zip
manifest: reorder
-rw-r--r--.idea/codeStyles/Project.xml67
-rw-r--r--app/src/main/AndroidManifest.xml4
2 files changed, 15 insertions, 56 deletions
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index b021530..1349f8c 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -29,6 +29,9 @@
<emptyLine />
</value>
</option>
+ <AndroidXmlCodeStyleSettings>
+ <option name="ARRANGEMENT_SETTINGS_MIGRATED_TO_191" value="true" />
+ </AndroidXmlCodeStyleSettings>
<JavaCodeStyleSettings>
<option name="GENERATE_FINAL_LOCALS" value="true" />
<option name="GENERATE_FINAL_PARAMETERS" value="true" />
@@ -358,6 +361,7 @@
<match>
<AND>
<NAME>xmlns:android</NAME>
+ <XML_ATTRIBUTE />
<XML_NAMESPACE>^$</XML_NAMESPACE>
</AND>
</match>
@@ -368,6 +372,7 @@
<match>
<AND>
<NAME>xmlns:.*</NAME>
+ <XML_ATTRIBUTE />
<XML_NAMESPACE>^$</XML_NAMESPACE>
</AND>
</match>
@@ -379,6 +384,7 @@
<match>
<AND>
<NAME>.*:id</NAME>
+ <XML_ATTRIBUTE />
<XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
</AND>
</match>
@@ -389,6 +395,7 @@
<match>
<AND>
<NAME>.*:name</NAME>
+ <XML_ATTRIBUTE />
<XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
</AND>
</match>
@@ -399,6 +406,7 @@
<match>
<AND>
<NAME>name</NAME>
+ <XML_ATTRIBUTE />
<XML_NAMESPACE>^$</XML_NAMESPACE>
</AND>
</match>
@@ -409,6 +417,7 @@
<match>
<AND>
<NAME>style</NAME>
+ <XML_ATTRIBUTE />
<XML_NAMESPACE>^$</XML_NAMESPACE>
</AND>
</match>
@@ -419,6 +428,7 @@
<match>
<AND>
<NAME>.*</NAME>
+ <XML_ATTRIBUTE />
<XML_NAMESPACE>^$</XML_NAMESPACE>
</AND>
</match>
@@ -429,64 +439,12 @@
<rule>
<match>
<AND>
- <NAME>.*:layout_width</NAME>
- <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
- </AND>
- </match>
- </rule>
- </section>
- <section>
- <rule>
- <match>
- <AND>
- <NAME>.*:layout_height</NAME>
- <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
- </AND>
- </match>
- </rule>
- </section>
- <section>
- <rule>
- <match>
- <AND>
- <NAME>.*:layout_.*</NAME>
- <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
- </AND>
- </match>
- <order>BY_NAME</order>
- </rule>
- </section>
- <section>
- <rule>
- <match>
- <AND>
- <NAME>.*:width</NAME>
- <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
- </AND>
- </match>
- <order>BY_NAME</order>
- </rule>
- </section>
- <section>
- <rule>
- <match>
- <AND>
- <NAME>.*:height</NAME>
- <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
- </AND>
- </match>
- <order>BY_NAME</order>
- </rule>
- </section>
- <section>
- <rule>
- <match>
- <AND>
<NAME>.*</NAME>
+ <XML_ATTRIBUTE />
<XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
</AND>
</match>
- <order>BY_NAME</order>
+ <order>ANDROID_ATTRIBUTE_ORDER</order>
</rule>
</section>
<section>
@@ -494,6 +452,7 @@
<match>
<AND>
<NAME>.*</NAME>
+ <XML_ATTRIBUTE />
<XML_NAMESPACE>.*</XML_NAMESPACE>
</AND>
</match>
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 9bd2940..4bcb758 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -9,6 +9,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.touchscreen" android:required="false"/>
+
<permission
android:name="${applicationId}.permission.CONTROL_TUNNELS"
android:description="@string/permission_description"
@@ -16,8 +18,6 @@
android:label="@string/permission_label"
android:protectionLevel="dangerous" />
- <uses-feature android:name="android.hardware.touchscreen" android:required="false"/>
-
<application
android:name=".Application"
android:allowBackup="false"