Skip to content

Commit 06cb1a1

Browse files
tibbitibbi
committed
require the Camera permission only below Android 7
1 parent 27c651c commit 06cb1a1

File tree

1 file changed

+58
-56
lines changed

1 file changed

+58
-56
lines changed

‎app/src/main/AndroidManifest.xml‎

Lines changed: 58 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,22 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<manifest
3-
xmlns:android="http://schemas.android.com/apk/res/android"
2+
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
43
xmlns:tools="http://schemas.android.com/tools"
54
package="com.simplemobiletools.flashlight"
65
android:installLocation="auto">
76

8-
<uses-permission android:name="android.permission.CAMERA"/>
9-
<uses-permission android:name="android.permission.FLASHLIGHT"/>
7+
<uses-permission
8+
android:name="android.permission.CAMERA"
9+
android:maxSdkVersion="23" />
10+
11+
<uses-permission android:name="android.permission.FLASHLIGHT" />
1012

1113
<uses-permission
1214
android:name="android.permission.USE_FINGERPRINT"
13-
tools:node="remove"/>
15+
tools:node="remove" />
1416

1517
<uses-feature
1618
android:name="android.hardware.camera.flash"
17-
android:required="true"/>
19+
android:required="true" />
1820

1921
<application
2022
android:name=".App"
@@ -29,63 +31,63 @@
2931
android:name=".activities.SplashActivity"
3032
android:theme="@style/SplashTheme">
3133
<intent-filter>
32-
<action android:name="android.service.quicksettings.action.QS_TILE_PREFERENCES"/>
34+
<action android:name="android.service.quicksettings.action.QS_TILE_PREFERENCES" />
3335
</intent-filter>
3436
</activity>
3537

3638
<activity
3739
android:name=".activities.MainActivity"
38-
android:theme="@style/AppTheme"/>
40+
android:theme="@style/AppTheme" />
3941

4042
<activity
4143
android:name=".activities.WidgetConfigureActivity"
4244
android:screenOrientation="portrait"
4345
android:theme="@style/MyWidgetConfigTheme">
4446
<intent-filter>
45-
<action android:name="android.appwidget.action.APPWIDGET_CONFIGURE"/>
47+
<action android:name="android.appwidget.action.APPWIDGET_CONFIGURE" />
4648
</intent-filter>
4749
</activity>
4850

4951
<activity
5052
android:name=".activities.BrightDisplayActivity"
5153
android:label="@string/bright_display"
52-
android:theme="@style/FullScreenTheme"/>
54+
android:theme="@style/FullScreenTheme" />
5355

5456
<activity
5557
android:name=".activities.SettingsActivity"
5658
android:label="@string/settings"
57-
android:parentActivityName=".activities.MainActivity"/>
59+
android:parentActivityName=".activities.MainActivity" />
5860

5961
<activity
6062
android:name="com.simplemobiletools.commons.activities.AboutActivity"
6163
android:label="@string/about"
62-
android:parentActivityName=".activities.MainActivity"/>
64+
android:parentActivityName=".activities.MainActivity" />
6365

6466
<activity
6567
android:name="com.simplemobiletools.commons.activities.LicenseActivity"
6668
android:label="@string/third_party_licences"
67-
android:parentActivityName="com.simplemobiletools.commons.activities.AboutActivity"/>
69+
android:parentActivityName="com.simplemobiletools.commons.activities.AboutActivity" />
6870

6971
<activity
7072
android:name="com.simplemobiletools.commons.activities.CustomizationActivity"
7173
android:label="@string/customize_colors"
72-
android:parentActivityName=".activities.SettingsActivity"/>
74+
android:parentActivityName=".activities.SettingsActivity" />
7375

7476
<activity
7577
android:name="com.simplemobiletools.commons.activities.FAQActivity"
7678
android:label="@string/frequently_asked_questions"
77-
android:parentActivityName="com.simplemobiletools.commons.activities.AboutActivity"/>
79+
android:parentActivityName="com.simplemobiletools.commons.activities.AboutActivity" />
7880

7981
<receiver
8082
android:name=".helpers.MyWidgetProvider"
8183
android:icon="@drawable/ic_flashlight">
8284
<intent-filter>
83-
<action android:name="android.appwidget.action.APPWIDGET_UPDATE"/>
85+
<action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
8486
</intent-filter>
8587

8688
<meta-data
8789
android:name="android.appwidget.provider"
88-
android:resource="@xml/widget_info"/>
90+
android:resource="@xml/widget_info" />
8991
</receiver>
9092

