diff --git a/app/app-release.apk b/app/app-release.apk index 96c021e..a6dfaa8 100755 Binary files a/app/app-release.apk and b/app/app-release.apk differ diff --git a/app/build.gradle b/app/build.gradle index 0051ba8..0a558e1 100755 --- a/app/build.gradle +++ b/app/build.gradle @@ -8,8 +8,8 @@ android { applicationId "com.ericsson.uecontrol" minSdkVersion 15 targetSdkVersion 19 - versionCode 37 - versionName "1.0.37" + versionCode 38 + versionName "1.0.38" } buildTypes { release { diff --git a/app/manifest-merger-release-report.txt b/app/manifest-merger-release-report.txt index a66671a..3665f7e 100755 --- a/app/manifest-merger-release-report.txt +++ b/app/manifest-merger-release-report.txt @@ -25,89 +25,95 @@ MERGED from com.android.support:support-v4:21.0.0:16:5 android:theme ADDED from AndroidManifest.xml:9:9 activity#com.ericsson.uecontrol.gui.MainActivity -ADDED from AndroidManifest.xml:10:9 +ADDED from AndroidManifest.xml:11:9 android:label + ADDED from AndroidManifest.xml:13:13 + android:name ADDED from AndroidManifest.xml:12:13 - android:name - ADDED from AndroidManifest.xml:11:13 intent-filter#android.intent.action.MAIN+android.intent.category.LAUNCHER -ADDED from AndroidManifest.xml:13:13 +ADDED from AndroidManifest.xml:14:13 action#android.intent.action.MAIN -ADDED from AndroidManifest.xml:14:17 - android:name - ADDED from AndroidManifest.xml:14:25 -category#android.intent.category.LAUNCHER ADDED from AndroidManifest.xml:15:17 android:name - ADDED from AndroidManifest.xml:15:27 -activity#com.ericsson.uecontrol.gui.SettingsActivity -ADDED from AndroidManifest.xml:18:9 - android:label - ADDED from AndroidManifest.xml:20:13 + ADDED from AndroidManifest.xml:15:25 +category#android.intent.category.LAUNCHER +ADDED from AndroidManifest.xml:16:17 android:name - ADDED from AndroidManifest.xml:19:13 -meta-data#android.support.PARENT_ACTIVITY -ADDED from AndroidManifest.xml:21:13 - android:name - ADDED from AndroidManifest.xml:22:17 - android:value - ADDED from AndroidManifest.xml:23:17 + ADDED from AndroidManifest.xml:16:27 activity#com.ericsson.uecontrol.gui.EditActivity +ADDED from AndroidManifest.xml:20:9 + android:label + ADDED from AndroidManifest.xml:22:13 + android:name + ADDED from AndroidManifest.xml:21:13 +activity#com.ericsson.uecontrol.gui.HistoryActivity ADDED from AndroidManifest.xml:25:9 android:label ADDED from AndroidManifest.xml:27:13 android:name ADDED from AndroidManifest.xml:26:13 -activity#com.ericsson.uecontrol.gui.AboutActivity -ADDED from AndroidManifest.xml:29:9 +activity#com.ericsson.uecontrol.gui.SettingsActivity +ADDED from AndroidManifest.xml:30:9 android:label - ADDED from AndroidManifest.xml:31:13 + ADDED from AndroidManifest.xml:32:13 android:name - ADDED from AndroidManifest.xml:30:13 + ADDED from AndroidManifest.xml:31:13 +meta-data#android.support.PARENT_ACTIVITY +ADDED from AndroidManifest.xml:33:13 + android:name + ADDED from AndroidManifest.xml:34:17 + android:value + ADDED from AndroidManifest.xml:35:17 +activity#com.ericsson.uecontrol.gui.AboutActivity +ADDED from AndroidManifest.xml:38:9 + android:label + ADDED from AndroidManifest.xml:40:13 + android:name + ADDED from AndroidManifest.xml:39:13 uses-sdk -ADDED from AndroidManifest.xml:35:5 +ADDED from AndroidManifest.xml:45:5 MERGED from com.android.support:support-v4:21.0.0:15:5 android:targetSdkVersion - ADDED from AndroidManifest.xml:36:9 + ADDED from AndroidManifest.xml:46:9 INJECTED from AndroidManifest.xml:0:0 INJECTED from AndroidManifest.xml:0:0 android:minSdkVersion - ADDED from AndroidManifest.xml:35:15 + ADDED from AndroidManifest.xml:45:15 INJECTED from AndroidManifest.xml:0:0 INJECTED from AndroidManifest.xml:0:0 uses-permission#android.permission.ACCESS_COARSE_LOCATION -ADDED from AndroidManifest.xml:38:5 +ADDED from AndroidManifest.xml:48:5 android:name - ADDED from AndroidManifest.xml:38:22 + ADDED from AndroidManifest.xml:48:22 uses-permission#android.permission.ACCESS_NETWORK_STATE -ADDED from AndroidManifest.xml:39:5 +ADDED from AndroidManifest.xml:49:5 android:name - ADDED from AndroidManifest.xml:39:22 + ADDED from AndroidManifest.xml:49:22 uses-permission#android.permission.ACCESS_WIFI_STATE -ADDED from AndroidManifest.xml:40:5 +ADDED from AndroidManifest.xml:50:5 android:name - ADDED from AndroidManifest.xml:40:22 + ADDED from AndroidManifest.xml:50:22 uses-permission#android.permission.BLUETOOTH -ADDED from AndroidManifest.xml:41:5 +ADDED from AndroidManifest.xml:51:5 android:name - ADDED from AndroidManifest.xml:41:22 + ADDED from AndroidManifest.xml:51:22 uses-permission#android.permission.BLUETOOTH_ADMIN -ADDED from AndroidManifest.xml:42:5 +ADDED from AndroidManifest.xml:52:5 android:name - ADDED from AndroidManifest.xml:42:22 + ADDED from AndroidManifest.xml:52:22 uses-permission#android.permission.CALL_PHONE -ADDED from AndroidManifest.xml:43:5 +ADDED from AndroidManifest.xml:53:5 android:name - ADDED from AndroidManifest.xml:43:22 + ADDED from AndroidManifest.xml:53:22 uses-permission#android.permission.INTERNET -ADDED from AndroidManifest.xml:44:5 +ADDED from AndroidManifest.xml:54:5 android:name - ADDED from AndroidManifest.xml:44:22 + ADDED from AndroidManifest.xml:54:22 uses-permission#android.permission.SEND_SMS -ADDED from AndroidManifest.xml:45:5 +ADDED from AndroidManifest.xml:55:5 android:name - ADDED from AndroidManifest.xml:45:22 + ADDED from AndroidManifest.xml:55:22 uses-permission#android.permission.WRITE_EXTERNAL_STORAGE -ADDED from AndroidManifest.xml:46:5 +ADDED from AndroidManifest.xml:56:5 android:name - ADDED from AndroidManifest.xml:46:22 + ADDED from AndroidManifest.xml:56:22