Skip to content

Commit 4e87e80

Browse files
hannesa2hannesa2
committed
Fix lint errors
1 parent 3b6a73c commit 4e87e80

File tree

3 files changed

+36
-35
lines changed

3 files changed

+36
-35
lines changed

‎app/src/main/res/menu/main.xml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
<menu xmlns:android="http://schemas.android.com/apk/res/android" >
1+
<menu xmlns:app="http://schemas.android.com/apk/res-auto"
2+
xmlns:android="http://schemas.android.com/apk/res/android" >
23

34
<item
45
android:id="@+id/action_settings"
56
android:orderInCategory="100"
6-
android:showAsAction="never"
7-
android:title="@string/action_settings"/>
7+
android:title="@string/action_settings"
8+
app:showAsAction="never" />
89

910
</menu>

‎app/src/main/res/menu/menu.xml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
<menu xmlns:android="http://schemas.android.com/apk/res/android" >
1+
<menu xmlns:app="http://schemas.android.com/apk/res-auto"
2+
xmlns:android="http://schemas.android.com/apk/res/android" >
23

34
<item
45
android:id="@+id/action_settings"
56
android:orderInCategory="100"
6-
android:showAsAction="never"
7-
android:title="@string/action_settings"/>
7+
android:title="@string/action_settings"
8+
app:showAsAction="never" />
89

910
</menu>

‎app/src/main/res/menu/model.xml‎

Lines changed: 28 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,84 +1,85 @@
1-
<menu xmlns:android="http://schemas.android.com/apk/res/android" >
1+
<menu xmlns:app="http://schemas.android.com/apk/res-auto"
2+
xmlns:android="http://schemas.android.com/apk/res/android" >
23

34

45
<item
56
android:id="@+id/model_toggle_skybox"
67
android:icon="@android:drawable/ic_menu_gallery"
78
android:orderInCategory="100"
8-
android:showAsAction="ifRoom"
9-
android:title="Toggle Sky Box"/>
9+
android:title="Toggle Sky Box"
10+
app:showAsAction="ifRoom" />
1011
<item
1112
android:id="@+id/model_toggle_projection"
1213
android:icon="@android:drawable/ic_menu_camera"
1314
android:orderInCategory="200"
14-
android:showAsAction="ifRoom"
15-
android:title="Toggle Projection"/>
15+
android:title="Toggle Projection"
16+
app:showAsAction="ifRoom" />
1617
<item
1718
android:id="@+id/model_toggle_lights"
1819
android:icon="@android:drawable/ic_menu_compass"
1920
android:orderInCategory="300"
20-
android:showAsAction="ifRoom"
21-
android:title="@string/toggle_lights"/>
21+
android:title="@string/toggle_lights"
22+
app:showAsAction="ifRoom" />
2223
<item
2324
android:id="@+id/model_toggle_wireframe"
2425
android:icon="@android:drawable/ic_menu_sort_by_size"
2526
android:orderInCategory="400"
26-
android:showAsAction="ifRoom"
27-
android:title="@string/toggle_wireframe"/>
27+
android:title="@string/toggle_wireframe"
28+
app:showAsAction="ifRoom" />
2829
<item
2930
android:id="@+id/model_toggle_textures"
3031
android:icon="@android:drawable/ic_menu_gallery"
3132
android:orderInCategory="500"
32-
android:showAsAction="ifRoom"
33-
android:title="@string/toggle_textures"/>
33+
android:title="@string/toggle_textures"
34+
app:showAsAction="ifRoom" />
3435
<item
3536
android:id="@+id/model_toggle_animation"
3637
android:icon="@android:drawable/ic_menu_gallery"
3738
android:orderInCategory="600"
38-
android:showAsAction="ifRoom"
39-
android:title="@string/toggle_animation"/>
39+
android:title="@string/toggle_animation"
40+
app:showAsAction="ifRoom" />
4041
<item
4142
android:id="@+id/model_toggle_smooth"
4243
android:icon="@android:drawable/ic_menu_gallery"
4344
android:orderInCategory="700"
44-
android:showAsAction="ifRoom"
45-
android:title="Toggle Smooth"/>
45+
android:title="Toggle Smooth"
46+
app:showAsAction="ifRoom" />
4647
<item
4748
android:id="@+id/model_load_texture"
4849
android:icon="@android:drawable/ic_menu_gallery"
4950
android:orderInCategory="800"
50-
android:showAsAction="ifRoom"
51-
android:title="@string/load_texture"/>
51+
android:title="@string/load_texture"
52+
app:showAsAction="ifRoom" />
5253
<item
5354
android:id="@+id/model_toggle_stereoscopic"
5455
android:icon="@android:drawable/ic_menu_gallery"
5556
android:orderInCategory="900"
56-
android:showAsAction="ifRoom"
57-
android:title="Toggle Stereoscopic"/>
57+
android:title="Toggle Stereoscopic"
58+
app:showAsAction="ifRoom" />
5859
<item
5960
android:id="@+id/model_toggle_blending"
6061
android:icon="@android:drawable/ic_menu_gallery"
6162
android:orderInCategory="1000"
62-
android:showAsAction="ifRoom"
63-
android:title="Toggle X-Ray" />
63+
android:title="Toggle X-Ray"
64+
app:showAsAction="ifRoom" />
6465
<item
6566
android:id="@+id/model_toggle_boundingbox"
6667
android:icon="@android:drawable/ic_menu_crop"
6768
android:orderInCategory="1100"
68-
android:showAsAction="ifRoom"
69-
android:title="@string/toggle_boundingbox"/>
69+
android:title="@string/toggle_boundingbox"
70+
app:showAsAction="ifRoom" />
7071
<item
7172
android:id="@+id/model_toggle_collision"
7273
android:icon="@android:drawable/ic_menu_gallery"
7374
android:orderInCategory="1200"
74-
android:showAsAction="ifRoom"
75-
android:title="Toggle Collision"/>
75+
android:title="Toggle Collision"
76+
app:showAsAction="ifRoom" />
7677
<item
7778
android:id="@+id/model_toggle_immersive"
7879
android:icon="@android:drawable/ic_menu_gallery"
7980
android:orderInCategory="1300"
80-
android:showAsAction="ifRoom"
81-
android:title="Toggle Immersive"/>
81+
android:title="Toggle Immersive"
82+
app:showAsAction="ifRoom" />
8283

8384
<!--
8485
<item
@@ -87,8 +88,6 @@
8788
android:orderInCategory="500"
8889
android:showAsAction="ifRoom"
8990
android:title="@string/action_settings"/>
90-
91-
9291
-->
9392

9493
</menu>

0 commit comments

Comments
 (0)