Skip to content

Commit dc7da88

Browse files
author
user1
committed
treed
1 parent 75b7b15 commit dc7da88

40 files changed

+1189
-266
lines changed

‎app/app-release.apk

34.3 KB
Binary file not shown.

‎app/app.iml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,12 +86,14 @@
8686
<orderEntry type="library" exported="" name="umeng_social_sdk" level="project" />
8787
<orderEntry type="library" exported="" name="lib-core-slh-3.1.0" level="project" />
8888
<orderEntry type="library" exported="" name="nineoldandroids-2.4.0" level="project" />
89+
<orderEntry type="library" exported="" name="library-1.0.0" level="project" />
8990
<orderEntry type="library" exported="" name="support-v4-21.0.3" level="project" />
9091
<orderEntry type="library" exported="" name="lib-manipulation-3.1.0" level="project" />
9192
<orderEntry type="library" exported="" name="SocialSDK_QQZone_1" level="project" />
9293
<orderEntry type="library" exported="" name="SocialSDK_QQZone_2" level="project" />
9394
<orderEntry type="library" exported="" name="analytics-5.4.1" level="project" />
9495
<orderEntry type="library" exported="" name="SocialSDK_QQZone_3" level="project" />
96+
<orderEntry type="library" exported="" name="library-circular-1.0.0" level="project" />
9597
<orderEntry type="library" exported="" name="umeng-update-v2.5.0" level="project" />
9698
<orderEntry type="library" exported="" name="httpmime-4.1.3" level="project" />
9799
<orderEntry type="library" exported="" name="library-1.5.2" level="project" />

