Skip to content

Commit c950cfd

Browse files
committed
updated Plugin to support androidX dependencies
1 parent 73850f7 commit c950cfd

File tree

776 files changed

+275
-98
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

776 files changed

+275
-98
lines changed

UnitySpeechRecognizer/Assets/Plugins/Android/AndroidManifest.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,10 @@
3232
</activity>
3333
<activity
3434
android:name="com.unity3d.player.UnityPlayerActivity"
35-
android:configChanges="fontScale|keyboard|keyboardHidden|locale|mnc|mcc|navigation|orientation|screenLayout|screenSize|smallestScreenSize|uiMode|touchscreen"
3635
android:label="@string/app_name" >
3736
</activity>
3837
<activity
3938
android:name="com.unity3d.player.UnityPlayerNativeActivity"
40-
android:configChanges="fontScale|keyboard|keyboardHidden|locale|mnc|mcc|navigation|orientation|screenLayout|screenSize|smallestScreenSize|uiMode|touchscreen"
4139
android:label="@string/app_name" >
4240
<meta-data
4341
android:name="android.app.lib_name"
-8 Bytes
Binary file not shown.

UnitySpeechRecognizer/Assets/Plugins/Android/libs.meta

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Binary file not shown.

UnitySpeechRecognizer/Assets/Plugins/Android/libs/support-v4-24.1.1.aar.meta renamed to UnitySpeechRecognizer/Assets/Plugins/Android/libs/core-1.3.1.aar.meta

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Binary file not shown.

UnitySpeechRecognizer/Library/CurrentLayout.dwlt