9193
<service
@@ -94,7 +96,7 @@
9496
android:label="@string/app_launcher_name"
9597
android:permission="android.permission.BIND_QUICK_SETTINGS_TILE">
9698
<intent-filter>
97-
<action android:name="android.service.quicksettings.action.QS_TILE"/>
99+
<action android:name="android.service.quicksettings.action.QS_TILE" />
98100
</intent-filter>
99101
</service>
100102

@@ -106,8 +108,8 @@
106108
android:targetActivity=".activities.SplashActivity">
107109

108110
<intent-filter>
109-
<action android:name="android.intent.action.MAIN"/>
110-
<category android:name="android.intent.category.LAUNCHER"/>
111+
<action android:name="android.intent.action.MAIN" />
112+
<category android:name="android.intent.category.LAUNCHER" />
111113
</intent-filter>
112114
</activity-alias>
113115

@@ -119,8 +121,8 @@
119121
android:targetActivity=".activities.SplashActivity">
120122

121123
<intent-filter>
122-
<action android:name="android.intent.action.MAIN"/>
123-
<category android:name="android.intent.category.LAUNCHER"/>
124+
<action android:name="android.intent.action.MAIN" />
125+
<category android:name="android.intent.category.LAUNCHER" />
124126
</intent-filter>
125127
</activity-alias>
126128

@@ -132,8 +134,8 @@
132134
android:targetActivity=".activities.SplashActivity">
133135

134136
<intent-filter>
135-
<action android:name="android.intent.action.MAIN"/>
136-
<category android:name="android.intent.category.LAUNCHER"/>
137+
<action android:name="android.intent.action.MAIN" />
138+
<category android:name="android.intent.category.LAUNCHER" />
137139
</intent-filter>
138140
</activity-alias>
139141

@@ -145,8 +147,8 @@
145147
android:targetActivity=".activities.SplashActivity">
146148

147149
<intent-filter>
148-
<action android:name="android.intent.action.MAIN"/>
149-
<category android:name="android.intent.category.LAUNCHER"/>
150+
<action android:name="android.intent.action.MAIN" />
151+
<category android:name="android.intent.category.LAUNCHER" />
150152
</intent-filter>
151153
</activity-alias>
152154

@@ -158,8 +160,8 @@
158160
android:targetActivity=".activities.SplashActivity">
159161

160162
<intent-filter>
161-
<action android:name="android.intent.action.MAIN"/>
162-
<category android:name="android.intent.category.LAUNCHER"/>
163+
<action android:name="android.intent.action.MAIN" />
164+
<category android:name="android.intent.category.LAUNCHER" />
163165
</intent-filter>
164166
</activity-alias>
165167

@@ -171,8 +173,8 @@
171173
android:targetActivity=".activities.SplashActivity">
172174

173175
<intent-filter>
174-
<action android:name="android.intent.action.MAIN"/>
175-
<category android:name="android.intent.category.LAUNCHER"/>
176+
<action android:name="android.intent.action.MAIN" />
177+
<category android:name="android.intent.category.LAUNCHER" />
176178
</intent-filter>
177179
</activity-alias>
178180

@@ -184,8 +186,8 @@
184186
android:targetActivity=".activities.SplashActivity">
185187

186188
<intent-filter>
187-
<action android:name="android.intent.action.MAIN"/>
188-
<category android:name="android.intent.category.LAUNCHER"/>
189+
<action android:name="android.intent.action.MAIN" />
190+
<category android:name="android.intent.category.LAUNCHER" />
189191
</intent-filter>
190192
</activity-alias>
191193

@@ -197,8 +199,8 @@
197199
android:targetActivity=".activities.SplashActivity">
198200

199201
<intent-filter>
200-
<action android:name="android.intent.action.MAIN"/>
201-
<category android:name="android.intent.category.LAUNCHER"/>
202+
<action android:name="android.intent.action.MAIN" />
203+
<category android:name="android.intent.category.LAUNCHER" />
202204
</intent-filter>
203205
</activity-alias>
204206

@@ -210,8 +212,8 @@
210212
android:targetActivity=".activities.SplashActivity">
211213

212214
<intent-filter>
213-
<action android:name="android.intent.action.MAIN"/>
214-
<category android:name="android.intent.category.LAUNCHER"/>
215+
<action android:name="android.intent.action.MAIN" />
216+
<category android:name="android.intent.category.LAUNCHER" />
215217
</intent-filter>
216218
</activity-alias>
217219

@@ -223,8 +225,8 @@
223225
android:targetActivity=".activities.SplashActivity">
224226

