nixo
/
GadgetBridge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

target SDK Version 23, fix new errors in AndroidManifest.xml

This commit is contained in:
Andreas Shimokawa 2015-08-29 00:12:51 +02:00
parent 26792717d4
commit e30379e77d
2 changed files with 75 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/build.gradle
View File

@ -5,15 +5,15 @@ apply plugin: 'pmd'
def ABORT_ON_CHECK_FAILURE=false def ABORT_ON_CHECK_FAILURE=false
android { android {
compileSdkVersion 21 compileSdkVersion 23
buildToolsVersion "21.1.2" buildToolsVersion "23.0.0"
defaultConfig { defaultConfig {
applicationId "nodomain.freeyourgadget.gadgetbridge" applicationId "nodomain.freeyourgadget.gadgetbridge"
minSdkVersion 19 minSdkVersion 19
targetSdkVersion 21 targetSdkVersion 23
versionCode 22 versionCode 23
versionName "0.5.1" versionName "0.5.2"
} }
buildTypes { buildTypes {
release { release {

136
app/src/main/AndroidManifest.xml
View File

@ -4,7 +4,7 @@
<uses-sdk <uses-sdk
android:minSdkVersion="19" android:minSdkVersion="19"
android:targetSdkVersion="21" /> android:targetSdkVersion="23" />
<!-- <!--
<uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.INTERNET" />
--> -->
@ -32,6 +32,7 @@
<application <application
android:name=".GBApplication" android:name=".GBApplication"
android:allowBackup="true" android:allowBackup="true"
android:fullBackupContent="true"
android:icon="@drawable/ic_launcher" android:icon="@drawable/ic_launcher"
android:label="@string/app_name" android:label="@string/app_name"
android:theme="@style/GadgetbridgeTheme"> android:theme="@style/GadgetbridgeTheme">
@ -71,49 +72,51 @@
<meta-data <meta-data
android:name="android.support.PARENT_ACTIVITY" android:name="android.support.PARENT_ACTIVITY"
android:value=".activities.ControlCenter" /> android:value=".activities.ControlCenter" />
<intent-filter> <intent-filter>
<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" />
<data android:mimeType="*/*" /> <!-- needed for aosp-derived ROMs? --> <data android:mimeType="*/*" />
<!-- needed for aosp-derived ROMs? -->
<data android:host="*" /> <data android:host="*" />
<data android:scheme="file" /> <data android:scheme="file" />
<!-- as seen on openkeychain repo: https://github.com/open-keychain/open-keychain/blob/master/OpenKeychain/src/main/AndroidManifest.xml --> <!-- as seen on openkeychain repo: https://github.com/open-keychain/open-keychain/blob/master/OpenKeychain/src/main/AndroidManifest.xml -->
<data android:pathPattern=".*\\.fw" /> <data android:pathPattern="/.*\\.fw" />
<data android:pathPattern=".*\\..*\\.fw" /> <data android:pathPattern="/.*\\..*\\.fw" />
<data android:pathPattern=".*\\..*\\..*\\.fw" /> <data android:pathPattern="/.*\\..*\\..*\\.fw" />
<data android:pathPattern=".*\\..*\\..*\\..*\\.fw" /> <data android:pathPattern="/.*\\..*\\..*\\..*\\.fw" />
<data android:pathPattern=".*\\..*\\..*\\..*\\..*\\.fw" /> <data android:pathPattern="/.*\\..*\\..*\\..*\\..*\\.fw" />
<data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\.fw" /> <data android:pathPattern="/.*\\..*\\..*\\..*\\..*\\..*\\.fw" />
<data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\.fw" /> <data android:pathPattern="/.*\\..*\\..*\\..*\\..*\\..*\\..*\\.fw" />
<data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.fw" /> <data android:pathPattern="/.*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.fw" />
<data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.fw" /> <data android:pathPattern="/.*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.fw" />
<data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.fw" /> <data android:pathPattern="/.*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.fw" />
<data android:pathPattern=".*\\.pbw" /> <data android:pathPattern="/.*\\.pbw" />
<data android:pathPattern=".*\\..*\\.pbw" /> <data android:pathPattern="/.*\\..*\\.pbw" />
<data android:pathPattern=".*\\..*\\..*\\.pbw" /> <data android:pathPattern="/.*\\..*\\..*\\.pbw" />
<data android:pathPattern=".*\\..*\\..*\\..*\\.pbw" /> <data android:pathPattern="/.*\\..*\\..*\\..*\\.pbw" />
<data android:pathPattern=".*\\..*\\..*\\..*\\..*\\.pbw" /> <data android:pathPattern="/.*\\..*\\..*\\..*\\..*\\.pbw" />
<data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\.pbw" /> <data android:pathPattern="/.*\\..*\\..*\\..*\\..*\\..*\\.pbw" />
<data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\.pbw" /> <data android:pathPattern="/.*\\..*\\..*\\..*\\..*\\..*\\..*\\.pbw" />
<data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.pbw" /> <data android:pathPattern="/.*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.pbw" />
<data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.pbw" /> <data android:pathPattern="/.*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.pbw" />
<data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.pbw" /> <data android:pathPattern="/.*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.pbw" />
<data android:pathPattern=".*\\.pbz" /> <data android:pathPattern="/.*\\.pbz" />
<data android:pathPattern=".*\\..*\\.pbz" /> <data android:pathPattern="/.*\\..*\\.pbz" />
<data android:pathPattern=".*\\..*\\..*\\.pbz" /> <data android:pathPattern="/.*\\..*\\..*\\.pbz" />
<data android:pathPattern=".*\\..*\\..*\\..*\\.pbz" /> <data android:pathPattern="/.*\\..*\\..*\\..*\\.pbz" />
<data android:pathPattern=".*\\..*\\..*\\..*\\..*\\.pbz" /> <data android:pathPattern="/.*\\..*\\..*\\..*\\..*\\.pbz" />
<data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\.pbz" /> <data android:pathPattern="/.*\\..*\\..*\\..*\\..*\\..*\\.pbz" />
<data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\.pbz" /> <data android:pathPattern="/.*\\..*\\..*\\..*\\..*\\..*\\..*\\.pbz" />
<data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.pbz" /> <data android:pathPattern="/.*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.pbz" />
<data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.pbz" /> <data android:pathPattern="/.*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.pbz" />
<data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.pbz" /> <data android:pathPattern="/.*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.pbz" />
</intent-filter> </intent-filter>
<intent-filter> <intent-filter>
@ -127,41 +130,42 @@
<!-- as seen on openkeychain repo: https://github.com/open-keychain/open-keychain/blob/master/OpenKeychain/src/main/AndroidManifest.xml --> <!-- as seen on openkeychain repo: https://github.com/open-keychain/open-keychain/blob/master/OpenKeychain/src/main/AndroidManifest.xml -->
<data android:pathPattern=".*\\.fw" /> <data android:pathPattern="/.*\\.fw" />
<data android:pathPattern=".*\\..*\\.fw" /> <data android:pathPattern="/.*\\..*\\.fw" />
<data android:pathPattern=".*\\..*\\..*\\.fw" /> <data android:pathPattern="/.*\\..*\\..*\\.fw" />
<data android:pathPattern=".*\\..*\\..*\\..*\\.fw" /> <data android:pathPattern="/.*\\..*\\..*\\..*\\.fw" />
<data android:pathPattern=".*\\..*\\..*\\..*\\..*\\.fw" /> <data android:pathPattern="/.*\\..*\\..*\\..*\\..*\\.fw" />
<data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\.fw" /> <data android:pathPattern="/.*\\..*\\..*\\..*\\..*\\..*\\.fw" />
<data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\.fw" /> <data android:pathPattern="/.*\\..*\\..*\\..*\\..*\\..*\\..*\\.fw" />
<data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.fw" /> <data android:pathPattern="/.*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.fw" />
<data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.fw" /> <data android:pathPattern="/.*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.fw" />
<data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.fw" /> <data android:pathPattern="/.*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.fw" />
<data android:pathPattern=".*\\.pbw" /> <data android:pathPattern="/.*\\.pbw" />
<data android:pathPattern=".*\\..*\\.pbw" /> <data android:pathPattern="/.*\\..*\\.pbw" />
<data android:pathPattern=".*\\..*\\..*\\.pbw" /> <data android:pathPattern="/.*\\..*\\..*\\.pbw" />
<data android:pathPattern=".*\\..*\\..*\\..*\\.pbw" /> <data android:pathPattern="/.*\\..*\\..*\\..*\\.pbw" />
<data android:pathPattern=".*\\..*\\..*\\..*\\..*\\.pbw" /> <data android:pathPattern="/.*\\..*\\..*\\..*\\..*\\.pbw" />
<data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\.pbw" /> <data android:pathPattern="/.*\\..*\\..*\\..*\\..*\\..*\\.pbw" />
<data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\.pbw" /> <data android:pathPattern="/.*\\..*\\..*\\..*\\..*\\..*\\..*\\.pbw" />
<data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.pbw" /> <data android:pathPattern="/.*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.pbw" />
<data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.pbw" /> <data android:pathPattern="/.*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.pbw" />
<data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.pbw" /> <data android:pathPattern="/.*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.pbw" />
<data android:pathPattern=".*\\.pbz" /> <data android:pathPattern="/.*\\.pbz" />
<data android:pathPattern=".*\\..*\\.pbz" /> <data android:pathPattern="/.*\\..*\\.pbz" />
<data android:pathPattern=".*\\..*\\..*\\.pbz" /> <data android:pathPattern="/.*\\..*\\..*\\.pbz" />
<data android:pathPattern=".*\\..*\\..*\\..*\\.pbz" /> <data android:pathPattern="/.*\\..*\\..*\\..*\\.pbz" />
<data android:pathPattern=".*\\..*\\..*\\..*\\..*\\.pbz" /> <data android:pathPattern="/.*\\..*\\..*\\..*\\..*\\.pbz" />
<data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\.pbz" /> <data android:pathPattern="/.*\\..*\\..*\\..*\\..*\\..*\\.pbz" />
<data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\.pbz" /> <data android:pathPattern="/.*\\..*\\..*\\..*\\..*\\..*\\..*\\.pbz" />
<data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.pbz" /> <data android:pathPattern="/.*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.pbz" />
<data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.pbz" /> <data android:pathPattern="/.*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.pbz" />
<data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.pbz" /> <data android:pathPattern="/.*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.pbz" />
</intent-filter> </intent-filter>
</activity> </activity>
<service <service
android:name=".externalevents.NotificationListener" android:name=".externalevents.NotificationListener"
android:label="@string/app_name" android:label="@string/app_name"
@ -259,10 +263,10 @@
</activity> </activity>
<activity <activity
android:name=".activities.AndroidPairingActivity" android:name=".activities.AndroidPairingActivity"
android:label="@string/title_activity_android_pairing"></activity> android:label="@string/title_activity_android_pairing" />
<activity <activity
android:name=".devices.miband.MiBandPairingActivity" android:name=".devices.miband.MiBandPairingActivity"
android:label="@string/title_activity_mi_band_pairing"></activity> android:label="@string/title_activity_mi_band_pairing" />
<activity <activity
android:name=".activities.charts.ChartsActivity" android:name=".activities.charts.ChartsActivity"
android:label="@string/title_activity_charts" android:label="@string/title_activity_charts"
@ -274,7 +278,7 @@
<activity <activity
android:name=".activities.ConfigureAlarms" android:name=".activities.ConfigureAlarms"
android:label="@string/title_activity_set_alarm" android:label="@string/title_activity_set_alarm"
android:parentActivityName=".activities.SettingsActivity" > android:parentActivityName=".activities.SettingsActivity">
<meta-data <meta-data
android:name="android.support.PARENT_ACTIVITY" android:name="android.support.PARENT_ACTIVITY"
android:value=".activities.SettingsActivity" /> android:value=".activities.SettingsActivity" />
@ -282,7 +286,7 @@
<activity <activity
android:name=".activities.AlarmDetails" android:name=".activities.AlarmDetails"
android:label="@string/title_activity_alarm_details" android:label="@string/title_activity_alarm_details"
android:parentActivityName=".activities.ConfigureAlarms" > android:parentActivityName=".activities.ConfigureAlarms">
<meta-data <meta-data
android:name="android.support.PARENT_ACTIVITY" android:name="android.support.PARENT_ACTIVITY"
android:value="nodomain.freeyourgadget.gadgetbridge.activities.ConfigureAlarms" /> android:value="nodomain.freeyourgadget.gadgetbridge.activities.ConfigureAlarms" />