Lines changed: 47 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@ MonoBehaviour:
3838
m_Children: []
3939
m_Position:
4040
serializedVersion: 2
41-
x: 452
41+
x: 483
4242
y: 0
43-
width: 685
43+
width: 307
4444
height: 947
4545
m_MinSize: {x: 204, y: 222}
4646
m_MaxSize: {x: 4004, y: 4022}
@@ -64,9 +64,9 @@ MonoBehaviour:
6464
m_Children: []
6565
m_Position:
6666
serializedVersion: 2
67-
x: 251
67+
x: 445
6868
y: 0
69-
width: 204
69+
width: 357
7070
height: 631
7171
m_MinSize: {x: 204, y: 222}
7272
m_MaxSize: {x: 4004, y: 4022}
@@ -94,12 +94,12 @@ MonoBehaviour:
9494
serializedVersion: 2
9595
x: 0
9696
y: 0
97-
width: 455
97+
width: 802
9898
height: 631
9999
m_MinSize: {x: 438, y: 272}
100100
m_MaxSize: {x: 14008, y: 10022}
101101
vertical: 0
102-
controlID: 131
102+
controlID: 113
103103
--- !u!114 &5
104104
MonoBehaviour:
105105
m_ObjectHideFlags: 52
@@ -117,7 +117,7 @@ MonoBehaviour:
117117
serializedVersion: 2
118118
x: 0
119119
y: 631
120-
width: 455
120+
width: 802
121121
height: 316
122122
m_MinSize: {x: 104, y: 122}
123123
m_MaxSize: {x: 4004, y: 4022}
@@ -146,14 +146,14 @@ MonoBehaviour:
146146
- {fileID: 5}
147147
m_Position:
148148
serializedVersion: 2
149-
x: 1137
149+
x: 790
150150
y: 0
151-
width: 455
151+
width: 802
152152
height: 947
153153
m_MinSize: {x: 438, y: 394}
154154
m_MaxSize: {x: 14008, y: 14044}
155155
vertical: 1
156-
controlID: 130
156+
controlID: 112
157157
--- !u!114 &7
158158
MonoBehaviour:
159159
m_ObjectHideFlags: 52
@@ -171,7 +171,7 @@ MonoBehaviour:
171171
serializedVersion: 2
172172
x: 0
173173
y: 0
174-
width: 251
174+
width: 445
175175
height: 631
176176
m_MinSize: {x: 234, y: 272}
177177
m_MaxSize: {x: 10004, y: 10022}
@@ -273,7 +273,7 @@ MonoBehaviour:
273273
m_MinSize: {x: 1121, y: 394}
274274
m_MaxSize: {x: 26016, y: 14044}
275275
vertical: 0
276-
controlID: 124
276+
controlID: 169
277277
--- !u!114 &12
278278
MonoBehaviour:
279279
m_ObjectHideFlags: 52
@@ -291,7 +291,7 @@ MonoBehaviour:
291291
serializedVersion: 2
292292
x: 0
293293
y: 0
294-
width: 452
294+
width: 483
295295
height: 947
296296
m_MinSize: {x: 202, y: 222}
297297
m_MaxSize: {x: 4002, y: 4022}
@@ -351,9 +351,9 @@ MonoBehaviour:
351351
m_Tooltip:
352352
m_Pos:
353353
serializedVersion: 2
354-
x: 1137
354+
x: 790
355355
y: 73
356-
width: 249
356+
width: 443
357357
height: 612
358358
m_ViewDataDictionary: {fileID: 0}
359359
m_SearchFilter:
@@ -379,9 +379,9 @@ MonoBehaviour:
379379
m_IsLocked: 0
380380
m_FolderTreeState:
381381
scrollPos: {x: 0, y: 0}
382-
m_SelectedIDs: ce2a0000
383-
m_LastClickedID: 10958
384-
m_ExpandedIDs: 00000000ce2a0000
382+
m_SelectedIDs: d22a0000
383+
m_LastClickedID: 10962
384+
m_ExpandedIDs: 00000000d22a0000de2b0000da2c0000
385385
m_RenameOverlay:
386386
m_UserAcceptedRename: 0
387387
m_Name:
@@ -409,7 +409,7 @@ MonoBehaviour:
409409
scrollPos: {x: 0, y: 742}
410410
m_SelectedIDs:
411411
m_LastClickedID: 0
412-
m_ExpandedIDs: 00000000ce2a0000
412+
m_ExpandedIDs: 00000000d22a0000
413413
m_RenameOverlay:
414414
m_UserAcceptedRename: 0
415415
m_Name:
@@ -436,22 +436,22 @@ MonoBehaviour:
436436
m_ListAreaState:
437437
m_SelectedInstanceIDs:
438438
m_LastClickedInstanceID: 0
439-
m_HadKeyboardFocusLastEvent: 0
439+
m_HadKeyboardFocusLastEvent: 1
440440
m_ExpandedInstanceIDs: 8a270000bc2700008e2700003454f8ff78060000bc28000060290000a42700004c39000018380000e631000046c6f9ff7e26fcffca2a0000d42800004a2e00001e330000a84100006e290000d02a00000e2f0000d82f0000ac2a0000b42c0000322e0000fa290000fe290000362e00005c2c000062b00000c82f00005e2b00009ed4ecff842d0000faa80200e62e0000d62f000020300000e82c0000b02a0000542e00004a330000542d0000282b00009e280000a0300000442b0000242b000072300000988efeff622c000016280000ce4000001e4200009e2d000074300000a2250000f83600004e2c0000f22d000026360000082f00009a3f0000e42d0000dc2c00000e380000263f0000443200007e3a0000a23a00006a3a0000923e000000000000
441441
m_RenameOverlay:
442442
m_UserAcceptedRename: 0
443-
m_Name:
444-
m_OriginalName:
443+
m_Name: libs
444+
m_OriginalName: libs
445445
m_EditFieldRect:
446446
serializedVersion: 2
447447
x: 0
448448
y: 0
449449
width: 0
450450
height: 0
451-
m_UserData: 0
451+
m_UserData: 13388
452452
m_IsWaitingForDelay: 0
453453
m_IsRenaming: 0
454-
m_OriginalEventType: 11
454+
m_OriginalEventType: 0
455455
m_IsRenamingFilename: 1
456456
m_ClientGUIView: {fileID: 7}
457457
m_CreateAssetUtility:
@@ -513,24 +513,24 @@ MonoBehaviour:
513513
serializedVersion: 2
514514
x: 0
515515
y: 73
516-
width: 452
516+
width: 483
517517
height: 928
518518
m_ViewDataDictionary: {fileID: 0}
519519
m_VSyncEnabled: 0
520520
m_MaximizeOnPlay: 0
521521
m_Gizmos: 0
522522
m_Stats: 0
523-
m_SelectedSizes: 0d000000000000000000000015000000000000000000000000000000000000000000000000000000
523+
m_SelectedSizes: 0d000000000000000000000012000000000000000000000000000000000000000000000000000000
524524
m_TargetDisplay: 0
525525
m_ZoomArea:
526526
m_HRangeLocked: 0
527527
m_VRangeLocked: 0
528528
hZoomLockedByDefault: 0
529529
vZoomLockedByDefault: 0
530-
m_HBaseRangeMin: -180
531-
m_HBaseRangeMax: 180
532-
m_VBaseRangeMin: -320
533-
m_VBaseRangeMax: 320
530+
m_HBaseRangeMin: -540
531+
m_HBaseRangeMax: 540
532+
m_VBaseRangeMin: -1123
533+
m_VBaseRangeMax: 1123
534534
m_HAllowExceedBaseRangeMin: 1
535535
m_HAllowExceedBaseRangeMax: 1
536536
m_VAllowExceedBaseRangeMin: 1
@@ -548,25 +548,25 @@ MonoBehaviour:
548548
serializedVersion: 2
549549
x: 0
550550
y: 17
551-
width: 452
551+
width: 483
552552
height: 911
553-
m_Scale: {x: 1, y: 1}
554-
m_Translation: {x: 226, y: 455.5}
553+
m_Scale: {x: 0.40560994, y: 0.40560997}
554+
m_Translation: {x: 241.49998, y: 455.5}
555555
m_MarginLeft: 0
556556
m_MarginRight: 0
557557
m_MarginTop: 0
558558
m_MarginBottom: 0
559559
m_LastShownAreaInsideMargins:
560560
serializedVersion: 2
561-
x: -226
562-
y: -455.5
563-
width: 452
564-
height: 911
561+
x: -595.3996
562+
y: -1123
563+
width: 1190.7992
564+
height: 2246
565565
m_MinimalGUI: 1
566-
m_defaultScale: 1
566+
m_defaultScale: 0.40560997
567567
m_TargetTexture: {fileID: 0}
568568
m_CurrentColorSpace: 0
569-
m_LastWindowPixelSize: {x: 452, y: 928}
569+
m_LastWindowPixelSize: {x: 483, y: 928}
570570
m_ClearInEditMode: 1
571571
m_NoCameraWarning: 1
572572
m_LowResolutionForAspectRatios: 01000001000100000100
@@ -592,9 +592,9 @@ MonoBehaviour:
592592
m_Tooltip:
593593
m_Pos:
594594
serializedVersion: 2
595-
x: 452
595+
x: 483
596596
y: 73
597-
width: 683
597+
width: 305
598598
height: 928
599599
m_ViewDataDictionary: {fileID: 0}
600600
m_ShowContextualTools: 0
@@ -690,17 +690,17 @@ MonoBehaviour:
690690
m_Tooltip:
691691
m_Pos:
692692
serializedVersion: 2
693-
x: 1388
693+
x: 1235
694694
y: 73
695-
width: 202
695+
width: 355
696696
height: 612
697697
m_ViewDataDictionary: {fileID: 0}
698698
m_SceneHierarchy:
699699
m_TreeViewState:
700700
scrollPos: {x: 0, y: 0}
701-
m_SelectedIDs:
701+
m_SelectedIDs: d22a0000
702702
m_LastClickedID: 0
703-
m_ExpandedIDs: 8efbffff
703+
m_ExpandedIDs: 0cf3ffff4cf3ffff60f3ffff72f4ffffb2f4ffffc6f4ffffacf5ffffecf5ffff00f6ffffe2f6ffff20f7ffff34f7ffff1af8ffff5af8ffff48faffff6afbffff
704704
m_RenameOverlay:
705705
m_UserAcceptedRename: 0
706706
m_Name:
@@ -838,9 +838,9 @@ MonoBehaviour:
838838
m_Tooltip:
839839
m_Pos:
840840
serializedVersion: 2
841-
x: 1137
841+
x: 790
842842
y: 704
843-
width: 453
843+
width: 800
844844
height: 297
845845
m_ViewDataDictionary: {fileID: 0}
846846
--- !u!114 &22
14.1 KB
Binary file not shown.
Binary file not shown.
Binary file not shown.

0 commit comments

Comments
 (0)