225227
<intent-filter>
226-
<action android:name="android.intent.action.MAIN"/>
227-
<category android:name="android.intent.category.LAUNCHER"/>
228+
<action android:name="android.intent.action.MAIN" />
229+
<category android:name="android.intent.category.LAUNCHER" />
228230
</intent-filter>
229231
</activity-alias>
230232

@@ -236,8 +238,8 @@
236238
android:targetActivity=".activities.SplashActivity">
237239

238240
<intent-filter>
239-
<action android:name="android.intent.action.MAIN"/>
240-
<category android:name="android.intent.category.LAUNCHER"/>
241+
<action android:name="android.intent.action.MAIN" />
242+
<category android:name="android.intent.category.LAUNCHER" />
241243
</intent-filter>
242244
</activity-alias>
243245

@@ -249,8 +251,8 @@
249251
android:targetActivity=".activities.SplashActivity">
250252

251253
<intent-filter>
252-
<action android:name="android.intent.action.MAIN"/>
253-
<category android:name="android.intent.category.LAUNCHER"/>
254+
<action android:name="android.intent.action.MAIN" />
255+
<category android:name="android.intent.category.LAUNCHER" />
254256
</intent-filter>
255257
</activity-alias>
256258

@@ -262,8 +264,8 @@
262264
android:targetActivity=".activities.SplashActivity">
263265

264266
<intent-filter>
265-
<action android:name="android.intent.action.MAIN"/>
266-
<category android:name="android.intent.category.LAUNCHER"/>
267+
<action android:name="android.intent.action.MAIN" />
268+
<category android:name="android.intent.category.LAUNCHER" />
267269
</intent-filter>
268270
</activity-alias>
269271

@@ -275,8 +277,8 @@
275277
android:targetActivity=".activities.SplashActivity">
276278

277279
<intent-filter>
278-
<action android:name="android.intent.action.MAIN"/>
279-
<category android:name="android.intent.category.LAUNCHER"/>
280+
<action android:name="android.intent.action.MAIN" />
281+
<category android:name="android.intent.category.LAUNCHER" />
280282
</intent-filter>
281283
</activity-alias>
282284

@@ -287,8 +289,8 @@
287289
android:roundIcon="@mipmap/ic_launcher"
288290
android:targetActivity=".activities.SplashActivity">
289291
<intent-filter>
290-
<action android:name="android.intent.action.MAIN"/>
291-
<category android:name="android.intent.category.LAUNCHER"/>
292+
<action android:name="android.intent.action.MAIN" />
293+
<category android:name="android.intent.category.LAUNCHER" />
292294
</intent-filter>
293295
</activity-alias>
294296

@@ -300,8 +302,8 @@
300302
android:targetActivity=".activities.SplashActivity">
301303

302304
<intent-filter>
303-
<action android:name="android.intent.action.MAIN"/>
304-
<category android:name="android.intent.category.LAUNCHER"/>
305+
<action android:name="android.intent.action.MAIN" />
306+
<category android:name="android.intent.category.LAUNCHER" />
305307
</intent-filter>
306308
</activity-alias>
307309

@@ -313,8 +315,8 @@
313315
android:targetActivity=".activities.SplashActivity">
314316

315317
<intent-filter>
316-
<action android:name="android.intent.action.MAIN"/>
317-
<category android:name="android.intent.category.LAUNCHER"/>
318+
<action android:name="android.intent.action.MAIN" />
319+
<category android:name="android.intent.category.LAUNCHER" />
318320
</intent-filter>
319321
</activity-alias>
320322

@@ -326,8 +328,8 @@
326328
android:targetActivity=".activities.SplashActivity">
327329

328330
<intent-filter>
329-
<action android:name="android.intent.action.MAIN"/>
330-
<category android:name="android.intent.category.LAUNCHER"/>
331+
<action android:name="android.intent.action.MAIN" />
332+
<category android:name="android.intent.category.LAUNCHER" />
331333
</intent-filter>
332334
</activity-alias>
333335

@@ -339,8 +341,8 @@
339341
android:targetActivity=".activities.SplashActivity">
340342

341343
<intent-filter>
342-
<action android:name="android.intent.action.MAIN"/>
343-
<category android:name="android.intent.category.LAUNCHER"/>
344+
<action android:name="android.intent.action.MAIN" />
345+
<category android:name="android.intent.category.LAUNCHER" />
344346
</intent-filter>
345347
</activity-alias>
346348
</application>

0 commit comments

Comments
 (0)