Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lab4/.idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -6,26 +6,26 @@
6
7 <uses-sdk
8 android:minSdkVersion="15"
8-->C:\gitreport\lab4\lab4\app\src\main\AndroidManifest.xml
8-->D:\git\lab4\lab4\app\src\main\AndroidManifest.xml
9 android:targetSdkVersion="29" />
9-->C:\gitreport\lab4\lab4\app\src\main\AndroidManifest.xml
9-->D:\git\lab4\lab4\app\src\main\AndroidManifest.xml
10
11 <application
11-->C:\gitreport\lab4\lab4\app\src\main\AndroidManifest.xml:4:5-10:43
11-->D:\git\lab4\lab4\app\src\main\AndroidManifest.xml:4:5-10:43
12 android:allowBackup="true"
12-->C:\gitreport\lab4\lab4\app\src\main\AndroidManifest.xml:5:9-35
12-->D:\git\lab4\lab4\app\src\main\AndroidManifest.xml:5:9-35
13 android:appComponentFactory="androidx.core.app.CoreComponentFactory"
13-->[androidx.core:core:1.0.1] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\8f8ab13dc8f4e84e14a8bb3d9ac92bc4\core-1.0.1\AndroidManifest.xml:22:18-86
13-->[androidx.core:core:1.0.1] C:\Users\weida.DESKTOP-7KV2BM3\.gradle\caches\transforms-2\files-2.1\8f8ab13dc8f4e84e14a8bb3d9ac92bc4\core-1.0.1\AndroidManifest.xml:22:18-86
14 android:debuggable="true"
15 android:icon="@mipmap/ic_launcher"
15-->C:\gitreport\lab4\lab4\app\src\main\AndroidManifest.xml:6:9-43
15-->D:\git\lab4\lab4\app\src\main\AndroidManifest.xml:6:9-43
16 android:label="@string/app_name"
16-->C:\gitreport\lab4\lab4\app\src\main\AndroidManifest.xml:7:9-41
16-->D:\git\lab4\lab4\app\src\main\AndroidManifest.xml:7:9-41
17 android:roundIcon="@mipmap/ic_launcher_round"
17-->C:\gitreport\lab4\lab4\app\src\main\AndroidManifest.xml:8:9-54
17-->D:\git\lab4\lab4\app\src\main\AndroidManifest.xml:8:9-54
18 android:supportsRtl="true"
18-->C:\gitreport\lab4\lab4\app\src\main\AndroidManifest.xml:9:9-35
18-->D:\git\lab4\lab4\app\src\main\AndroidManifest.xml:9:9-35
19 android:theme="@style/AppTheme" />
19-->C:\gitreport\lab4\lab4\app\src\main\AndroidManifest.xml:10:9-40
19-->D:\git\lab4\lab4\app\src\main\AndroidManifest.xml:10:9-40
20
21</manifest>
Original file line number Diff line number Diff line change
Expand Up @@ -3,73 +3,73 @@
3 package="com.example.lab4.test" >
4
5 <uses-sdk
5-->C:\gitreport\lab4\lab4\app\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger3508977256526570230.xml:5:5-74
5-->D:\git\lab4\lab4\app\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger1635866291021975574.xml:5:5-74
6 android:minSdkVersion="15"
6-->C:\gitreport\lab4\lab4\app\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger3508977256526570230.xml:5:15-41
6-->D:\git\lab4\lab4\app\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger1635866291021975574.xml:5:15-41
7 android:targetSdkVersion="29" />
7-->C:\gitreport\lab4\lab4\app\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger3508977256526570230.xml:5:42-71
7-->D:\git\lab4\lab4\app\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger1635866291021975574.xml:5:42-71
8
9 <instrumentation
9-->C:\gitreport\lab4\lab4\app\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger3508977256526570230.xml:11:5-15:66
9-->D:\git\lab4\lab4\app\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger1635866291021975574.xml:11:5-15:66
10 android:name="androidx.test.runner.AndroidJUnitRunner"
10-->C:\gitreport\lab4\lab4\app\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger3508977256526570230.xml:11:22-76
10-->D:\git\lab4\lab4\app\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger1635866291021975574.xml:11:22-76
11 android:functionalTest="false"
11-->C:\gitreport\lab4\lab4\app\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger3508977256526570230.xml:14:22-52
11-->D:\git\lab4\lab4\app\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger1635866291021975574.xml:14:22-52
12 android:handleProfiling="false"
12-->C:\gitreport\lab4\lab4\app\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger3508977256526570230.xml:13:22-53
12-->D:\git\lab4\lab4\app\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger1635866291021975574.xml:13:22-53
13 android:label="Tests for com.example.lab4"
13-->C:\gitreport\lab4\lab4\app\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger3508977256526570230.xml:15:22-64
13-->D:\git\lab4\lab4\app\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger1635866291021975574.xml:15:22-64
14 android:targetPackage="com.example.lab4" />
14-->C:\gitreport\lab4\lab4\app\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger3508977256526570230.xml:12:22-62
14-->D:\git\lab4\lab4\app\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger1635866291021975574.xml:12:22-62
15
16 <uses-permission android:name="android.permission.REORDER_TASKS" />
16-->[androidx.test:core:1.1.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\61e5e7e4c8c93d43f3f06edf87848d5f\core-1.1.0\AndroidManifest.xml:24:5-72
16-->[androidx.test:core:1.1.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\61e5e7e4c8c93d43f3f06edf87848d5f\core-1.1.0\AndroidManifest.xml:24:22-69
16-->[androidx.test:core:1.1.0] C:\Users\weida.DESKTOP-7KV2BM3\.gradle\caches\transforms-2\files-2.1\61e5e7e4c8c93d43f3f06edf87848d5f\core-1.1.0\AndroidManifest.xml:24:5-72
16-->[androidx.test:core:1.1.0] C:\Users\weida.DESKTOP-7KV2BM3\.gradle\caches\transforms-2\files-2.1\61e5e7e4c8c93d43f3f06edf87848d5f\core-1.1.0\AndroidManifest.xml:24:22-69
17
18 <application android:debuggable="true" >
18-->C:\gitreport\lab4\lab4\app\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger3508977256526570230.xml:7:5-9:19
18-->C:\gitreport\lab4\lab4\app\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger3508977256526570230.xml:7:18-43
18-->D:\git\lab4\lab4\app\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger1635866291021975574.xml:7:5-9:19
18-->D:\git\lab4\lab4\app\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger1635866291021975574.xml:7:18-43
19 <uses-library android:name="android.test.runner" />
19-->C:\gitreport\lab4\lab4\app\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger3508977256526570230.xml:8:9-60
19-->C:\gitreport\lab4\lab4\app\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger3508977256526570230.xml:8:23-57
19-->D:\git\lab4\lab4\app\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger1635866291021975574.xml:8:9-60
19-->D:\git\lab4\lab4\app\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger1635866291021975574.xml:8:23-57
20
21 <activity
21-->[androidx.test:core:1.1.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\61e5e7e4c8c93d43f3f06edf87848d5f\core-1.1.0\AndroidManifest.xml:27:9-33:20
21-->[androidx.test:core:1.1.0] C:\Users\weida.DESKTOP-7KV2BM3\.gradle\caches\transforms-2\files-2.1\61e5e7e4c8c93d43f3f06edf87848d5f\core-1.1.0\AndroidManifest.xml:27:9-33:20
22 android:name="androidx.test.core.app.InstrumentationActivityInvoker$BootstrapActivity"
22-->[androidx.test:core:1.1.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\61e5e7e4c8c93d43f3f06edf87848d5f\core-1.1.0\AndroidManifest.xml:28:13-99
22-->[androidx.test:core:1.1.0] C:\Users\weida.DESKTOP-7KV2BM3\.gradle\caches\transforms-2\files-2.1\61e5e7e4c8c93d43f3f06edf87848d5f\core-1.1.0\AndroidManifest.xml:28:13-99
23 android:theme="@style/InstrumentationActivityInvokerBootstrapActivityTheme" >
23-->[androidx.test:core:1.1.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\61e5e7e4c8c93d43f3f06edf87848d5f\core-1.1.0\AndroidManifest.xml:29:13-88
23-->[androidx.test:core:1.1.0] C:\Users\weida.DESKTOP-7KV2BM3\.gradle\caches\transforms-2\files-2.1\61e5e7e4c8c93d43f3f06edf87848d5f\core-1.1.0\AndroidManifest.xml:29:13-88
24 <intent-filter>
24-->[androidx.test:core:1.1.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\61e5e7e4c8c93d43f3f06edf87848d5f\core-1.1.0\AndroidManifest.xml:30:13-32:29
24-->[androidx.test:core:1.1.0] C:\Users\weida.DESKTOP-7KV2BM3\.gradle\caches\transforms-2\files-2.1\61e5e7e4c8c93d43f3f06edf87848d5f\core-1.1.0\AndroidManifest.xml:30:13-32:29
25 <action android:name="android.intent.action.MAIN" />
25-->[androidx.test:core:1.1.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\61e5e7e4c8c93d43f3f06edf87848d5f\core-1.1.0\AndroidManifest.xml:31:17-69
25-->[androidx.test:core:1.1.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\61e5e7e4c8c93d43f3f06edf87848d5f\core-1.1.0\AndroidManifest.xml:31:25-66
25-->[androidx.test:core:1.1.0] C:\Users\weida.DESKTOP-7KV2BM3\.gradle\caches\transforms-2\files-2.1\61e5e7e4c8c93d43f3f06edf87848d5f\core-1.1.0\AndroidManifest.xml:31:17-69
25-->[androidx.test:core:1.1.0] C:\Users\weida.DESKTOP-7KV2BM3\.gradle\caches\transforms-2\files-2.1\61e5e7e4c8c93d43f3f06edf87848d5f\core-1.1.0\AndroidManifest.xml:31:25-66
26 </intent-filter>
27 </activity>
28 <activity
28-->[androidx.test:core:1.1.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\61e5e7e4c8c93d43f3f06edf87848d5f\core-1.1.0\AndroidManifest.xml:34:9-40:20
28-->[androidx.test:core:1.1.0] C:\Users\weida.DESKTOP-7KV2BM3\.gradle\caches\transforms-2\files-2.1\61e5e7e4c8c93d43f3f06edf87848d5f\core-1.1.0\AndroidManifest.xml:34:9-40:20
29 android:name="androidx.test.core.app.InstrumentationActivityInvoker$EmptyActivity"
29-->[androidx.test:core:1.1.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\61e5e7e4c8c93d43f3f06edf87848d5f\core-1.1.0\AndroidManifest.xml:35:13-95
29-->[androidx.test:core:1.1.0] C:\Users\weida.DESKTOP-7KV2BM3\.gradle\caches\transforms-2\files-2.1\61e5e7e4c8c93d43f3f06edf87848d5f\core-1.1.0\AndroidManifest.xml:35:13-95
30 android:theme="@style/InstrumentationActivityInvokerEmptyActivityTheme" >
30-->[androidx.test:core:1.1.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\61e5e7e4c8c93d43f3f06edf87848d5f\core-1.1.0\AndroidManifest.xml:36:13-84
30-->[androidx.test:core:1.1.0] C:\Users\weida.DESKTOP-7KV2BM3\.gradle\caches\transforms-2\files-2.1\61e5e7e4c8c93d43f3f06edf87848d5f\core-1.1.0\AndroidManifest.xml:36:13-84
31 <intent-filter>
31-->[androidx.test:core:1.1.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\61e5e7e4c8c93d43f3f06edf87848d5f\core-1.1.0\AndroidManifest.xml:30:13-32:29
31-->[androidx.test:core:1.1.0] C:\Users\weida.DESKTOP-7KV2BM3\.gradle\caches\transforms-2\files-2.1\61e5e7e4c8c93d43f3f06edf87848d5f\core-1.1.0\AndroidManifest.xml:30:13-32:29
32 <action android:name="android.intent.action.MAIN" />
32-->[androidx.test:core:1.1.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\61e5e7e4c8c93d43f3f06edf87848d5f\core-1.1.0\AndroidManifest.xml:31:17-69
32-->[androidx.test:core:1.1.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\61e5e7e4c8c93d43f3f06edf87848d5f\core-1.1.0\AndroidManifest.xml:31:25-66
32-->[androidx.test:core:1.1.0] C:\Users\weida.DESKTOP-7KV2BM3\.gradle\caches\transforms-2\files-2.1\61e5e7e4c8c93d43f3f06edf87848d5f\core-1.1.0\AndroidManifest.xml:31:17-69
32-->[androidx.test:core:1.1.0] C:\Users\weida.DESKTOP-7KV2BM3\.gradle\caches\transforms-2\files-2.1\61e5e7e4c8c93d43f3f06edf87848d5f\core-1.1.0\AndroidManifest.xml:31:25-66
33 </intent-filter>
34 </activity>
35 <activity
35-->[androidx.test:core:1.1.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\61e5e7e4c8c93d43f3f06edf87848d5f\core-1.1.0\AndroidManifest.xml:41:9-47:20
35-->[androidx.test:core:1.1.0] C:\Users\weida.DESKTOP-7KV2BM3\.gradle\caches\transforms-2\files-2.1\61e5e7e4c8c93d43f3f06edf87848d5f\core-1.1.0\AndroidManifest.xml:41:9-47:20
36 android:name="androidx.test.core.app.InstrumentationActivityInvoker$EmptyFloatingActivity"
36-->[androidx.test:core:1.1.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\61e5e7e4c8c93d43f3f06edf87848d5f\core-1.1.0\AndroidManifest.xml:42:13-103
36-->[androidx.test:core:1.1.0] C:\Users\weida.DESKTOP-7KV2BM3\.gradle\caches\transforms-2\files-2.1\61e5e7e4c8c93d43f3f06edf87848d5f\core-1.1.0\AndroidManifest.xml:42:13-103
37 android:theme="@style/InstrumentationActivityInvokerFloatingActivityTheme" >
37-->[androidx.test:core:1.1.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\61e5e7e4c8c93d43f3f06edf87848d5f\core-1.1.0\AndroidManifest.xml:43:13-87
37-->[androidx.test:core:1.1.0] C:\Users\weida.DESKTOP-7KV2BM3\.gradle\caches\transforms-2\files-2.1\61e5e7e4c8c93d43f3f06edf87848d5f\core-1.1.0\AndroidManifest.xml:43:13-87
38 <intent-filter>
38-->[androidx.test:core:1.1.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\61e5e7e4c8c93d43f3f06edf87848d5f\core-1.1.0\AndroidManifest.xml:30:13-32:29
38-->[androidx.test:core:1.1.0] C:\Users\weida.DESKTOP-7KV2BM3\.gradle\caches\transforms-2\files-2.1\61e5e7e4c8c93d43f3f06edf87848d5f\core-1.1.0\AndroidManifest.xml:30:13-32:29
39 <action android:name="android.intent.action.MAIN" />
39-->[androidx.test:core:1.1.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\61e5e7e4c8c93d43f3f06edf87848d5f\core-1.1.0\AndroidManifest.xml:31:17-69
39-->[androidx.test:core:1.1.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\61e5e7e4c8c93d43f3f06edf87848d5f\core-1.1.0\AndroidManifest.xml:31:25-66
39-->[androidx.test:core:1.1.0] C:\Users\weida.DESKTOP-7KV2BM3\.gradle\caches\transforms-2\files-2.1\61e5e7e4c8c93d43f3f06edf87848d5f\core-1.1.0\AndroidManifest.xml:31:17-69
39-->[androidx.test:core:1.1.0] C:\Users\weida.DESKTOP-7KV2BM3\.gradle\caches\transforms-2\files-2.1\61e5e7e4c8c93d43f3f06edf87848d5f\core-1.1.0\AndroidManifest.xml:31:25-66
40 </intent-filter>
41 </activity>
42 </application>
Expand Down
Loading