UeControl Build 33

This commit is contained in:
Ziver Koc 2015-02-04 17:42:56 +01:00
parent d21697a31a
commit 8379e3f3e7
3 changed files with 115 additions and 2 deletions

Binary file not shown.

View file

@ -8,8 +8,8 @@ android {
applicationId "com.ericsson.uecontrol"
minSdkVersion 15
targetSdkVersion 19
versionCode 33
versionName "1.0.33"
versionCode 34
versionName "1.0.34"
}
buildTypes {
release {

View file

@ -0,0 +1,113 @@
-- Merging decision tree log ---
manifest
ADDED from AndroidManifest.xml:2:1
xmlns:android
ADDED from AndroidManifest.xml:2:11
package
ADDED from AndroidManifest.xml:3:5
INJECTED from AndroidManifest.xml:0:0
INJECTED from AndroidManifest.xml:0:0
android:versionName
INJECTED from AndroidManifest.xml:0:0
INJECTED from AndroidManifest.xml:0:0
android:versionCode
INJECTED from AndroidManifest.xml:0:0
INJECTED from AndroidManifest.xml:0:0
application
ADDED from AndroidManifest.xml:5:5
MERGED from com.android.support:support-v4:21.0.0:16:5
android:label
ADDED from AndroidManifest.xml:8:9
android:allowBackup
ADDED from AndroidManifest.xml:6:9
android:icon
ADDED from AndroidManifest.xml:7:9
android:theme
ADDED from AndroidManifest.xml:9:9
activity#com.ericsson.uecontrol.gui.MainActivity
ADDED from AndroidManifest.xml:10:9
android:label
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
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
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
activity#com.ericsson.uecontrol.gui.EditActivity
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
android:label
ADDED from AndroidManifest.xml:31:13
android:name
ADDED from AndroidManifest.xml:30:13
uses-sdk
ADDED from AndroidManifest.xml:35:5
MERGED from com.android.support:support-v4:21.0.0:15:5
android:targetSdkVersion
ADDED from AndroidManifest.xml:36:9
INJECTED from AndroidManifest.xml:0:0
INJECTED from AndroidManifest.xml:0:0
android:minSdkVersion
ADDED from AndroidManifest.xml:35: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
android:name
ADDED from AndroidManifest.xml:38:22
uses-permission#android.permission.ACCESS_NETWORK_STATE
ADDED from AndroidManifest.xml:39:5
android:name
ADDED from AndroidManifest.xml:39:22
uses-permission#android.permission.ACCESS_WIFI_STATE
ADDED from AndroidManifest.xml:40:5
android:name
ADDED from AndroidManifest.xml:40:22
uses-permission#android.permission.BLUETOOTH
ADDED from AndroidManifest.xml:41:5
android:name
ADDED from AndroidManifest.xml:41:22
uses-permission#android.permission.BLUETOOTH_ADMIN
ADDED from AndroidManifest.xml:42:5
android:name
ADDED from AndroidManifest.xml:42:22
uses-permission#android.permission.CALL_PHONE
ADDED from AndroidManifest.xml:43:5
android:name
ADDED from AndroidManifest.xml:43:22
uses-permission#android.permission.INTERNET
ADDED from AndroidManifest.xml:44:5
android:name
ADDED from AndroidManifest.xml:44:22
uses-permission#android.permission.SEND_SMS
ADDED from AndroidManifest.xml:45:5
android:name
ADDED from AndroidManifest.xml:45:22
uses-permission#android.permission.WRITE_EXTERNAL_STORAGE
ADDED from AndroidManifest.xml:46:5
android:name
ADDED from AndroidManifest.xml:46:22