tree3

Author: user1

app/app-release.apk

@@ -8,8 +8,8 @@ android {
         applicationId "com.yzy.supercleanmaster"
         minSdkVersion 14
         targetSdkVersion 21
-        versionCode 2
-        versionName "0.8"
+        versionCode 3
+        versionName "1.0"
     }
     buildTypes {
         release {

app/build.gradle

@@ -82,240 +82,242 @@ ADDED from AndroidManifest.xml:21:5
 	android:name
 		ADDED from AndroidManifest.xml:21:22
 supports-screens
-ADDED from AndroidManifest.xml:29:5
+ADDED from AndroidManifest.xml:22:5
 	android:resizeable
-		ADDED from AndroidManifest.xml:33:9
+		ADDED from AndroidManifest.xml:26:9
 	android:largeScreens
-		ADDED from AndroidManifest.xml:31:9
+		ADDED from AndroidManifest.xml:24:9
 	android:anyDensity
-		ADDED from AndroidManifest.xml:30:9
+		ADDED from AndroidManifest.xml:23:9
 	android:normalScreens
-		ADDED from AndroidManifest.xml:32:9
+		ADDED from AndroidManifest.xml:25:9
 	android:smallScreens
-		ADDED from AndroidManifest.xml:34:9
+		ADDED from AndroidManifest.xml:27:9
 application
-ADDED from AndroidManifest.xml:36:5
+ADDED from AndroidManifest.xml:29:5
 MERGED from com.android.support:appcompat-v7:21.0.3:16:5
 MERGED from com.android.support:support-v4:21.0.3:16:5
 MERGED from com.nhaarman.listviewanimations:lib-core:3.1.0:26:5
 MERGED from com.nhaarman.listviewanimations:lib-manipulation:3.1.0:26:5
 MERGED from com.nhaarman.listviewanimations:lib-core-slh:3.1.0:26:5
 MERGED from com.github.gabrielemariotti.changeloglib:library:1.5.2:11:5
+MERGED from com.hannesdorfmann.smoothprogressbar:library:1.0.0:12:5
+MERGED from com.github.castorflex.smoothprogressbar:library-circular:1.0.0:12:5
 MERGED from superCleanMaster:library:unspecified:11:5
 MERGED from com.android.support:recyclerview-v7:21.0.3:17:5
 MERGED from com.android.support:support-v4:21.0.3:16:5
 	android:label
-		ADDED from AndroidManifest.xml:40:9
+		ADDED from AndroidManifest.xml:33:9
 	android:allowBackup
-		ADDED from AndroidManifest.xml:38:9
+		ADDED from AndroidManifest.xml:31:9
 	android:icon
-		ADDED from AndroidManifest.xml:39:9
+		ADDED from AndroidManifest.xml:32:9
 	android:theme
-		ADDED from AndroidManifest.xml:41:9
+		ADDED from AndroidManifest.xml:34:9
 	android:name
-		ADDED from AndroidManifest.xml:37:9
+		ADDED from AndroidManifest.xml:30:9
 activity#com.yzy.supercleanmaster.ui.SplishActivity
-ADDED from AndroidManifest.xml:42:9
+ADDED from AndroidManifest.xml:35:9
 	android:screenOrientation
-		ADDED from AndroidManifest.xml:45:13
+		ADDED from AndroidManifest.xml:38:13
 	android:label
-		ADDED from AndroidManifest.xml:44:13
+		ADDED from AndroidManifest.xml:37:13
 	android:theme
-		ADDED from AndroidManifest.xml:46:13
+		ADDED from AndroidManifest.xml:39:13
 	android:name
-		ADDED from AndroidManifest.xml:43:13
+		ADDED from AndroidManifest.xml:36:13
 intent-filter#android.intent.action.MAIN+android.intent.category.LAUNCHER
-ADDED from AndroidManifest.xml:47:13
+ADDED from AndroidManifest.xml:40:13
 action#android.intent.action.MAIN
-ADDED from AndroidManifest.xml:48:17
+ADDED from AndroidManifest.xml:41:17
 	android:name
-		ADDED from AndroidManifest.xml:48:25
+		ADDED from AndroidManifest.xml:41:25
 category#android.intent.category.LAUNCHER
-ADDED from AndroidManifest.xml:50:17
+ADDED from AndroidManifest.xml:43:17
 	android:name
-		ADDED from AndroidManifest.xml:50:27
+		ADDED from AndroidManifest.xml:43:27
 activity#com.yzy.supercleanmaster.ui.MainActivity
-ADDED from AndroidManifest.xml:53:9
+ADDED from AndroidManifest.xml:46:9
 	android:screenOrientation
-		ADDED from AndroidManifest.xml:54:13
+		ADDED from AndroidManifest.xml:47:13
 	android:label
-		ADDED from AndroidManifest.xml:56:13
+		ADDED from AndroidManifest.xml:49:13
 	android:theme
-		ADDED from AndroidManifest.xml:57:13
+		ADDED from AndroidManifest.xml:50:13
 	android:name
-		ADDED from AndroidManifest.xml:55:13
+		ADDED from AndroidManifest.xml:48:13
 activity#com.yzy.supercleanmaster.ui.ShortCutActivity
-ADDED from AndroidManifest.xml:58:9
+ADDED from AndroidManifest.xml:51:9
 	android:screenOrientation
-		ADDED from AndroidManifest.xml:59:13
+		ADDED from AndroidManifest.xml:52:13
 	android:label
-		ADDED from AndroidManifest.xml:63:13
+		ADDED from AndroidManifest.xml:56:13
 	android:theme
-		ADDED from AndroidManifest.xml:65:13
+		ADDED from AndroidManifest.xml:58:13
 	android:exported
-		ADDED from AndroidManifest.xml:62:13
+		ADDED from AndroidManifest.xml:55:13
 	android:excludeFromRecents
-		ADDED from AndroidManifest.xml:61:13
+		ADDED from AndroidManifest.xml:54:13
 	android:taskAffinity
-		ADDED from AndroidManifest.xml:64:13
+		ADDED from AndroidManifest.xml:57:13
 	android:name
-		ADDED from AndroidManifest.xml:60:13
+		ADDED from AndroidManifest.xml:53:13
 intent-filter#android.intent.category.DEFAULT+com.yzy.shortcut
-ADDED from AndroidManifest.xml:66:13
+ADDED from AndroidManifest.xml:59:13
 action#com.yzy.shortcut
-ADDED from AndroidManifest.xml:67:17
+ADDED from AndroidManifest.xml:60:17
 	android:name
-		ADDED from AndroidManifest.xml:67:25
+		ADDED from AndroidManifest.xml:60:25
 category#android.intent.category.DEFAULT
-ADDED from AndroidManifest.xml:68:17
+ADDED from AndroidManifest.xml:61:17
 	android:name
-		ADDED from AndroidManifest.xml:68:27
+		ADDED from AndroidManifest.xml:61:27
 activity#com.yzy.supercleanmaster.ui.MemoryCleanActivity
-ADDED from AndroidManifest.xml:71:9
+ADDED from AndroidManifest.xml:64:9
 	android:screenOrientation
-		ADDED from AndroidManifest.xml:72:13
+		ADDED from AndroidManifest.xml:65:13
 	android:label
-		ADDED from AndroidManifest.xml:74:13
+		ADDED from AndroidManifest.xml:67:13
 	android:theme
-		ADDED from AndroidManifest.xml:75:13
+		ADDED from AndroidManifest.xml:68:13
 	android:name
-		ADDED from AndroidManifest.xml:73:13
+		ADDED from AndroidManifest.xml:66:13
 activity#com.yzy.supercleanmaster.ui.RubbishCleanActivity
-ADDED from AndroidManifest.xml:77:9
+ADDED from AndroidManifest.xml:70:9
 	android:screenOrientation
-		ADDED from AndroidManifest.xml:78:13
+		ADDED from AndroidManifest.xml:71:13
 	android:label
-		ADDED from AndroidManifest.xml:80:13
+		ADDED from AndroidManifest.xml:73:13
 	android:theme
-		ADDED from AndroidManifest.xml:81:13
+		ADDED from AndroidManifest.xml:74:13
 	android:name
-		ADDED from AndroidManifest.xml:79:13
+		ADDED from AndroidManifest.xml:72:13
 activity#com.yzy.supercleanmaster.ui.AutoStartManageActivity
-ADDED from AndroidManifest.xml:83:9
+ADDED from AndroidManifest.xml:76:9
 	android:screenOrientation
-		ADDED from AndroidManifest.xml:84:13
+		ADDED from AndroidManifest.xml:77:13
 	android:label
-		ADDED from AndroidManifest.xml:86:13
+		ADDED from AndroidManifest.xml:79:13
 	android:theme
-		ADDED from AndroidManifest.xml:87:13
+		ADDED from AndroidManifest.xml:80:13
 	android:name
-		ADDED from AndroidManifest.xml:85:13
+		ADDED from AndroidManifest.xml:78:13
 activity#com.yzy.supercleanmaster.ui.SoftwareManageActivity
-ADDED from AndroidManifest.xml:89:9
+ADDED from AndroidManifest.xml:82:9
 	android:screenOrientation
-		ADDED from AndroidManifest.xml:90:13
+		ADDED from AndroidManifest.xml:83:13
 	android:label
-		ADDED from AndroidManifest.xml:92:13
+		ADDED from AndroidManifest.xml:85:13
 	android:theme
-		ADDED from AndroidManifest.xml:93:13
+		ADDED from AndroidManifest.xml:86:13
 	android:name
-		ADDED from AndroidManifest.xml:91:13
+		ADDED from AndroidManifest.xml:84:13
 activity#com.yzy.supercleanmaster.base.FragmentContainerActivity
-ADDED from AndroidManifest.xml:95:9
+ADDED from AndroidManifest.xml:88:9
 	android:screenOrientation
-		ADDED from AndroidManifest.xml:96:13
+		ADDED from AndroidManifest.xml:89:13
 	android:theme
-		ADDED from AndroidManifest.xml:98:13
+		ADDED from AndroidManifest.xml:91:13
 	android:name
-		ADDED from AndroidManifest.xml:97:13
+		ADDED from AndroidManifest.xml:90:13
 activity#com.yzy.supercleanmaster.ui.AboutActivity
-ADDED from AndroidManifest.xml:99:9
+ADDED from AndroidManifest.xml:92:9
 	android:screenOrientation
-		ADDED from AndroidManifest.xml:100:13
+		ADDED from AndroidManifest.xml:93:13
 	android:theme
-		ADDED from AndroidManifest.xml:102:13
+		ADDED from AndroidManifest.xml:95:13
 	android:name
-		ADDED from AndroidManifest.xml:101:13
+		ADDED from AndroidManifest.xml:94:13
 service#com.yzy.supercleanmaster.service.CleanerService
-ADDED from AndroidManifest.xml:104:9
+ADDED from AndroidManifest.xml:97:9
 	android:exported
-		ADDED from AndroidManifest.xml:106:13
+		ADDED from AndroidManifest.xml:99:13
 	android:name
-		ADDED from AndroidManifest.xml:105:13
+		ADDED from AndroidManifest.xml:98:13
 service#com.yzy.supercleanmaster.service.CoreService
-ADDED from AndroidManifest.xml:107:9
+ADDED from AndroidManifest.xml:100:9
 	android:exported
-		ADDED from AndroidManifest.xml:109:13
+		ADDED from AndroidManifest.xml:102:13
 	android:name
-		ADDED from AndroidManifest.xml:108:13
+		ADDED from AndroidManifest.xml:101:13
 receiver#com.yzy.supercleanmaster.receiver.BootCompleteReceiver
-ADDED from AndroidManifest.xml:111:9
+ADDED from AndroidManifest.xml:104:9
 	android:name
-		ADDED from AndroidManifest.xml:111:19
+		ADDED from AndroidManifest.xml:104:19
 intent-filter#android.intent.action.BOOT_COMPLETED
-ADDED from AndroidManifest.xml:112:13
+ADDED from AndroidManifest.xml:105:13
 action#android.intent.action.BOOT_COMPLETED
-ADDED from AndroidManifest.xml:113:17
+ADDED from AndroidManifest.xml:106:17
 	android:name
-		ADDED from AndroidManifest.xml:113:25
+		ADDED from AndroidManifest.xml:106:25
 meta-data#UMENG_APPKEY
-ADDED from AndroidManifest.xml:121:9
+ADDED from AndroidManifest.xml:114:9
 	android:name
-		ADDED from AndroidManifest.xml:121:61
+		ADDED from AndroidManifest.xml:114:61
 	android:value
-		ADDED from AndroidManifest.xml:121:20
+		ADDED from AndroidManifest.xml:114:20
 meta-data#UMENG_CHANNEL
-ADDED from AndroidManifest.xml:122:9
+ADDED from AndroidManifest.xml:115:9
 	android:name
-		ADDED from AndroidManifest.xml:122:47
+		ADDED from AndroidManifest.xml:115:47
 	android:value
-		ADDED from AndroidManifest.xml:122:20
+		ADDED from AndroidManifest.xml:115:20
 service#com.umeng.update.net.DownloadingService
-ADDED from AndroidManifest.xml:124:9
+ADDED from AndroidManifest.xml:117:9
 	android:process
-		ADDED from AndroidManifest.xml:126:13
+		ADDED from AndroidManifest.xml:119:13
 	android:name
-		ADDED from AndroidManifest.xml:125:13
+		ADDED from AndroidManifest.xml:118:13
 activity#com.umeng.update.UpdateDialogActivity
-ADDED from AndroidManifest.xml:128:9
+ADDED from AndroidManifest.xml:121:9
 	android:theme
-		ADDED from AndroidManifest.xml:130:13
+		ADDED from AndroidManifest.xml:123:13
 	android:name
-		ADDED from AndroidManifest.xml:129:13
+		ADDED from AndroidManifest.xml:122:13
 activity#com.umeng.socialize.view.ShareActivity
-ADDED from AndroidManifest.xml:136:9
+ADDED from AndroidManifest.xml:129:9
 	android:windowSoftInputMode
-		ADDED from AndroidManifest.xml:142:13
+		ADDED from AndroidManifest.xml:135:13
 	android:noHistory
-		ADDED from AndroidManifest.xml:140:13
+		ADDED from AndroidManifest.xml:133:13
 	android:configChanges
-		ADDED from AndroidManifest.xml:138:13
+		ADDED from AndroidManifest.xml:131:13
 	android:theme
-		ADDED from AndroidManifest.xml:141:13
+		ADDED from AndroidManifest.xml:134:13
 	android:name
-		ADDED from AndroidManifest.xml:137:13
+		ADDED from AndroidManifest.xml:130:13
 	android:launchMode
-		ADDED from AndroidManifest.xml:139:13
+		ADDED from AndroidManifest.xml:132:13
 activity#com.tencent.tauth.AuthActivity
-ADDED from AndroidManifest.xml:149:9
+ADDED from AndroidManifest.xml:142:9
 	android:noHistory
-		ADDED from AndroidManifest.xml:152:13
+		ADDED from AndroidManifest.xml:145:13
 	android:name
-		ADDED from AndroidManifest.xml:150:13
+		ADDED from AndroidManifest.xml:143:13
 	android:launchMode
-		ADDED from AndroidManifest.xml:151:13
+		ADDED from AndroidManifest.xml:144:13
 intent-filter#android.intent.action.VIEW+android.intent.category.BROWSABLE+android.intent.category.DEFAULT
-ADDED from AndroidManifest.xml:153:13
+ADDED from AndroidManifest.xml:146:13
 action#android.intent.action.VIEW
-ADDED from AndroidManifest.xml:154:17
+ADDED from AndroidManifest.xml:147:17
 	android:name
-		ADDED from AndroidManifest.xml:154:25
+		ADDED from AndroidManifest.xml:147:25
 category#android.intent.category.BROWSABLE
-ADDED from AndroidManifest.xml:157:17
+ADDED from AndroidManifest.xml:150:17
 	android:name
-		ADDED from AndroidManifest.xml:157:27
+		ADDED from AndroidManifest.xml:150:27
 data
-ADDED from AndroidManifest.xml:159:17
+ADDED from AndroidManifest.xml:152:17
 	android:scheme
-		ADDED from AndroidManifest.xml:159:23
+		ADDED from AndroidManifest.xml:152:23
 activity#com.tencent.connect.common.AssistActivity
-ADDED from AndroidManifest.xml:162:9
+ADDED from AndroidManifest.xml:155:9
 	android:screenOrientation
-		ADDED from AndroidManifest.xml:164:13
+		ADDED from AndroidManifest.xml:157:13
 	android:theme
-		ADDED from AndroidManifest.xml:163:13
+		ADDED from AndroidManifest.xml:156:13
 	android:name
-		ADDED from AndroidManifest.xml:162:19
+		ADDED from AndroidManifest.xml:155:19
 uses-sdk
 INJECTED from AndroidManifest.xml:0:0 reason: use-sdk injection requested
 MERGED from com.android.support:appcompat-v7:21.0.3:15:5
@@ -324,6 +326,8 @@ MERGED from com.nhaarman.listviewanimations:lib-core:3.1.0:22:5
 MERGED from com.nhaarman.listviewanimations:lib-manipulation:3.1.0:22:5
 MERGED from com.nhaarman.listviewanimations:lib-core-slh:3.1.0:22:5
 MERGED from com.github.gabrielemariotti.changeloglib:library:1.5.2:7:5
+MERGED from com.hannesdorfmann.smoothprogressbar:library:1.0.0:8:5
+MERGED from com.github.castorflex.smoothprogressbar:library-circular:1.0.0:8:5
 MERGED from superCleanMaster:library:unspecified:7:5
 MERGED from com.android.support:recyclerview-v7:21.0.3:15:5
 MERGED from com.android.support:support-v4:21.0.3:15:5

app/manifest-merger-release-report.txt

@@ -2,6 +2,7 @@
 
 buildscript {
     repositories {
+        maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
         jcenter()
     }
     dependencies {