‎app/build.gradle

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ android {
88
applicationId "com.yzy.supercleanmaster"
99
minSdkVersion 14
1010
targetSdkVersion 21
11-
versionCode 1
12-
versionName "1.0"
11+
versionCode 2
12+
versionName "0.8"
1313
}
1414
buildTypes {
1515
release {
@@ -28,6 +28,8 @@ dependencies {
2828
compile 'com.nhaarman.listviewanimations:lib-core-slh:3.1.0@aar'
2929
compile 'com.umeng.analytics:analytics:latest.integration'
3030
compile 'com.github.gabrielemariotti.changeloglib:library:1.5.2'
31+
compile 'com.hannesdorfmann.smoothprogressbar:library:1.0.0'
32+
compile 'com.github.castorflex.smoothprogressbar:library-circular:1.0.0'
3133
compile project(':library')
3234
compile files('libs/nineoldandroids-2.4.0.jar')
3335
compile files('libs/umeng-update-v2.5.0.jar')

‎app/manifest-merger-release-report.txt

Lines changed: 110 additions & 100 deletions
Original file line numberDiff line numberDiff line change
@@ -105,207 +105,217 @@ MERGED from superCleanMaster:library:unspecified:11:5
105105
MERGED from com.android.support:recyclerview-v7:21.0.3:17:5
106106
MERGED from com.android.support:support-v4:21.0.3:16:5
107107
android:label
108-
ADDED from AndroidManifest.xml:39:9
108+
ADDED from AndroidManifest.xml:40:9
109109
android:allowBackup
110-
ADDED from AndroidManifest.xml:37:9
111-
android:icon
112110
ADDED from AndroidManifest.xml:38:9
111+
android:icon
112+
ADDED from AndroidManifest.xml:39:9
113113
android:theme
114-
ADDED from AndroidManifest.xml:40:9
114+
ADDED from AndroidManifest.xml:41:9
115+
android:name
116+
ADDED from AndroidManifest.xml:37:9
115117
activity#com.yzy.supercleanmaster.ui.SplishActivity
116-
ADDED from AndroidManifest.xml:41:9
118+
ADDED from AndroidManifest.xml:42:9
117119
android:screenOrientation
118-
ADDED from AndroidManifest.xml:44:13
120+
ADDED from AndroidManifest.xml:45:13
119121
android:label
120-
ADDED from AndroidManifest.xml:43:13
122+
ADDED from AndroidManifest.xml:44:13
121123
android:theme
122-
ADDED from AndroidManifest.xml:45:13
124+
ADDED from AndroidManifest.xml:46:13
123125
android:name
124-
ADDED from AndroidManifest.xml:42:13
126+
ADDED from AndroidManifest.xml:43:13
125127
intent-filter#android.intent.action.MAIN+android.intent.category.LAUNCHER
126-
ADDED from AndroidManifest.xml:46:13
128+
ADDED from AndroidManifest.xml:47:13
127129
action#android.intent.action.MAIN
128-
ADDED from AndroidManifest.xml:47:17
130+
ADDED from AndroidManifest.xml:48:17
129131
android:name
130-
ADDED from AndroidManifest.xml:47:25
132+
ADDED from AndroidManifest.xml:48:25
131133
category#android.intent.category.LAUNCHER
132-
ADDED from AndroidManifest.xml:49:17
134+
ADDED from AndroidManifest.xml:50:17
133135
android:name
134-
ADDED from AndroidManifest.xml:49:27
136+
ADDED from AndroidManifest.xml:50:27
135137
activity#com.yzy.supercleanmaster.ui.MainActivity
136-
ADDED from AndroidManifest.xml:52:9
138+
ADDED from AndroidManifest.xml:53:9
137139
android:screenOrientation
138-
ADDED from AndroidManifest.xml:53:13
140+
ADDED from AndroidManifest.xml:54:13
139141
android:label
140-
ADDED from AndroidManifest.xml:55:13
141-
android:theme
142142
ADDED from AndroidManifest.xml:56:13
143+
android:theme
144+
ADDED from AndroidManifest.xml:57:13
143145
android:name
144-
ADDED from AndroidManifest.xml:54:13
146+
ADDED from AndroidManifest.xml:55:13
145147
activity#com.yzy.supercleanmaster.ui.ShortCutActivity
146-
ADDED from AndroidManifest.xml:57:9
148+
ADDED from AndroidManifest.xml:58:9
147149
android:screenOrientation
148-
ADDED from AndroidManifest.xml:58:13
150+
ADDED from AndroidManifest.xml:59:13
149151
android:label
150-
ADDED from AndroidManifest.xml:62:13
152+
ADDED from AndroidManifest.xml:63:13
151153
android:theme
152-
ADDED from AndroidManifest.xml:64:13
154+
ADDED from AndroidManifest.xml:65:13
153155
android:exported
154-
ADDED from AndroidManifest.xml:61:13
156+
ADDED from AndroidManifest.xml:62:13
155157
android:excludeFromRecents
156-
ADDED from AndroidManifest.xml:60:13
158+
ADDED from AndroidManifest.xml:61:13
157159
android:taskAffinity
158-
ADDED from AndroidManifest.xml:63:13
160+
ADDED from AndroidManifest.xml:64:13
159161
android:name
160-
ADDED from AndroidManifest.xml:59:13
162+
ADDED from AndroidManifest.xml:60:13
161163
intent-filter#android.intent.category.DEFAULT+com.yzy.shortcut
162-
ADDED from AndroidManifest.xml:65:13
164+
ADDED from AndroidManifest.xml:66:13
163165
action#com.yzy.shortcut
164-
ADDED from AndroidManifest.xml:66:17
166+
ADDED from AndroidManifest.xml:67:17
165167
android:name
166-
ADDED from AndroidManifest.xml:66:25
168+
ADDED from AndroidManifest.xml:67:25
167169
category#android.intent.category.DEFAULT
168-
ADDED from AndroidManifest.xml:67:17
170+
ADDED from AndroidManifest.xml:68:17
169171
android:name
170-
ADDED from AndroidManifest.xml:67:27
172+
ADDED from AndroidManifest.xml:68:27
171173
activity#com.yzy.supercleanmaster.ui.MemoryCleanActivity
172-
ADDED from AndroidManifest.xml:70:9
174+
ADDED from AndroidManifest.xml:71:9
173175
android:screenOrientation
174-
ADDED from AndroidManifest.xml:71:13
176+
ADDED from AndroidManifest.xml:72:13
175177
android:label
176-
ADDED from AndroidManifest.xml:73:13
177-
android:theme
178178
ADDED from AndroidManifest.xml:74:13
179+
android:theme
180+
ADDED from AndroidManifest.xml:75:13
179181
android:name
180-
ADDED from AndroidManifest.xml:72:13
182+
ADDED from AndroidManifest.xml:73:13
181183
activity#com.yzy.supercleanmaster.ui.RubbishCleanActivity
182-
ADDED from AndroidManifest.xml:76:9
184+
ADDED from AndroidManifest.xml:77:9
183185
android:screenOrientation
184-
ADDED from AndroidManifest.xml:77:13
186+
ADDED from AndroidManifest.xml:78:13
185187
android:label
186-
ADDED from AndroidManifest.xml:79:13
187-
android:theme
188188
ADDED from AndroidManifest.xml:80:13
189+
android:theme
190+
ADDED from AndroidManifest.xml:81:13
189191
android:name
190-
ADDED from AndroidManifest.xml:78:13
192+
ADDED from AndroidManifest.xml:79:13
191193
activity#com.yzy.supercleanmaster.ui.AutoStartManageActivity
192-
ADDED from AndroidManifest.xml:82:9
194+
ADDED from AndroidManifest.xml:83:9
193195
android:screenOrientation
194-
ADDED from AndroidManifest.xml:83:13
196+
ADDED from AndroidManifest.xml:84:13
195197
android:label
196-
ADDED from AndroidManifest.xml:85:13
197-
android:theme
198198
ADDED from AndroidManifest.xml:86:13
199+
android:theme
200+
ADDED from AndroidManifest.xml:87:13
199201
android:name
200-
ADDED from AndroidManifest.xml:84:13
202+
ADDED from AndroidManifest.xml:85:13
201203
activity#com.yzy.supercleanmaster.ui.SoftwareManageActivity
202-
ADDED from AndroidManifest.xml:88:9
204+
ADDED from AndroidManifest.xml:89:9
203205
android:screenOrientation
204-
ADDED from AndroidManifest.xml:89:13
206+
ADDED from AndroidManifest.xml:90:13
205207
android:label
206-
ADDED from AndroidManifest.xml:91:13
207-
android:theme
208208
ADDED from AndroidManifest.xml:92:13
209+
android:theme
210+
ADDED from AndroidManifest.xml:93:13
209211
android:name
210-
ADDED from AndroidManifest.xml:90:13
212+
ADDED from AndroidManifest.xml:91:13
211213
activity#com.yzy.supercleanmaster.base.FragmentContainerActivity
212-
ADDED from AndroidManifest.xml:94:9
214+
ADDED from AndroidManifest.xml:95:9
213215
android:screenOrientation
214-
ADDED from AndroidManifest.xml:95:13
216+
ADDED from AndroidManifest.xml:96:13
215217
android:theme
218+
ADDED from AndroidManifest.xml:98:13
219+
android:name
216220
ADDED from AndroidManifest.xml:97:13
221+
activity#com.yzy.supercleanmaster.ui.AboutActivity
222+
ADDED from AndroidManifest.xml:99:9
223+
android:screenOrientation
224+
ADDED from AndroidManifest.xml:100:13
225+
android:theme
226+
ADDED from AndroidManifest.xml:102:13
217227
android:name
218-
ADDED from AndroidManifest.xml:96:13
228+
ADDED from AndroidManifest.xml:101:13
219229
service#com.yzy.supercleanmaster.service.CleanerService
220-
ADDED from AndroidManifest.xml:100:9
230+
ADDED from AndroidManifest.xml:104:9
221231
android:exported
222-
ADDED from AndroidManifest.xml:102:13
232+
ADDED from AndroidManifest.xml:106:13
223233
android:name
224-
ADDED from AndroidManifest.xml:101:13
234+
ADDED from AndroidManifest.xml:105:13
225235
service#com.yzy.supercleanmaster.service.CoreService
226-
ADDED from AndroidManifest.xml:103:9
236+
ADDED from AndroidManifest.xml:107:9
227237
android:exported
228-
ADDED from AndroidManifest.xml:105:13
238+
ADDED from AndroidManifest.xml:109:13
229239
android:name
230-
ADDED from AndroidManifest.xml:104:13
240+
ADDED from AndroidManifest.xml:108:13
231241
receiver#com.yzy.supercleanmaster.receiver.BootCompleteReceiver
232-
ADDED from AndroidManifest.xml:107:9
242+
ADDED from AndroidManifest.xml:111:9
233243
android:name
234-
ADDED from AndroidManifest.xml:107:19
244+
ADDED from AndroidManifest.xml:111:19
235245
intent-filter#android.intent.action.BOOT_COMPLETED
236-
ADDED from AndroidManifest.xml:108:13
246+
ADDED from AndroidManifest.xml:112:13
237247
action#android.intent.action.BOOT_COMPLETED
238-
ADDED from AndroidManifest.xml:109:17
248+
ADDED from AndroidManifest.xml:113:17
239249
android:name
240-
ADDED from AndroidManifest.xml:109:25
250+
ADDED from AndroidManifest.xml:113:25
241251
meta-data#UMENG_APPKEY
242-
ADDED from AndroidManifest.xml:117:9
252+
ADDED from AndroidManifest.xml:121:9
243253
android:name
244-
ADDED from AndroidManifest.xml:117:61
254+
ADDED from AndroidManifest.xml:121:61
245255
android:value
246-
ADDED from AndroidManifest.xml:117:20
256+
ADDED from AndroidManifest.xml:121:20
247257
meta-data#UMENG_CHANNEL
248-
ADDED from AndroidManifest.xml:118:9
258+
ADDED from AndroidManifest.xml:122:9
249259
android:name
250-
ADDED from AndroidManifest.xml:118:47
260+
ADDED from AndroidManifest.xml:122:47
251261
android:value
252-
ADDED from AndroidManifest.xml:118:20
262+
ADDED from AndroidManifest.xml:122:20
253263
service#com.umeng.update.net.DownloadingService
254-
ADDED from AndroidManifest.xml:120:9
264+
ADDED from AndroidManifest.xml:124:9
255265
android:process
256-
ADDED from AndroidManifest.xml:122:13
266+
ADDED from AndroidManifest.xml:126:13
257267
android:name
258-
ADDED from AndroidManifest.xml:121:13
268+
ADDED from AndroidManifest.xml:125:13
259269
activity#com.umeng.update.UpdateDialogActivity
260-
ADDED from AndroidManifest.xml:124:9
270+
ADDED from AndroidManifest.xml:128:9
261271
android:theme
262-
ADDED from AndroidManifest.xml:126:13
272+
ADDED from AndroidManifest.xml:130:13
263273
android:name
264-
ADDED from AndroidManifest.xml:125:13
274+
ADDED from AndroidManifest.xml:129:13
265275
activity#com.umeng.socialize.view.ShareActivity
266-
ADDED from AndroidManifest.xml:132:9
276+
ADDED from AndroidManifest.xml:136:9
267277
android:windowSoftInputMode
268-
ADDED from AndroidManifest.xml:138:13
278+
ADDED from AndroidManifest.xml:142:13
269279
android:noHistory
270-
ADDED from AndroidManifest.xml:136:13
280+
ADDED from AndroidManifest.xml:140:13
271281
android:configChanges
272-
ADDED from AndroidManifest.xml:134:13
282+
ADDED from AndroidManifest.xml:138:13
273283
android:theme
274-
ADDED from AndroidManifest.xml:137:13
284+
ADDED from AndroidManifest.xml:141:13
275285
android:name
276-
ADDED from AndroidManifest.xml:133:13
286+
ADDED from AndroidManifest.xml:137:13
277287
android:launchMode
278-
ADDED from AndroidManifest.xml:135:13
288+
ADDED from AndroidManifest.xml:139:13
279289
activity#com.tencent.tauth.AuthActivity
280-
ADDED from AndroidManifest.xml:145:9
290+
ADDED from AndroidManifest.xml:149:9
281291
android:noHistory
282-
ADDED from AndroidManifest.xml:148:13
292+
ADDED from AndroidManifest.xml:152:13
283293
android:name
284-
ADDED from AndroidManifest.xml:146:13
294+
ADDED from AndroidManifest.xml:150:13
285295
android:launchMode
286-
ADDED from AndroidManifest.xml:147:13
296+
ADDED from AndroidManifest.xml:151:13
287297
intent-filter#android.intent.action.VIEW+android.intent.category.BROWSABLE+android.intent.category.DEFAULT
288-
ADDED from AndroidManifest.xml:149:13
298+
ADDED from AndroidManifest.xml:153:13
289299
action#android.intent.action.VIEW
290-
ADDED from AndroidManifest.xml:150:17
300+
ADDED from AndroidManifest.xml:154:17
291301
android:name
292-
ADDED from AndroidManifest.xml:150:25
302+
ADDED from AndroidManifest.xml:154:25
293303
category#android.intent.category.BROWSABLE
294-
ADDED from AndroidManifest.xml:153:17
304+
ADDED from AndroidManifest.xml:157:17
295305
android:name
296-
ADDED from AndroidManifest.xml:153:27
306+
ADDED from AndroidManifest.xml:157:27
297307
data
298-
ADDED from AndroidManifest.xml:155:17
308+
ADDED from AndroidManifest.xml:159:17
299309
android:scheme
300-
ADDED from AndroidManifest.xml:155:23
310+
ADDED from AndroidManifest.xml:159:23
301311
activity#com.tencent.connect.common.AssistActivity
302-
ADDED from AndroidManifest.xml:158:9
312+
ADDED from AndroidManifest.xml:162:9
303313
android:screenOrientation
304-
ADDED from AndroidManifest.xml:160:13
314+
ADDED from AndroidManifest.xml:164:13
305315
android:theme
306-
ADDED from AndroidManifest.xml:159:13
316+
ADDED from AndroidManifest.xml:163:13
307317
android:name
308-
ADDED from AndroidManifest.xml:158:19
318+
ADDED from AndroidManifest.xml:162:19
309319
uses-sdk
310320
INJECTED from AndroidManifest.xml:0:0 reason: use-sdk injection requested
311321
MERGED from com.android.support:appcompat-v7:21.0.3:15:5

‎app/src/main/AndroidManifest.xml

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,7 @@
1818
<uses-permission android:name="android.permission.INTERNET" />
1919
<uses-permission android:name="android.permission.WAKE_LOCK" />
2020
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
21-
<uses-permission android:name="android.permission.READ_PHONE_STATE"></uses-permission>
22-
23-
24-
25-
26-
27-
28-
21+
<uses-permission android:name="android.permission.READ_PHONE_STATE"/>
2922
<supports-screens
3023
android:anyDensity="true"
3124
android:largeScreens="true"
@@ -34,6 +27,7 @@
3427
android:smallScreens="true" />
3528

3629
<application
30+
android:name=".base.BaseApplication"
3731
android:allowBackup="true"
3832
android:icon="@drawable/app_icon"
3933
android:label="@string/app_name"
@@ -95,7 +89,10 @@
9589
android:screenOrientation="portrait"
9690
android:name=".base.FragmentContainerActivity"
9791
android:theme="@style/MyTranslucentAppTheme"></activity>
98-
92+
<activity
93+
android:screenOrientation="portrait"
94+
android:name=".ui.AboutActivity"
95+
android:theme="@style/MyTranslucentAppTheme"></activity>
9996

10097
<service
10198
android:name=".service.CleanerService"

‎app/src/main/java/com/ikimuhendis/ldrawer/ActionBarDrawerToggle.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ protected void setActionBarUpIndicator() {
132132
setHomeAsUpIndicator.invoke(mActivity.getActionBar(), mDrawerImage);
133133
return;
134134
} catch (Exception e) {
135-
Log.e(TAG, "setActionBarUpIndicator error", e);
135+
// Log.e(TAG, "setActionBarUpIndicator error", e);
136136
}
137137

138138
final View home = mActivity.findViewById(android.R.id.home);

0 commit comments

Comments
 (0)