ziver/ue-control
1
0
Fork 0
Code Pull requests Releases Activity

UeControl Build 37

Browse source
This commit is contained in:
Ziver Koc 2015-03-09 16:50:25 +01:00
parent 6216afd36b
commit 9727b88327
3 changed files with 53 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
app/app-release.apk
View file

Binary file not shown.

4
app/build.gradle
View file

@ -8,8 +8,8 @@ android {
applicationId "com.ericsson.uecontrol" applicationId "com.ericsson.uecontrol"
minSdkVersion 15 minSdkVersion 15
targetSdkVersion 19 targetSdkVersion 19
versionCode 37 versionCode 38
versionName "1.0.37" versionName "1.0.38"
} }
buildTypes { buildTypes {
release { release {

96
app/manifest-merger-release-report.txt
View file

@ -25,89 +25,95 @@ MERGED from com.android.support:support-v4:21.0.0:16:5
android:theme android:theme
ADDED from AndroidManifest.xml:9:9 ADDED from AndroidManifest.xml:9:9
activity#com.ericsson.uecontrol.gui.MainActivity activity#com.ericsson.uecontrol.gui.MainActivity
ADDED from AndroidManifest.xml:10:9 ADDED from AndroidManifest.xml:11:9
android:label android:label
ADDED from AndroidManifest.xml:13:13
android:name
ADDED from AndroidManifest.xml:12:13 ADDED from AndroidManifest.xml:12:13
android:name
ADDED from AndroidManifest.xml:11:13
intent-filter#android.intent.action.MAIN+android.intent.category.LAUNCHER 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 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 ADDED from AndroidManifest.xml:15:17
android:name android:name
ADDED from AndroidManifest.xml:15:27 ADDED from AndroidManifest.xml:15:25
activity#com.ericsson.uecontrol.gui.SettingsActivity category#android.intent.category.LAUNCHER
ADDED from AndroidManifest.xml:18:9 ADDED from AndroidManifest.xml:16:17
android:label
ADDED from AndroidManifest.xml:20:13
android:name android:name
ADDED from AndroidManifest.xml:19:13 ADDED from AndroidManifest.xml:16:27
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
activity#com.ericsson.uecontrol.gui.EditActivity 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 ADDED from AndroidManifest.xml:25:9
android:label android:label
ADDED from AndroidManifest.xml:27:13 ADDED from AndroidManifest.xml:27:13
android:name android:name
ADDED from AndroidManifest.xml:26:13 ADDED from AndroidManifest.xml:26:13
activity#com.ericsson.uecontrol.gui.AboutActivity activity#com.ericsson.uecontrol.gui.SettingsActivity
ADDED from AndroidManifest.xml:29:9 ADDED from AndroidManifest.xml:30:9
android:label android:label
ADDED from AndroidManifest.xml:31:13 ADDED from AndroidManifest.xml:32:13
android:name 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 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 MERGED from com.android.support:support-v4:21.0.0:15:5
android:targetSdkVersion 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
INJECTED from AndroidManifest.xml:0:0 INJECTED from AndroidManifest.xml:0:0
android:minSdkVersion 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
INJECTED from AndroidManifest.xml:0:0 INJECTED from AndroidManifest.xml:0:0
uses-permission#android.permission.ACCESS_COARSE_LOCATION uses-permission#android.permission.ACCESS_COARSE_LOCATION
ADDED from AndroidManifest.xml:38:5 ADDED from AndroidManifest.xml:48:5
android:name android:name
ADDED from AndroidManifest.xml:38:22 ADDED from AndroidManifest.xml:48:22
uses-permission#android.permission.ACCESS_NETWORK_STATE uses-permission#android.permission.ACCESS_NETWORK_STATE
ADDED from AndroidManifest.xml:39:5 ADDED from AndroidManifest.xml:49:5
android:name android:name
ADDED from AndroidManifest.xml:39:22 ADDED from AndroidManifest.xml:49:22
uses-permission#android.permission.ACCESS_WIFI_STATE uses-permission#android.permission.ACCESS_WIFI_STATE
ADDED from AndroidManifest.xml:40:5 ADDED from AndroidManifest.xml:50:5
android:name android:name
ADDED from AndroidManifest.xml:40:22 ADDED from AndroidManifest.xml:50:22
uses-permission#android.permission.BLUETOOTH uses-permission#android.permission.BLUETOOTH
ADDED from AndroidManifest.xml:41:5 ADDED from AndroidManifest.xml:51:5
android:name android:name
ADDED from AndroidManifest.xml:41:22 ADDED from AndroidManifest.xml:51:22
uses-permission#android.permission.BLUETOOTH_ADMIN uses-permission#android.permission.BLUETOOTH_ADMIN
ADDED from AndroidManifest.xml:42:5 ADDED from AndroidManifest.xml:52:5
android:name android:name
ADDED from AndroidManifest.xml:42:22 ADDED from AndroidManifest.xml:52:22
uses-permission#android.permission.CALL_PHONE uses-permission#android.permission.CALL_PHONE
ADDED from AndroidManifest.xml:43:5 ADDED from AndroidManifest.xml:53:5
android:name android:name
ADDED from AndroidManifest.xml:43:22 ADDED from AndroidManifest.xml:53:22
uses-permission#android.permission.INTERNET uses-permission#android.permission.INTERNET
ADDED from AndroidManifest.xml:44:5 ADDED from AndroidManifest.xml:54:5
android:name android:name
ADDED from AndroidManifest.xml:44:22 ADDED from AndroidManifest.xml:54:22
uses-permission#android.permission.SEND_SMS uses-permission#android.permission.SEND_SMS
ADDED from AndroidManifest.xml:45:5 ADDED from AndroidManifest.xml:55:5
android:name android:name
ADDED from AndroidManifest.xml:45:22 ADDED from AndroidManifest.xml:55:22
uses-permission#android.permission.WRITE_EXTERNAL_STORAGE uses-permission#android.permission.WRITE_EXTERNAL_STORAGE
ADDED from AndroidManifest.xml:46:5 ADDED from AndroidManifest.xml:56:5
android:name android:name
ADDED from AndroidManifest.xml:46:22 ADDED from AndroidManifest.xml:56:22