From e95a9ea98ebf246b771bc8715e64bccc159b019a Mon Sep 17 00:00:00 2001 From: YipingPeng <43100360+YipingPeng@users.noreply.github.com> Date: Tue, 4 Feb 2020 19:23:56 -0700 Subject: [PATCH] Create triangle YipingPeng --- Autobot/Autobot.iml | 38 +-- Autobot/app/app.iml | 264 +++++++++--------- .../bundle-manifest/AndroidManifest.xml | 54 ++-- .../debug/AndroidManifest.xml | 56 ++-- .../manifest-merger-blame-debug-report.txt | 34 +-- ...-merger-blame-debug-androidTest-report.txt | 66 ++--- .../debug/AndroidManifest.xml | 54 ++-- .../debugAndroidTest/AndroidManifest.xml | 84 +++--- .../logs/manifest-merger-debug-report.txt | 224 +++++++-------- .../java/com/example/autobot/Triangle.java | 4 + Autobot/local.properties | 18 +- 11 files changed, 449 insertions(+), 447 deletions(-) create mode 100644 Autobot/app/src/main/java/com/example/autobot/Triangle.java diff --git a/Autobot/Autobot.iml b/Autobot/Autobot.iml index 0adcaf3..7496f0d 100644 --- a/Autobot/Autobot.iml +++ b/Autobot/Autobot.iml @@ -1,20 +1,20 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Autobot/app/app.iml b/Autobot/app/app.iml index 0dc6643..4c2d42a 100644 --- a/Autobot/app/app.iml +++ b/Autobot/app/app.iml @@ -1,133 +1,133 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Autobot/app/build/intermediates/bundle_manifest/debug/processDebugManifest/bundle-manifest/AndroidManifest.xml b/Autobot/app/build/intermediates/bundle_manifest/debug/processDebugManifest/bundle-manifest/AndroidManifest.xml index 567b89a..6d109c9 100644 --- a/Autobot/app/build/intermediates/bundle_manifest/debug/processDebugManifest/bundle-manifest/AndroidManifest.xml +++ b/Autobot/app/build/intermediates/bundle_manifest/debug/processDebugManifest/bundle-manifest/AndroidManifest.xml @@ -1,29 +1,29 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Autobot/app/build/intermediates/instant_app_manifest/debug/AndroidManifest.xml b/Autobot/app/build/intermediates/instant_app_manifest/debug/AndroidManifest.xml index 958c4ec..82af42a 100644 --- a/Autobot/app/build/intermediates/instant_app_manifest/debug/AndroidManifest.xml +++ b/Autobot/app/build/intermediates/instant_app_manifest/debug/AndroidManifest.xml @@ -1,30 +1,30 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Autobot/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt b/Autobot/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt index c2a9c7f..2b4114a 100644 --- a/Autobot/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt +++ b/Autobot/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt @@ -6,39 +6,39 @@ 6 7 C:\androidstudio\androidprogram\Autobot\app\src\main\AndroidManifest.xml +8-->/Users/crispeng/CMPUT301W20/Autobot/app/src/main/AndroidManifest.xml 9 android:targetSdkVersion="29" /> -9-->C:\androidstudio\androidprogram\Autobot\app\src\main\AndroidManifest.xml +9-->/Users/crispeng/CMPUT301W20/Autobot/app/src/main/AndroidManifest.xml 10 11 C:\androidstudio\androidprogram\Autobot\app\src\main\AndroidManifest.xml:5:5-19:19 +11-->/Users/crispeng/CMPUT301W20/Autobot/app/src/main/AndroidManifest.xml:5:5-19:19 12 android:allowBackup="true" -12-->C:\androidstudio\androidprogram\Autobot\app\src\main\AndroidManifest.xml:6:9-35 +12-->/Users/crispeng/CMPUT301W20/Autobot/app/src/main/AndroidManifest.xml:6:9-35 13 android:appComponentFactory="androidx.core.app.CoreComponentFactory" -13-->[androidx.core:core:1.1.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\e9dab9c67c1ee3668e0bbf86c6d8cbd8\core-1.1.0\AndroidManifest.xml:24:18-86 +13-->[androidx.core:core:1.1.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/e9dab9c67c1ee3668e0bbf86c6d8cbd8/core-1.1.0/AndroidManifest.xml:24:18-86 14 android:debuggable="true" 15 android:icon="@mipmap/ic_launcher" -15-->C:\androidstudio\androidprogram\Autobot\app\src\main\AndroidManifest.xml:7:9-43 +15-->/Users/crispeng/CMPUT301W20/Autobot/app/src/main/AndroidManifest.xml:7:9-43 16 android:label="@string/app_name" -16-->C:\androidstudio\androidprogram\Autobot\app\src\main\AndroidManifest.xml:8:9-41 +16-->/Users/crispeng/CMPUT301W20/Autobot/app/src/main/AndroidManifest.xml:8:9-41 17 android:roundIcon="@mipmap/ic_launcher_round" -17-->C:\androidstudio\androidprogram\Autobot\app\src\main\AndroidManifest.xml:9:9-54 +17-->/Users/crispeng/CMPUT301W20/Autobot/app/src/main/AndroidManifest.xml:9:9-54 18 android:supportsRtl="true" -18-->C:\androidstudio\androidprogram\Autobot\app\src\main\AndroidManifest.xml:10:9-35 +18-->/Users/crispeng/CMPUT301W20/Autobot/app/src/main/AndroidManifest.xml:10:9-35 19 android:theme="@style/AppTheme" > -19-->C:\androidstudio\androidprogram\Autobot\app\src\main\AndroidManifest.xml:11:9-40 +19-->/Users/crispeng/CMPUT301W20/Autobot/app/src/main/AndroidManifest.xml:11:9-40 20 -20-->C:\androidstudio\androidprogram\Autobot\app\src\main\AndroidManifest.xml:12:9-18:20 -20-->C:\androidstudio\androidprogram\Autobot\app\src\main\AndroidManifest.xml:12:19-47 +20-->/Users/crispeng/CMPUT301W20/Autobot/app/src/main/AndroidManifest.xml:12:9-18:20 +20-->/Users/crispeng/CMPUT301W20/Autobot/app/src/main/AndroidManifest.xml:12:19-47 21 -21-->C:\androidstudio\androidprogram\Autobot\app\src\main\AndroidManifest.xml:13:13-17:29 +21-->/Users/crispeng/CMPUT301W20/Autobot/app/src/main/AndroidManifest.xml:13:13-17:29 22 -22-->C:\androidstudio\androidprogram\Autobot\app\src\main\AndroidManifest.xml:14:17-69 -22-->C:\androidstudio\androidprogram\Autobot\app\src\main\AndroidManifest.xml:14:25-66 +22-->/Users/crispeng/CMPUT301W20/Autobot/app/src/main/AndroidManifest.xml:14:17-69 +22-->/Users/crispeng/CMPUT301W20/Autobot/app/src/main/AndroidManifest.xml:14:25-66 23 24 -24-->C:\androidstudio\androidprogram\Autobot\app\src\main\AndroidManifest.xml:16:17-77 -24-->C:\androidstudio\androidprogram\Autobot\app\src\main\AndroidManifest.xml:16:27-74 +24-->/Users/crispeng/CMPUT301W20/Autobot/app/src/main/AndroidManifest.xml:16:17-77 +24-->/Users/crispeng/CMPUT301W20/Autobot/app/src/main/AndroidManifest.xml:16:27-74 25 26 27 diff --git a/Autobot/app/build/intermediates/manifest_merge_blame_file/debugAndroidTest/manifest-merger-blame-debug-androidTest-report.txt b/Autobot/app/build/intermediates/manifest_merge_blame_file/debugAndroidTest/manifest-merger-blame-debug-androidTest-report.txt index 3606ce0..8a6fddf 100644 --- a/Autobot/app/build/intermediates/manifest_merge_blame_file/debugAndroidTest/manifest-merger-blame-debug-androidTest-report.txt +++ b/Autobot/app/build/intermediates/manifest_merge_blame_file/debugAndroidTest/manifest-merger-blame-debug-androidTest-report.txt @@ -3,73 +3,73 @@ 3 package="com.example.autobot.test" > 4 5 C:\androidstudio\androidprogram\Autobot\app\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger4314857725015566886.xml:5:5-74 +5-->/Users/crispeng/CMPUT301W20/Autobot/app/build/intermediates/tmp/manifest/androidTest/debug/manifestMerger3636059209269823023.xml:5:5-74 6 android:minSdkVersion="15" -6-->C:\androidstudio\androidprogram\Autobot\app\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger4314857725015566886.xml:5:15-41 +6-->/Users/crispeng/CMPUT301W20/Autobot/app/build/intermediates/tmp/manifest/androidTest/debug/manifestMerger3636059209269823023.xml:5:15-41 7 android:targetSdkVersion="29" /> -7-->C:\androidstudio\androidprogram\Autobot\app\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger4314857725015566886.xml:5:42-71 +7-->/Users/crispeng/CMPUT301W20/Autobot/app/build/intermediates/tmp/manifest/androidTest/debug/manifestMerger3636059209269823023.xml:5:42-71 8 9 C:\androidstudio\androidprogram\Autobot\app\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger4314857725015566886.xml:11:5-15:69 +9-->/Users/crispeng/CMPUT301W20/Autobot/app/build/intermediates/tmp/manifest/androidTest/debug/manifestMerger3636059209269823023.xml:11:5-15:69 10 android:name="androidx.test.runner.AndroidJUnitRunner" -10-->C:\androidstudio\androidprogram\Autobot\app\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger4314857725015566886.xml:11:22-76 +10-->/Users/crispeng/CMPUT301W20/Autobot/app/build/intermediates/tmp/manifest/androidTest/debug/manifestMerger3636059209269823023.xml:11:22-76 11 android:functionalTest="false" -11-->C:\androidstudio\androidprogram\Autobot\app\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger4314857725015566886.xml:14:22-52 +11-->/Users/crispeng/CMPUT301W20/Autobot/app/build/intermediates/tmp/manifest/androidTest/debug/manifestMerger3636059209269823023.xml:14:22-52 12 android:handleProfiling="false" -12-->C:\androidstudio\androidprogram\Autobot\app\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger4314857725015566886.xml:13:22-53 +12-->/Users/crispeng/CMPUT301W20/Autobot/app/build/intermediates/tmp/manifest/androidTest/debug/manifestMerger3636059209269823023.xml:13:22-53 13 android:label="Tests for com.example.autobot" -13-->C:\androidstudio\androidprogram\Autobot\app\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger4314857725015566886.xml:15:22-67 +13-->/Users/crispeng/CMPUT301W20/Autobot/app/build/intermediates/tmp/manifest/androidTest/debug/manifestMerger3636059209269823023.xml:15:22-67 14 android:targetPackage="com.example.autobot" /> -14-->C:\androidstudio\androidprogram\Autobot\app\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger4314857725015566886.xml:12:22-65 +14-->/Users/crispeng/CMPUT301W20/Autobot/app/build/intermediates/tmp/manifest/androidTest/debug/manifestMerger3636059209269823023.xml:12:22-65 15 16 -16-->[androidx.test:core:1.2.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\b84e39374531a9cc1088cbb1e2cc9cc2\core-1.2.0\AndroidManifest.xml:24:5-72 -16-->[androidx.test:core:1.2.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\b84e39374531a9cc1088cbb1e2cc9cc2\core-1.2.0\AndroidManifest.xml:24:22-69 +16-->[androidx.test:core:1.2.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/b84e39374531a9cc1088cbb1e2cc9cc2/core-1.2.0/AndroidManifest.xml:24:5-72 +16-->[androidx.test:core:1.2.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/b84e39374531a9cc1088cbb1e2cc9cc2/core-1.2.0/AndroidManifest.xml:24:22-69 17 18 -18-->C:\androidstudio\androidprogram\Autobot\app\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger4314857725015566886.xml:7:5-9:19 -18-->C:\androidstudio\androidprogram\Autobot\app\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger4314857725015566886.xml:7:18-43 +18-->/Users/crispeng/CMPUT301W20/Autobot/app/build/intermediates/tmp/manifest/androidTest/debug/manifestMerger3636059209269823023.xml:7:5-9:19 +18-->/Users/crispeng/CMPUT301W20/Autobot/app/build/intermediates/tmp/manifest/androidTest/debug/manifestMerger3636059209269823023.xml:7:18-43 19 -19-->C:\androidstudio\androidprogram\Autobot\app\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger4314857725015566886.xml:8:9-60 -19-->C:\androidstudio\androidprogram\Autobot\app\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger4314857725015566886.xml:8:23-57 +19-->/Users/crispeng/CMPUT301W20/Autobot/app/build/intermediates/tmp/manifest/androidTest/debug/manifestMerger3636059209269823023.xml:8:9-60 +19-->/Users/crispeng/CMPUT301W20/Autobot/app/build/intermediates/tmp/manifest/androidTest/debug/manifestMerger3636059209269823023.xml:8:23-57 20 21 [androidx.test:core:1.2.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\b84e39374531a9cc1088cbb1e2cc9cc2\core-1.2.0\AndroidManifest.xml:27:9-33:20 +21-->[androidx.test:core:1.2.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/b84e39374531a9cc1088cbb1e2cc9cc2/core-1.2.0/AndroidManifest.xml:27:9-33:20 22 android:name="androidx.test.core.app.InstrumentationActivityInvoker$BootstrapActivity" -22-->[androidx.test:core:1.2.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\b84e39374531a9cc1088cbb1e2cc9cc2\core-1.2.0\AndroidManifest.xml:28:13-99 +22-->[androidx.test:core:1.2.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/b84e39374531a9cc1088cbb1e2cc9cc2/core-1.2.0/AndroidManifest.xml:28:13-99 23 android:theme="@android:style/Theme" > -23-->[androidx.test:core:1.2.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\b84e39374531a9cc1088cbb1e2cc9cc2\core-1.2.0\AndroidManifest.xml:29:13-49 +23-->[androidx.test:core:1.2.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/b84e39374531a9cc1088cbb1e2cc9cc2/core-1.2.0/AndroidManifest.xml:29:13-49 24 -24-->[androidx.test:core:1.2.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\b84e39374531a9cc1088cbb1e2cc9cc2\core-1.2.0\AndroidManifest.xml:30:13-32:29 +24-->[androidx.test:core:1.2.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/b84e39374531a9cc1088cbb1e2cc9cc2/core-1.2.0/AndroidManifest.xml:30:13-32:29 25 -25-->[androidx.test:core:1.2.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\b84e39374531a9cc1088cbb1e2cc9cc2\core-1.2.0\AndroidManifest.xml:31:17-69 -25-->[androidx.test:core:1.2.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\b84e39374531a9cc1088cbb1e2cc9cc2\core-1.2.0\AndroidManifest.xml:31:25-66 +25-->[androidx.test:core:1.2.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/b84e39374531a9cc1088cbb1e2cc9cc2/core-1.2.0/AndroidManifest.xml:31:17-69 +25-->[androidx.test:core:1.2.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/b84e39374531a9cc1088cbb1e2cc9cc2/core-1.2.0/AndroidManifest.xml:31:25-66 26 27 28 [androidx.test:core:1.2.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\b84e39374531a9cc1088cbb1e2cc9cc2\core-1.2.0\AndroidManifest.xml:34:9-40:20 +28-->[androidx.test:core:1.2.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/b84e39374531a9cc1088cbb1e2cc9cc2/core-1.2.0/AndroidManifest.xml:34:9-40:20 29 android:name="androidx.test.core.app.InstrumentationActivityInvoker$EmptyActivity" -29-->[androidx.test:core:1.2.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\b84e39374531a9cc1088cbb1e2cc9cc2\core-1.2.0\AndroidManifest.xml:35:13-95 +29-->[androidx.test:core:1.2.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/b84e39374531a9cc1088cbb1e2cc9cc2/core-1.2.0/AndroidManifest.xml:35:13-95 30 android:theme="@android:style/Theme" > -30-->[androidx.test:core:1.2.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\b84e39374531a9cc1088cbb1e2cc9cc2\core-1.2.0\AndroidManifest.xml:36:13-49 +30-->[androidx.test:core:1.2.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/b84e39374531a9cc1088cbb1e2cc9cc2/core-1.2.0/AndroidManifest.xml:36:13-49 31 -31-->[androidx.test:core:1.2.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\b84e39374531a9cc1088cbb1e2cc9cc2\core-1.2.0\AndroidManifest.xml:30:13-32:29 +31-->[androidx.test:core:1.2.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/b84e39374531a9cc1088cbb1e2cc9cc2/core-1.2.0/AndroidManifest.xml:30:13-32:29 32 -32-->[androidx.test:core:1.2.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\b84e39374531a9cc1088cbb1e2cc9cc2\core-1.2.0\AndroidManifest.xml:31:17-69 -32-->[androidx.test:core:1.2.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\b84e39374531a9cc1088cbb1e2cc9cc2\core-1.2.0\AndroidManifest.xml:31:25-66 +32-->[androidx.test:core:1.2.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/b84e39374531a9cc1088cbb1e2cc9cc2/core-1.2.0/AndroidManifest.xml:31:17-69 +32-->[androidx.test:core:1.2.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/b84e39374531a9cc1088cbb1e2cc9cc2/core-1.2.0/AndroidManifest.xml:31:25-66 33 34 35 [androidx.test:core:1.2.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\b84e39374531a9cc1088cbb1e2cc9cc2\core-1.2.0\AndroidManifest.xml:41:9-47:20 +35-->[androidx.test:core:1.2.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/b84e39374531a9cc1088cbb1e2cc9cc2/core-1.2.0/AndroidManifest.xml:41:9-47:20 36 android:name="androidx.test.core.app.InstrumentationActivityInvoker$EmptyFloatingActivity" -36-->[androidx.test:core:1.2.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\b84e39374531a9cc1088cbb1e2cc9cc2\core-1.2.0\AndroidManifest.xml:42:13-103 +36-->[androidx.test:core:1.2.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/b84e39374531a9cc1088cbb1e2cc9cc2/core-1.2.0/AndroidManifest.xml:42:13-103 37 android:theme="@android:style/Theme.Dialog" > -37-->[androidx.test:core:1.2.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\b84e39374531a9cc1088cbb1e2cc9cc2\core-1.2.0\AndroidManifest.xml:43:13-56 +37-->[androidx.test:core:1.2.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/b84e39374531a9cc1088cbb1e2cc9cc2/core-1.2.0/AndroidManifest.xml:43:13-56 38 -38-->[androidx.test:core:1.2.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\b84e39374531a9cc1088cbb1e2cc9cc2\core-1.2.0\AndroidManifest.xml:30:13-32:29 +38-->[androidx.test:core:1.2.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/b84e39374531a9cc1088cbb1e2cc9cc2/core-1.2.0/AndroidManifest.xml:30:13-32:29 39 -39-->[androidx.test:core:1.2.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\b84e39374531a9cc1088cbb1e2cc9cc2\core-1.2.0\AndroidManifest.xml:31:17-69 -39-->[androidx.test:core:1.2.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\b84e39374531a9cc1088cbb1e2cc9cc2\core-1.2.0\AndroidManifest.xml:31:25-66 +39-->[androidx.test:core:1.2.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/b84e39374531a9cc1088cbb1e2cc9cc2/core-1.2.0/AndroidManifest.xml:31:17-69 +39-->[androidx.test:core:1.2.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/b84e39374531a9cc1088cbb1e2cc9cc2/core-1.2.0/AndroidManifest.xml:31:25-66 40 41 42 diff --git a/Autobot/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml b/Autobot/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml index 567b89a..6d109c9 100644 --- a/Autobot/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml +++ b/Autobot/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml @@ -1,29 +1,29 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Autobot/app/build/intermediates/merged_manifests/debugAndroidTest/AndroidManifest.xml b/Autobot/app/build/intermediates/merged_manifests/debugAndroidTest/AndroidManifest.xml index 59ed57e..493abe9 100644 --- a/Autobot/app/build/intermediates/merged_manifests/debugAndroidTest/AndroidManifest.xml +++ b/Autobot/app/build/intermediates/merged_manifests/debugAndroidTest/AndroidManifest.xml @@ -1,44 +1,44 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Autobot/app/build/outputs/logs/manifest-merger-debug-report.txt b/Autobot/app/build/outputs/logs/manifest-merger-debug-report.txt index dae5688..2f04377 100644 --- a/Autobot/app/build/outputs/logs/manifest-merger-debug-report.txt +++ b/Autobot/app/build/outputs/logs/manifest-merger-debug-report.txt @@ -1,136 +1,136 @@ -- Merging decision tree log --- manifest -ADDED from C:\androidstudio\androidprogram\Autobot\app\src\main\AndroidManifest.xml:2:1-21:12 -INJECTED from C:\androidstudio\androidprogram\Autobot\app\src\main\AndroidManifest.xml:2:1-21:12 -INJECTED from C:\androidstudio\androidprogram\Autobot\app\src\main\AndroidManifest.xml:2:1-21:12 -INJECTED from C:\androidstudio\androidprogram\Autobot\app\src\main\AndroidManifest.xml:2:1-21:12 -MERGED from [androidx.appcompat:appcompat:1.1.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\6119d746697059b7e1b74aab4d181f56\appcompat-1.1.0\AndroidManifest.xml:17:1-24:12 -MERGED from [androidx.constraintlayout:constraintlayout:1.1.3] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\3ec6fa8458ddbe732478393a9f9e6c77\constraintlayout-1.1.3\AndroidManifest.xml:2:1-11:12 -MERGED from [androidx.fragment:fragment:1.1.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\0362ff4d8672321347a402c32368f192\fragment-1.1.0\AndroidManifest.xml:17:1-24:12 -MERGED from [androidx.appcompat:appcompat-resources:1.1.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\ddf6a25e6e3e5e2af441269b48288beb\appcompat-resources-1.1.0\AndroidManifest.xml:17:1-24:12 -MERGED from [androidx.drawerlayout:drawerlayout:1.0.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\00bc847ce5b9e3ce7b40d465bffbf9e9\drawerlayout-1.0.0\AndroidManifest.xml:17:1-22:12 -MERGED from [androidx.viewpager:viewpager:1.0.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\4932f7e67b26f042b51fa62f1aa4816d\viewpager-1.0.0\AndroidManifest.xml:17:1-22:12 -MERGED from [androidx.loader:loader:1.0.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\5276819c062a92c029464122749254f1\loader-1.0.0\AndroidManifest.xml:17:1-22:12 -MERGED from [androidx.activity:activity:1.0.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\dbbcc99072b5616db9e0106b8ed65934\activity-1.0.0\AndroidManifest.xml:17:1-24:12 -MERGED from [androidx.vectordrawable:vectordrawable-animated:1.1.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\d1ca7cd3905794bed09cb92934ccd6c2\vectordrawable-animated-1.1.0\AndroidManifest.xml:17:1-24:12 -MERGED from [androidx.vectordrawable:vectordrawable:1.1.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\4276267baf989d651cf25177c247ad49\vectordrawable-1.1.0\AndroidManifest.xml:17:1-24:12 -MERGED from [androidx.customview:customview:1.0.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\a3c457ded457b98b207b4f227d629399\customview-1.0.0\AndroidManifest.xml:17:1-22:12 -MERGED from [androidx.core:core:1.1.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\e9dab9c67c1ee3668e0bbf86c6d8cbd8\core-1.1.0\AndroidManifest.xml:17:1-26:12 -MERGED from [androidx.cursoradapter:cursoradapter:1.0.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\fb2fbe77879a57ea0c5dfd6fe59ba874\cursoradapter-1.0.0\AndroidManifest.xml:17:1-22:12 -MERGED from [androidx.versionedparcelable:versionedparcelable:1.1.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\78be57497ca2a8dd090798c529f3e53d\versionedparcelable-1.1.0\AndroidManifest.xml:17:1-27:12 -MERGED from [androidx.lifecycle:lifecycle-runtime:2.1.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\ffa46f3d6480310395b7b525cf59ccde\lifecycle-runtime-2.1.0\AndroidManifest.xml:17:1-22:12 -MERGED from [androidx.lifecycle:lifecycle-viewmodel:2.1.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\64ed055c454b36433d45a77285ee24d6\lifecycle-viewmodel-2.1.0\AndroidManifest.xml:17:1-22:12 -MERGED from [androidx.savedstate:savedstate:1.0.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\3819fb4fef2e012192b32762458ba145\savedstate-1.0.0\AndroidManifest.xml:17:1-24:12 -MERGED from [androidx.interpolator:interpolator:1.0.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\3a992d8307f21a8f15eb649383ba6a6a\interpolator-1.0.0\AndroidManifest.xml:17:1-22:12 -MERGED from [androidx.lifecycle:lifecycle-livedata:2.0.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\63647da4654da12a6f2785cfbbad8123\lifecycle-livedata-2.0.0\AndroidManifest.xml:17:1-22:12 -MERGED from [androidx.lifecycle:lifecycle-livedata-core:2.0.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\733fc1d306cee2c05d3e1fb0b7527020\lifecycle-livedata-core-2.0.0\AndroidManifest.xml:17:1-22:12 -MERGED from [androidx.arch.core:core-runtime:2.0.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\fdd65d8b6066fd289a68b42931dc03a2\core-runtime-2.0.0\AndroidManifest.xml:17:1-22:12 -INJECTED from C:\androidstudio\androidprogram\Autobot\app\src\main\AndroidManifest.xml:2:1-21:12 -INJECTED from C:\androidstudio\androidprogram\Autobot\app\src\main\AndroidManifest.xml:2:1-21:12 -INJECTED from C:\androidstudio\androidprogram\Autobot\app\src\main\AndroidManifest.xml:2:1-21:12 +ADDED from /Users/crispeng/CMPUT301W20/Autobot/app/src/main/AndroidManifest.xml:2:1-21:12 +INJECTED from /Users/crispeng/CMPUT301W20/Autobot/app/src/main/AndroidManifest.xml:2:1-21:12 +INJECTED from /Users/crispeng/CMPUT301W20/Autobot/app/src/main/AndroidManifest.xml:2:1-21:12 +INJECTED from /Users/crispeng/CMPUT301W20/Autobot/app/src/main/AndroidManifest.xml:2:1-21:12 +MERGED from [androidx.appcompat:appcompat:1.1.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/6119d746697059b7e1b74aab4d181f56/appcompat-1.1.0/AndroidManifest.xml:17:1-24:12 +MERGED from [androidx.constraintlayout:constraintlayout:1.1.3] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/3ec6fa8458ddbe732478393a9f9e6c77/constraintlayout-1.1.3/AndroidManifest.xml:2:1-11:12 +MERGED from [androidx.fragment:fragment:1.1.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/0362ff4d8672321347a402c32368f192/fragment-1.1.0/AndroidManifest.xml:17:1-24:12 +MERGED from [androidx.appcompat:appcompat-resources:1.1.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/ddf6a25e6e3e5e2af441269b48288beb/appcompat-resources-1.1.0/AndroidManifest.xml:17:1-24:12 +MERGED from [androidx.drawerlayout:drawerlayout:1.0.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/00bc847ce5b9e3ce7b40d465bffbf9e9/drawerlayout-1.0.0/AndroidManifest.xml:17:1-22:12 +MERGED from [androidx.viewpager:viewpager:1.0.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/4932f7e67b26f042b51fa62f1aa4816d/viewpager-1.0.0/AndroidManifest.xml:17:1-22:12 +MERGED from [androidx.loader:loader:1.0.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/5276819c062a92c029464122749254f1/loader-1.0.0/AndroidManifest.xml:17:1-22:12 +MERGED from [androidx.activity:activity:1.0.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/dbbcc99072b5616db9e0106b8ed65934/activity-1.0.0/AndroidManifest.xml:17:1-24:12 +MERGED from [androidx.vectordrawable:vectordrawable-animated:1.1.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/d1ca7cd3905794bed09cb92934ccd6c2/vectordrawable-animated-1.1.0/AndroidManifest.xml:17:1-24:12 +MERGED from [androidx.vectordrawable:vectordrawable:1.1.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/4276267baf989d651cf25177c247ad49/vectordrawable-1.1.0/AndroidManifest.xml:17:1-24:12 +MERGED from [androidx.customview:customview:1.0.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/a3c457ded457b98b207b4f227d629399/customview-1.0.0/AndroidManifest.xml:17:1-22:12 +MERGED from [androidx.core:core:1.1.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/e9dab9c67c1ee3668e0bbf86c6d8cbd8/core-1.1.0/AndroidManifest.xml:17:1-26:12 +MERGED from [androidx.cursoradapter:cursoradapter:1.0.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/fb2fbe77879a57ea0c5dfd6fe59ba874/cursoradapter-1.0.0/AndroidManifest.xml:17:1-22:12 +MERGED from [androidx.versionedparcelable:versionedparcelable:1.1.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/78be57497ca2a8dd090798c529f3e53d/versionedparcelable-1.1.0/AndroidManifest.xml:17:1-27:12 +MERGED from [androidx.lifecycle:lifecycle-runtime:2.1.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/ffa46f3d6480310395b7b525cf59ccde/lifecycle-runtime-2.1.0/AndroidManifest.xml:17:1-22:12 +MERGED from [androidx.lifecycle:lifecycle-viewmodel:2.1.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/64ed055c454b36433d45a77285ee24d6/lifecycle-viewmodel-2.1.0/AndroidManifest.xml:17:1-22:12 +MERGED from [androidx.savedstate:savedstate:1.0.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/3819fb4fef2e012192b32762458ba145/savedstate-1.0.0/AndroidManifest.xml:17:1-24:12 +MERGED from [androidx.interpolator:interpolator:1.0.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/3a992d8307f21a8f15eb649383ba6a6a/interpolator-1.0.0/AndroidManifest.xml:17:1-22:12 +MERGED from [androidx.lifecycle:lifecycle-livedata:2.0.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/63647da4654da12a6f2785cfbbad8123/lifecycle-livedata-2.0.0/AndroidManifest.xml:17:1-22:12 +MERGED from [androidx.lifecycle:lifecycle-livedata-core:2.0.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/733fc1d306cee2c05d3e1fb0b7527020/lifecycle-livedata-core-2.0.0/AndroidManifest.xml:17:1-22:12 +MERGED from [androidx.arch.core:core-runtime:2.0.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/fdd65d8b6066fd289a68b42931dc03a2/core-runtime-2.0.0/AndroidManifest.xml:17:1-22:12 +INJECTED from /Users/crispeng/CMPUT301W20/Autobot/app/src/main/AndroidManifest.xml:2:1-21:12 +INJECTED from /Users/crispeng/CMPUT301W20/Autobot/app/src/main/AndroidManifest.xml:2:1-21:12 +INJECTED from /Users/crispeng/CMPUT301W20/Autobot/app/src/main/AndroidManifest.xml:2:1-21:12 package - ADDED from C:\androidstudio\androidprogram\Autobot\app\src\main\AndroidManifest.xml:3:5-34 - INJECTED from C:\androidstudio\androidprogram\Autobot\app\src\main\AndroidManifest.xml - INJECTED from C:\androidstudio\androidprogram\Autobot\app\src\main\AndroidManifest.xml + ADDED from /Users/crispeng/CMPUT301W20/Autobot/app/src/main/AndroidManifest.xml:3:5-34 + INJECTED from /Users/crispeng/CMPUT301W20/Autobot/app/src/main/AndroidManifest.xml + INJECTED from /Users/crispeng/CMPUT301W20/Autobot/app/src/main/AndroidManifest.xml android:versionName - INJECTED from C:\androidstudio\androidprogram\Autobot\app\src\main\AndroidManifest.xml - ADDED from C:\androidstudio\androidprogram\Autobot\app\src\main\AndroidManifest.xml:2:1-21:12 - INJECTED from C:\androidstudio\androidprogram\Autobot\app\src\main\AndroidManifest.xml + INJECTED from /Users/crispeng/CMPUT301W20/Autobot/app/src/main/AndroidManifest.xml + ADDED from /Users/crispeng/CMPUT301W20/Autobot/app/src/main/AndroidManifest.xml:2:1-21:12 + INJECTED from /Users/crispeng/CMPUT301W20/Autobot/app/src/main/AndroidManifest.xml android:versionCode - INJECTED from C:\androidstudio\androidprogram\Autobot\app\src\main\AndroidManifest.xml - ADDED from C:\androidstudio\androidprogram\Autobot\app\src\main\AndroidManifest.xml:2:1-21:12 - INJECTED from C:\androidstudio\androidprogram\Autobot\app\src\main\AndroidManifest.xml + INJECTED from /Users/crispeng/CMPUT301W20/Autobot/app/src/main/AndroidManifest.xml + ADDED from /Users/crispeng/CMPUT301W20/Autobot/app/src/main/AndroidManifest.xml:2:1-21:12 + INJECTED from /Users/crispeng/CMPUT301W20/Autobot/app/src/main/AndroidManifest.xml xmlns:android - ADDED from C:\androidstudio\androidprogram\Autobot\app\src\main\AndroidManifest.xml:2:11-69 + ADDED from /Users/crispeng/CMPUT301W20/Autobot/app/src/main/AndroidManifest.xml:2:11-69 application -ADDED from C:\androidstudio\androidprogram\Autobot\app\src\main\AndroidManifest.xml:5:5-19:19 -MERGED from [androidx.constraintlayout:constraintlayout:1.1.3] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\3ec6fa8458ddbe732478393a9f9e6c77\constraintlayout-1.1.3\AndroidManifest.xml:9:5-20 -MERGED from [androidx.constraintlayout:constraintlayout:1.1.3] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\3ec6fa8458ddbe732478393a9f9e6c77\constraintlayout-1.1.3\AndroidManifest.xml:9:5-20 -MERGED from [androidx.core:core:1.1.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\e9dab9c67c1ee3668e0bbf86c6d8cbd8\core-1.1.0\AndroidManifest.xml:24:5-89 -MERGED from [androidx.core:core:1.1.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\e9dab9c67c1ee3668e0bbf86c6d8cbd8\core-1.1.0\AndroidManifest.xml:24:5-89 -MERGED from [androidx.versionedparcelable:versionedparcelable:1.1.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\78be57497ca2a8dd090798c529f3e53d\versionedparcelable-1.1.0\AndroidManifest.xml:24:5-25:19 -MERGED from [androidx.versionedparcelable:versionedparcelable:1.1.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\78be57497ca2a8dd090798c529f3e53d\versionedparcelable-1.1.0\AndroidManifest.xml:24:5-25:19 +ADDED from /Users/crispeng/CMPUT301W20/Autobot/app/src/main/AndroidManifest.xml:5:5-19:19 +MERGED from [androidx.constraintlayout:constraintlayout:1.1.3] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/3ec6fa8458ddbe732478393a9f9e6c77/constraintlayout-1.1.3/AndroidManifest.xml:9:5-20 +MERGED from [androidx.constraintlayout:constraintlayout:1.1.3] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/3ec6fa8458ddbe732478393a9f9e6c77/constraintlayout-1.1.3/AndroidManifest.xml:9:5-20 +MERGED from [androidx.core:core:1.1.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/e9dab9c67c1ee3668e0bbf86c6d8cbd8/core-1.1.0/AndroidManifest.xml:24:5-89 +MERGED from [androidx.core:core:1.1.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/e9dab9c67c1ee3668e0bbf86c6d8cbd8/core-1.1.0/AndroidManifest.xml:24:5-89 +MERGED from [androidx.versionedparcelable:versionedparcelable:1.1.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/78be57497ca2a8dd090798c529f3e53d/versionedparcelable-1.1.0/AndroidManifest.xml:24:5-25:19 +MERGED from [androidx.versionedparcelable:versionedparcelable:1.1.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/78be57497ca2a8dd090798c529f3e53d/versionedparcelable-1.1.0/AndroidManifest.xml:24:5-25:19 android:appComponentFactory - ADDED from [androidx.core:core:1.1.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\e9dab9c67c1ee3668e0bbf86c6d8cbd8\core-1.1.0\AndroidManifest.xml:24:18-86 + ADDED from [androidx.core:core:1.1.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/e9dab9c67c1ee3668e0bbf86c6d8cbd8/core-1.1.0/AndroidManifest.xml:24:18-86 android:supportsRtl - ADDED from C:\androidstudio\androidprogram\Autobot\app\src\main\AndroidManifest.xml:10:9-35 + ADDED from /Users/crispeng/CMPUT301W20/Autobot/app/src/main/AndroidManifest.xml:10:9-35 android:label - ADDED from C:\androidstudio\androidprogram\Autobot\app\src\main\AndroidManifest.xml:8:9-41 + ADDED from /Users/crispeng/CMPUT301W20/Autobot/app/src/main/AndroidManifest.xml:8:9-41 android:roundIcon - ADDED from C:\androidstudio\androidprogram\Autobot\app\src\main\AndroidManifest.xml:9:9-54 + ADDED from /Users/crispeng/CMPUT301W20/Autobot/app/src/main/AndroidManifest.xml:9:9-54 android:icon - ADDED from C:\androidstudio\androidprogram\Autobot\app\src\main\AndroidManifest.xml:7:9-43 + ADDED from /Users/crispeng/CMPUT301W20/Autobot/app/src/main/AndroidManifest.xml:7:9-43 android:allowBackup - ADDED from C:\androidstudio\androidprogram\Autobot\app\src\main\AndroidManifest.xml:6:9-35 + ADDED from /Users/crispeng/CMPUT301W20/Autobot/app/src/main/AndroidManifest.xml:6:9-35 android:theme - ADDED from C:\androidstudio\androidprogram\Autobot\app\src\main\AndroidManifest.xml:11:9-40 + ADDED from /Users/crispeng/CMPUT301W20/Autobot/app/src/main/AndroidManifest.xml:11:9-40 activity#com.example.autobot.MainActivity -ADDED from C:\androidstudio\androidprogram\Autobot\app\src\main\AndroidManifest.xml:12:9-18:20 +ADDED from /Users/crispeng/CMPUT301W20/Autobot/app/src/main/AndroidManifest.xml:12:9-18:20 android:name - ADDED from C:\androidstudio\androidprogram\Autobot\app\src\main\AndroidManifest.xml:12:19-47 + ADDED from /Users/crispeng/CMPUT301W20/Autobot/app/src/main/AndroidManifest.xml:12:19-47 intent-filter#action:name:android.intent.action.MAIN+category:name:android.intent.category.LAUNCHER -ADDED from C:\androidstudio\androidprogram\Autobot\app\src\main\AndroidManifest.xml:13:13-17:29 +ADDED from /Users/crispeng/CMPUT301W20/Autobot/app/src/main/AndroidManifest.xml:13:13-17:29 action#android.intent.action.MAIN -ADDED from C:\androidstudio\androidprogram\Autobot\app\src\main\AndroidManifest.xml:14:17-69 +ADDED from /Users/crispeng/CMPUT301W20/Autobot/app/src/main/AndroidManifest.xml:14:17-69 android:name - ADDED from C:\androidstudio\androidprogram\Autobot\app\src\main\AndroidManifest.xml:14:25-66 + ADDED from /Users/crispeng/CMPUT301W20/Autobot/app/src/main/AndroidManifest.xml:14:25-66 category#android.intent.category.LAUNCHER -ADDED from C:\androidstudio\androidprogram\Autobot\app\src\main\AndroidManifest.xml:16:17-77 +ADDED from /Users/crispeng/CMPUT301W20/Autobot/app/src/main/AndroidManifest.xml:16:17-77 android:name - ADDED from C:\androidstudio\androidprogram\Autobot\app\src\main\AndroidManifest.xml:16:27-74 + ADDED from /Users/crispeng/CMPUT301W20/Autobot/app/src/main/AndroidManifest.xml:16:27-74 uses-sdk -INJECTED from C:\androidstudio\androidprogram\Autobot\app\src\main\AndroidManifest.xml reason: use-sdk injection requested -INJECTED from C:\androidstudio\androidprogram\Autobot\app\src\main\AndroidManifest.xml -INJECTED from C:\androidstudio\androidprogram\Autobot\app\src\main\AndroidManifest.xml -MERGED from [androidx.appcompat:appcompat:1.1.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\6119d746697059b7e1b74aab4d181f56\appcompat-1.1.0\AndroidManifest.xml:20:5-22:41 -MERGED from [androidx.appcompat:appcompat:1.1.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\6119d746697059b7e1b74aab4d181f56\appcompat-1.1.0\AndroidManifest.xml:20:5-22:41 -MERGED from [androidx.constraintlayout:constraintlayout:1.1.3] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\3ec6fa8458ddbe732478393a9f9e6c77\constraintlayout-1.1.3\AndroidManifest.xml:5:5-7:41 -MERGED from [androidx.constraintlayout:constraintlayout:1.1.3] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\3ec6fa8458ddbe732478393a9f9e6c77\constraintlayout-1.1.3\AndroidManifest.xml:5:5-7:41 -MERGED from [androidx.fragment:fragment:1.1.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\0362ff4d8672321347a402c32368f192\fragment-1.1.0\AndroidManifest.xml:20:5-22:41 -MERGED from [androidx.fragment:fragment:1.1.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\0362ff4d8672321347a402c32368f192\fragment-1.1.0\AndroidManifest.xml:20:5-22:41 -MERGED from [androidx.appcompat:appcompat-resources:1.1.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\ddf6a25e6e3e5e2af441269b48288beb\appcompat-resources-1.1.0\AndroidManifest.xml:20:5-22:41 -MERGED from [androidx.appcompat:appcompat-resources:1.1.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\ddf6a25e6e3e5e2af441269b48288beb\appcompat-resources-1.1.0\AndroidManifest.xml:20:5-22:41 -MERGED from [androidx.drawerlayout:drawerlayout:1.0.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\00bc847ce5b9e3ce7b40d465bffbf9e9\drawerlayout-1.0.0\AndroidManifest.xml:20:5-44 -MERGED from [androidx.drawerlayout:drawerlayout:1.0.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\00bc847ce5b9e3ce7b40d465bffbf9e9\drawerlayout-1.0.0\AndroidManifest.xml:20:5-44 -MERGED from [androidx.viewpager:viewpager:1.0.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\4932f7e67b26f042b51fa62f1aa4816d\viewpager-1.0.0\AndroidManifest.xml:20:5-44 -MERGED from [androidx.viewpager:viewpager:1.0.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\4932f7e67b26f042b51fa62f1aa4816d\viewpager-1.0.0\AndroidManifest.xml:20:5-44 -MERGED from [androidx.loader:loader:1.0.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\5276819c062a92c029464122749254f1\loader-1.0.0\AndroidManifest.xml:20:5-44 -MERGED from [androidx.loader:loader:1.0.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\5276819c062a92c029464122749254f1\loader-1.0.0\AndroidManifest.xml:20:5-44 -MERGED from [androidx.activity:activity:1.0.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\dbbcc99072b5616db9e0106b8ed65934\activity-1.0.0\AndroidManifest.xml:20:5-22:41 -MERGED from [androidx.activity:activity:1.0.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\dbbcc99072b5616db9e0106b8ed65934\activity-1.0.0\AndroidManifest.xml:20:5-22:41 -MERGED from [androidx.vectordrawable:vectordrawable-animated:1.1.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\d1ca7cd3905794bed09cb92934ccd6c2\vectordrawable-animated-1.1.0\AndroidManifest.xml:20:5-22:41 -MERGED from [androidx.vectordrawable:vectordrawable-animated:1.1.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\d1ca7cd3905794bed09cb92934ccd6c2\vectordrawable-animated-1.1.0\AndroidManifest.xml:20:5-22:41 -MERGED from [androidx.vectordrawable:vectordrawable:1.1.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\4276267baf989d651cf25177c247ad49\vectordrawable-1.1.0\AndroidManifest.xml:20:5-22:41 -MERGED from [androidx.vectordrawable:vectordrawable:1.1.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\4276267baf989d651cf25177c247ad49\vectordrawable-1.1.0\AndroidManifest.xml:20:5-22:41 -MERGED from [androidx.customview:customview:1.0.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\a3c457ded457b98b207b4f227d629399\customview-1.0.0\AndroidManifest.xml:20:5-44 -MERGED from [androidx.customview:customview:1.0.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\a3c457ded457b98b207b4f227d629399\customview-1.0.0\AndroidManifest.xml:20:5-44 -MERGED from [androidx.core:core:1.1.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\e9dab9c67c1ee3668e0bbf86c6d8cbd8\core-1.1.0\AndroidManifest.xml:20:5-22:41 -MERGED from [androidx.core:core:1.1.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\e9dab9c67c1ee3668e0bbf86c6d8cbd8\core-1.1.0\AndroidManifest.xml:20:5-22:41 -MERGED from [androidx.cursoradapter:cursoradapter:1.0.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\fb2fbe77879a57ea0c5dfd6fe59ba874\cursoradapter-1.0.0\AndroidManifest.xml:20:5-44 -MERGED from [androidx.cursoradapter:cursoradapter:1.0.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\fb2fbe77879a57ea0c5dfd6fe59ba874\cursoradapter-1.0.0\AndroidManifest.xml:20:5-44 -MERGED from [androidx.versionedparcelable:versionedparcelable:1.1.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\78be57497ca2a8dd090798c529f3e53d\versionedparcelable-1.1.0\AndroidManifest.xml:20:5-22:41 -MERGED from [androidx.versionedparcelable:versionedparcelable:1.1.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\78be57497ca2a8dd090798c529f3e53d\versionedparcelable-1.1.0\AndroidManifest.xml:20:5-22:41 -MERGED from [androidx.lifecycle:lifecycle-runtime:2.1.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\ffa46f3d6480310395b7b525cf59ccde\lifecycle-runtime-2.1.0\AndroidManifest.xml:20:5-44 -MERGED from [androidx.lifecycle:lifecycle-runtime:2.1.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\ffa46f3d6480310395b7b525cf59ccde\lifecycle-runtime-2.1.0\AndroidManifest.xml:20:5-44 -MERGED from [androidx.lifecycle:lifecycle-viewmodel:2.1.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\64ed055c454b36433d45a77285ee24d6\lifecycle-viewmodel-2.1.0\AndroidManifest.xml:20:5-44 -MERGED from [androidx.lifecycle:lifecycle-viewmodel:2.1.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\64ed055c454b36433d45a77285ee24d6\lifecycle-viewmodel-2.1.0\AndroidManifest.xml:20:5-44 -MERGED from [androidx.savedstate:savedstate:1.0.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\3819fb4fef2e012192b32762458ba145\savedstate-1.0.0\AndroidManifest.xml:20:5-22:41 -MERGED from [androidx.savedstate:savedstate:1.0.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\3819fb4fef2e012192b32762458ba145\savedstate-1.0.0\AndroidManifest.xml:20:5-22:41 -MERGED from [androidx.interpolator:interpolator:1.0.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\3a992d8307f21a8f15eb649383ba6a6a\interpolator-1.0.0\AndroidManifest.xml:20:5-44 -MERGED from [androidx.interpolator:interpolator:1.0.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\3a992d8307f21a8f15eb649383ba6a6a\interpolator-1.0.0\AndroidManifest.xml:20:5-44 -MERGED from [androidx.lifecycle:lifecycle-livedata:2.0.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\63647da4654da12a6f2785cfbbad8123\lifecycle-livedata-2.0.0\AndroidManifest.xml:20:5-44 -MERGED from [androidx.lifecycle:lifecycle-livedata:2.0.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\63647da4654da12a6f2785cfbbad8123\lifecycle-livedata-2.0.0\AndroidManifest.xml:20:5-44 -MERGED from [androidx.lifecycle:lifecycle-livedata-core:2.0.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\733fc1d306cee2c05d3e1fb0b7527020\lifecycle-livedata-core-2.0.0\AndroidManifest.xml:20:5-44 -MERGED from [androidx.lifecycle:lifecycle-livedata-core:2.0.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\733fc1d306cee2c05d3e1fb0b7527020\lifecycle-livedata-core-2.0.0\AndroidManifest.xml:20:5-44 -MERGED from [androidx.arch.core:core-runtime:2.0.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\fdd65d8b6066fd289a68b42931dc03a2\core-runtime-2.0.0\AndroidManifest.xml:20:5-44 -MERGED from [androidx.arch.core:core-runtime:2.0.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\fdd65d8b6066fd289a68b42931dc03a2\core-runtime-2.0.0\AndroidManifest.xml:20:5-44 -INJECTED from C:\androidstudio\androidprogram\Autobot\app\src\main\AndroidManifest.xml -INJECTED from C:\androidstudio\androidprogram\Autobot\app\src\main\AndroidManifest.xml +INJECTED from /Users/crispeng/CMPUT301W20/Autobot/app/src/main/AndroidManifest.xml reason: use-sdk injection requested +INJECTED from /Users/crispeng/CMPUT301W20/Autobot/app/src/main/AndroidManifest.xml +INJECTED from /Users/crispeng/CMPUT301W20/Autobot/app/src/main/AndroidManifest.xml +MERGED from [androidx.appcompat:appcompat:1.1.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/6119d746697059b7e1b74aab4d181f56/appcompat-1.1.0/AndroidManifest.xml:20:5-22:41 +MERGED from [androidx.appcompat:appcompat:1.1.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/6119d746697059b7e1b74aab4d181f56/appcompat-1.1.0/AndroidManifest.xml:20:5-22:41 +MERGED from [androidx.constraintlayout:constraintlayout:1.1.3] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/3ec6fa8458ddbe732478393a9f9e6c77/constraintlayout-1.1.3/AndroidManifest.xml:5:5-7:41 +MERGED from [androidx.constraintlayout:constraintlayout:1.1.3] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/3ec6fa8458ddbe732478393a9f9e6c77/constraintlayout-1.1.3/AndroidManifest.xml:5:5-7:41 +MERGED from [androidx.fragment:fragment:1.1.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/0362ff4d8672321347a402c32368f192/fragment-1.1.0/AndroidManifest.xml:20:5-22:41 +MERGED from [androidx.fragment:fragment:1.1.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/0362ff4d8672321347a402c32368f192/fragment-1.1.0/AndroidManifest.xml:20:5-22:41 +MERGED from [androidx.appcompat:appcompat-resources:1.1.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/ddf6a25e6e3e5e2af441269b48288beb/appcompat-resources-1.1.0/AndroidManifest.xml:20:5-22:41 +MERGED from [androidx.appcompat:appcompat-resources:1.1.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/ddf6a25e6e3e5e2af441269b48288beb/appcompat-resources-1.1.0/AndroidManifest.xml:20:5-22:41 +MERGED from [androidx.drawerlayout:drawerlayout:1.0.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/00bc847ce5b9e3ce7b40d465bffbf9e9/drawerlayout-1.0.0/AndroidManifest.xml:20:5-44 +MERGED from [androidx.drawerlayout:drawerlayout:1.0.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/00bc847ce5b9e3ce7b40d465bffbf9e9/drawerlayout-1.0.0/AndroidManifest.xml:20:5-44 +MERGED from [androidx.viewpager:viewpager:1.0.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/4932f7e67b26f042b51fa62f1aa4816d/viewpager-1.0.0/AndroidManifest.xml:20:5-44 +MERGED from [androidx.viewpager:viewpager:1.0.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/4932f7e67b26f042b51fa62f1aa4816d/viewpager-1.0.0/AndroidManifest.xml:20:5-44 +MERGED from [androidx.loader:loader:1.0.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/5276819c062a92c029464122749254f1/loader-1.0.0/AndroidManifest.xml:20:5-44 +MERGED from [androidx.loader:loader:1.0.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/5276819c062a92c029464122749254f1/loader-1.0.0/AndroidManifest.xml:20:5-44 +MERGED from [androidx.activity:activity:1.0.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/dbbcc99072b5616db9e0106b8ed65934/activity-1.0.0/AndroidManifest.xml:20:5-22:41 +MERGED from [androidx.activity:activity:1.0.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/dbbcc99072b5616db9e0106b8ed65934/activity-1.0.0/AndroidManifest.xml:20:5-22:41 +MERGED from [androidx.vectordrawable:vectordrawable-animated:1.1.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/d1ca7cd3905794bed09cb92934ccd6c2/vectordrawable-animated-1.1.0/AndroidManifest.xml:20:5-22:41 +MERGED from [androidx.vectordrawable:vectordrawable-animated:1.1.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/d1ca7cd3905794bed09cb92934ccd6c2/vectordrawable-animated-1.1.0/AndroidManifest.xml:20:5-22:41 +MERGED from [androidx.vectordrawable:vectordrawable:1.1.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/4276267baf989d651cf25177c247ad49/vectordrawable-1.1.0/AndroidManifest.xml:20:5-22:41 +MERGED from [androidx.vectordrawable:vectordrawable:1.1.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/4276267baf989d651cf25177c247ad49/vectordrawable-1.1.0/AndroidManifest.xml:20:5-22:41 +MERGED from [androidx.customview:customview:1.0.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/a3c457ded457b98b207b4f227d629399/customview-1.0.0/AndroidManifest.xml:20:5-44 +MERGED from [androidx.customview:customview:1.0.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/a3c457ded457b98b207b4f227d629399/customview-1.0.0/AndroidManifest.xml:20:5-44 +MERGED from [androidx.core:core:1.1.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/e9dab9c67c1ee3668e0bbf86c6d8cbd8/core-1.1.0/AndroidManifest.xml:20:5-22:41 +MERGED from [androidx.core:core:1.1.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/e9dab9c67c1ee3668e0bbf86c6d8cbd8/core-1.1.0/AndroidManifest.xml:20:5-22:41 +MERGED from [androidx.cursoradapter:cursoradapter:1.0.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/fb2fbe77879a57ea0c5dfd6fe59ba874/cursoradapter-1.0.0/AndroidManifest.xml:20:5-44 +MERGED from [androidx.cursoradapter:cursoradapter:1.0.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/fb2fbe77879a57ea0c5dfd6fe59ba874/cursoradapter-1.0.0/AndroidManifest.xml:20:5-44 +MERGED from [androidx.versionedparcelable:versionedparcelable:1.1.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/78be57497ca2a8dd090798c529f3e53d/versionedparcelable-1.1.0/AndroidManifest.xml:20:5-22:41 +MERGED from [androidx.versionedparcelable:versionedparcelable:1.1.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/78be57497ca2a8dd090798c529f3e53d/versionedparcelable-1.1.0/AndroidManifest.xml:20:5-22:41 +MERGED from [androidx.lifecycle:lifecycle-runtime:2.1.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/ffa46f3d6480310395b7b525cf59ccde/lifecycle-runtime-2.1.0/AndroidManifest.xml:20:5-44 +MERGED from [androidx.lifecycle:lifecycle-runtime:2.1.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/ffa46f3d6480310395b7b525cf59ccde/lifecycle-runtime-2.1.0/AndroidManifest.xml:20:5-44 +MERGED from [androidx.lifecycle:lifecycle-viewmodel:2.1.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/64ed055c454b36433d45a77285ee24d6/lifecycle-viewmodel-2.1.0/AndroidManifest.xml:20:5-44 +MERGED from [androidx.lifecycle:lifecycle-viewmodel:2.1.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/64ed055c454b36433d45a77285ee24d6/lifecycle-viewmodel-2.1.0/AndroidManifest.xml:20:5-44 +MERGED from [androidx.savedstate:savedstate:1.0.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/3819fb4fef2e012192b32762458ba145/savedstate-1.0.0/AndroidManifest.xml:20:5-22:41 +MERGED from [androidx.savedstate:savedstate:1.0.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/3819fb4fef2e012192b32762458ba145/savedstate-1.0.0/AndroidManifest.xml:20:5-22:41 +MERGED from [androidx.interpolator:interpolator:1.0.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/3a992d8307f21a8f15eb649383ba6a6a/interpolator-1.0.0/AndroidManifest.xml:20:5-44 +MERGED from [androidx.interpolator:interpolator:1.0.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/3a992d8307f21a8f15eb649383ba6a6a/interpolator-1.0.0/AndroidManifest.xml:20:5-44 +MERGED from [androidx.lifecycle:lifecycle-livedata:2.0.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/63647da4654da12a6f2785cfbbad8123/lifecycle-livedata-2.0.0/AndroidManifest.xml:20:5-44 +MERGED from [androidx.lifecycle:lifecycle-livedata:2.0.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/63647da4654da12a6f2785cfbbad8123/lifecycle-livedata-2.0.0/AndroidManifest.xml:20:5-44 +MERGED from [androidx.lifecycle:lifecycle-livedata-core:2.0.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/733fc1d306cee2c05d3e1fb0b7527020/lifecycle-livedata-core-2.0.0/AndroidManifest.xml:20:5-44 +MERGED from [androidx.lifecycle:lifecycle-livedata-core:2.0.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/733fc1d306cee2c05d3e1fb0b7527020/lifecycle-livedata-core-2.0.0/AndroidManifest.xml:20:5-44 +MERGED from [androidx.arch.core:core-runtime:2.0.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/fdd65d8b6066fd289a68b42931dc03a2/core-runtime-2.0.0/AndroidManifest.xml:20:5-44 +MERGED from [androidx.arch.core:core-runtime:2.0.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/fdd65d8b6066fd289a68b42931dc03a2/core-runtime-2.0.0/AndroidManifest.xml:20:5-44 +INJECTED from /Users/crispeng/CMPUT301W20/Autobot/app/src/main/AndroidManifest.xml +INJECTED from /Users/crispeng/CMPUT301W20/Autobot/app/src/main/AndroidManifest.xml android:targetSdkVersion - INJECTED from C:\androidstudio\androidprogram\Autobot\app\src\main\AndroidManifest.xml - ADDED from C:\androidstudio\androidprogram\Autobot\app\src\main\AndroidManifest.xml - INJECTED from C:\androidstudio\androidprogram\Autobot\app\src\main\AndroidManifest.xml + INJECTED from /Users/crispeng/CMPUT301W20/Autobot/app/src/main/AndroidManifest.xml + ADDED from /Users/crispeng/CMPUT301W20/Autobot/app/src/main/AndroidManifest.xml + INJECTED from /Users/crispeng/CMPUT301W20/Autobot/app/src/main/AndroidManifest.xml android:minSdkVersion - INJECTED from C:\androidstudio\androidprogram\Autobot\app\src\main\AndroidManifest.xml - ADDED from C:\androidstudio\androidprogram\Autobot\app\src\main\AndroidManifest.xml - INJECTED from C:\androidstudio\androidprogram\Autobot\app\src\main\AndroidManifest.xml + INJECTED from /Users/crispeng/CMPUT301W20/Autobot/app/src/main/AndroidManifest.xml + ADDED from /Users/crispeng/CMPUT301W20/Autobot/app/src/main/AndroidManifest.xml + INJECTED from /Users/crispeng/CMPUT301W20/Autobot/app/src/main/AndroidManifest.xml diff --git a/Autobot/app/src/main/java/com/example/autobot/Triangle.java b/Autobot/app/src/main/java/com/example/autobot/Triangle.java new file mode 100644 index 0000000..1656136 --- /dev/null +++ b/Autobot/app/src/main/java/com/example/autobot/Triangle.java @@ -0,0 +1,4 @@ +package com.example.autobot; + +public class Triangle extends Shape { +} diff --git a/Autobot/local.properties b/Autobot/local.properties index e77eb5e..dbd2e7b 100644 --- a/Autobot/local.properties +++ b/Autobot/local.properties @@ -1,10 +1,8 @@ -## This file is automatically generated by Android Studio. -# Do not modify this file -- YOUR CHANGES WILL BE ERASED! -# -# This file should *NOT* be checked into Version Control Systems, -# as it contains information specific to your local configuration. -# -# Location of the SDK. This is only used by Gradle. -# For customization when using a Version Control System, please read the -# header note. -sdk.dir=C\:\\androidstudio\\sdk +## This file must *NOT* be checked into Version Control Systems, +# as it contains information specific to your local configuration. +# +# Location of the SDK. This is only used by Gradle. +# For customization when using a Version Control System, please read the +# header note. +#Tue Feb 04 19:10:12 MST 2020 +sdk.dir=/Users/crispeng/Library/Android/sdk