fixed conflict

Browse Source

...

This commit is contained in:

lixiaopeng

2022-03-22 10:34:06 +08:00

parent a39f310331

commit f2307e6683

300 changed files with 12240 additions and 3 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

BIN

libraries/map-custom/build/intermediates/packaged_res/debug/drawable-ldpi-v4/ic_1.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 4.3 KiB

BIN

libraries/map-custom/build/intermediates/packaged_res/debug/drawable-ldpi-v4/ic_10.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 4.5 KiB

BIN

libraries/map-custom/build/intermediates/packaged_res/debug/drawable-ldpi-v4/ic_11.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.4 KiB

BIN

libraries/map-custom/build/intermediates/packaged_res/debug/drawable-ldpi-v4/ic_12.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.2 KiB

BIN

libraries/map-custom/build/intermediates/packaged_res/debug/drawable-ldpi-v4/ic_13.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.9 KiB

BIN

libraries/map-custom/build/intermediates/packaged_res/debug/drawable-ldpi-v4/ic_14.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 4.9 KiB

BIN

libraries/map-custom/build/intermediates/packaged_res/debug/drawable-ldpi-v4/ic_15.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.8 KiB

BIN

libraries/map-custom/build/intermediates/packaged_res/debug/drawable-ldpi-v4/ic_16.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 4.9 KiB

BIN

libraries/map-custom/build/intermediates/packaged_res/debug/drawable-ldpi-v4/ic_17.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.4 KiB

BIN

libraries/map-custom/build/intermediates/packaged_res/debug/drawable-ldpi-v4/ic_18.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.1 KiB

BIN

libraries/map-custom/build/intermediates/packaged_res/debug/drawable-ldpi-v4/ic_19.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.6 KiB

BIN

libraries/map-custom/build/intermediates/packaged_res/debug/drawable-ldpi-v4/ic_2.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 2.6 KiB

BIN

libraries/map-custom/build/intermediates/packaged_res/debug/drawable-ldpi-v4/ic_20.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 2.3 KiB

BIN

libraries/map-custom/build/intermediates/packaged_res/debug/drawable-ldpi-v4/ic_21.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.8 KiB

BIN

libraries/map-custom/build/intermediates/packaged_res/debug/drawable-ldpi-v4/ic_22.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.3 KiB

BIN

libraries/map-custom/build/intermediates/packaged_res/debug/drawable-ldpi-v4/ic_23.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.5 KiB

BIN

libraries/map-custom/build/intermediates/packaged_res/debug/drawable-ldpi-v4/ic_24.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.8 KiB

BIN

libraries/map-custom/build/intermediates/packaged_res/debug/drawable-ldpi-v4/ic_25.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.2 KiB

BIN

libraries/map-custom/build/intermediates/packaged_res/debug/drawable-ldpi-v4/ic_26.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.7 KiB

BIN

libraries/map-custom/build/intermediates/packaged_res/debug/drawable-ldpi-v4/ic_27.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.5 KiB

BIN

libraries/map-custom/build/intermediates/packaged_res/debug/drawable-ldpi-v4/ic_28.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.8 KiB

BIN

libraries/map-custom/build/intermediates/packaged_res/debug/drawable-ldpi-v4/ic_4.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 2.6 KiB

BIN

libraries/map-custom/build/intermediates/packaged_res/debug/drawable-ldpi-v4/ic_5.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 2.5 KiB

BIN

libraries/map-custom/build/intermediates/packaged_res/debug/drawable-ldpi-v4/ic_50.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 4.0 KiB

BIN

libraries/map-custom/build/intermediates/packaged_res/debug/drawable-ldpi-v4/ic_51.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 4.4 KiB

BIN

libraries/map-custom/build/intermediates/packaged_res/debug/drawable-ldpi-v4/ic_52.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 4.5 KiB

BIN

libraries/map-custom/build/intermediates/packaged_res/debug/drawable-ldpi-v4/ic_53.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 4.2 KiB

BIN

libraries/map-custom/build/intermediates/packaged_res/debug/drawable-ldpi-v4/ic_54.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 4.4 KiB

BIN

libraries/map-custom/build/intermediates/packaged_res/debug/drawable-ldpi-v4/ic_55.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 4.6 KiB

BIN

libraries/map-custom/build/intermediates/packaged_res/debug/drawable-ldpi-v4/ic_56.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 4.1 KiB

BIN

libraries/map-custom/build/intermediates/packaged_res/debug/drawable-ldpi-v4/ic_57.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 4.6 KiB

BIN

libraries/map-custom/build/intermediates/packaged_res/debug/drawable-ldpi-v4/ic_58.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 4.6 KiB

BIN

libraries/map-custom/build/intermediates/packaged_res/debug/drawable-ldpi-v4/ic_59.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 4.7 KiB

BIN

libraries/map-custom/build/intermediates/packaged_res/debug/drawable-ldpi-v4/ic_6.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.3 KiB

BIN

libraries/map-custom/build/intermediates/packaged_res/debug/drawable-ldpi-v4/ic_60.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 4.0 KiB

BIN

libraries/map-custom/build/intermediates/packaged_res/debug/drawable-ldpi-v4/ic_61.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 4.5 KiB

BIN

libraries/map-custom/build/intermediates/packaged_res/debug/drawable-ldpi-v4/ic_62.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 4.6 KiB

BIN

libraries/map-custom/build/intermediates/packaged_res/debug/drawable-ldpi-v4/ic_63.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 4.3 KiB

BIN

libraries/map-custom/build/intermediates/packaged_res/debug/drawable-ldpi-v4/ic_64.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 4.5 KiB

BIN

libraries/map-custom/build/intermediates/packaged_res/debug/drawable-ldpi-v4/ic_65.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 4.5 KiB

BIN

libraries/map-custom/build/intermediates/packaged_res/debug/drawable-ldpi-v4/ic_66.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 4.1 KiB

BIN

libraries/map-custom/build/intermediates/packaged_res/debug/drawable-ldpi-v4/ic_67.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 4.6 KiB

BIN

libraries/map-custom/build/intermediates/packaged_res/debug/drawable-ldpi-v4/ic_68.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 4.6 KiB

BIN

libraries/map-custom/build/intermediates/packaged_res/debug/drawable-ldpi-v4/ic_69.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 4.8 KiB

BIN

libraries/map-custom/build/intermediates/packaged_res/debug/drawable-ldpi-v4/ic_7.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.3 KiB

BIN

libraries/map-custom/build/intermediates/packaged_res/debug/drawable-ldpi-v4/ic_8.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.6 KiB

BIN

libraries/map-custom/build/intermediates/packaged_res/debug/drawable-ldpi-v4/ic_9.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 2.4 KiB

BIN

libraries/map-custom/build/intermediates/packaged_res/debug/drawable-ldpi-v4/ic_endpoint.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 516 B

BIN

libraries/map-custom/build/intermediates/packaged_res/debug/drawable-ldpi-v4/map_api_ic_current_location2.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 12 KiB

BIN

libraries/map-custom/build/intermediates/packaged_res/debug/drawable-ldpi-v4/tc_10.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.2 KiB

BIN

libraries/map-custom/build/intermediates/packaged_res/debug/drawable-ldpi-v4/tc_11.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.2 KiB

BIN

libraries/map-custom/build/intermediates/packaged_res/debug/drawable-ldpi-v4/tc_12.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 2.8 KiB

BIN

libraries/map-custom/build/intermediates/packaged_res/debug/drawable-ldpi-v4/tc_13.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 2.7 KiB

BIN

libraries/map-custom/build/intermediates/packaged_res/debug/drawable-ldpi-v4/tc_14.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 2.9 KiB

BIN

libraries/map-custom/build/intermediates/packaged_res/debug/drawable-ldpi-v4/tc_15.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 2.8 KiB

BIN

libraries/map-custom/build/intermediates/packaged_res/debug/drawable-ldpi-v4/tc_16.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 2.5 KiB

BIN

libraries/map-custom/build/intermediates/packaged_res/debug/drawable-ldpi-v4/tc_17.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 2.4 KiB

BIN

libraries/map-custom/build/intermediates/packaged_res/debug/drawable-ldpi-v4/tc_20.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.6 KiB

BIN

libraries/map-custom/build/intermediates/packaged_res/debug/drawable-ldpi-v4/tc_21.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.6 KiB

BIN

libraries/map-custom/build/intermediates/packaged_res/debug/drawable-ldpi-v4/tc_22.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.6 KiB

BIN

libraries/map-custom/build/intermediates/packaged_res/debug/drawable-ldpi-v4/tc_23.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.3 KiB

BIN

libraries/map-custom/build/intermediates/packaged_res/debug/drawable-ldpi-v4/tc_24.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.4 KiB

BIN

libraries/map-custom/build/intermediates/packaged_res/debug/drawable-ldpi-v4/tc_25.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.7 KiB

BIN

libraries/map-custom/build/intermediates/packaged_res/debug/drawable-ldpi-v4/tc_26.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.5 KiB

BIN

libraries/map-custom/build/intermediates/packaged_res/debug/drawable-ldpi-v4/tc_27.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.7 KiB

BIN

libraries/map-custom/build/intermediates/packaged_res/debug/drawable-ldpi-v4/tc_28.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.4 KiB

BIN

libraries/map-custom/build/intermediates/packaged_res/debug/drawable-ldpi-v4/tc_30.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 2.9 KiB

BIN

libraries/map-custom/build/intermediates/packaged_res/debug/drawable-ldpi-v4/tc_31.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.0 KiB

BIN

libraries/map-custom/build/intermediates/packaged_res/debug/drawable-ldpi-v4/tc_32.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 2.9 KiB

BIN

libraries/map-custom/build/intermediates/packaged_res/debug/drawable-ldpi-v4/tc_33.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.1 KiB

BIN

libraries/map-custom/build/intermediates/packaged_res/debug/drawable-ldpi-v4/tc_34.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 2.9 KiB

BIN

libraries/map-custom/build/intermediates/packaged_res/debug/drawable-ldpi-v4/tc_35.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 2.8 KiB

BIN

libraries/map-custom/build/intermediates/packaged_res/debug/drawable-ldpi-v4/tc_36.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.4 KiB

BIN

libraries/map-custom/build/intermediates/packaged_res/debug/drawable-ldpi-v4/tc_37.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.6 KiB

BIN

libraries/map-custom/build/intermediates/packaged_res/debug/drawable-ldpi-v4/tc_38.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.6 KiB

BIN

libraries/map-custom/build/intermediates/packaged_res/debug/drawable-ldpi-v4/tc_39.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.4 KiB

BIN

libraries/map-custom/build/intermediates/packaged_res/debug/drawable-ldpi-v4/tc_40.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.3 KiB

BIN

libraries/map-custom/build/intermediates/packaged_res/debug/drawable-ldpi-v4/tc_41.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 2.8 KiB

BIN

libraries/map-custom/build/intermediates/packaged_res/debug/drawable-ldpi-v4/tc_42.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.4 KiB

BIN

libraries/map-custom/build/intermediates/packaged_res/debug/drawable-ldpi-v4/tc_43.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.5 KiB

BIN

libraries/map-custom/build/intermediates/packaged_res/debug/drawable-ldpi-v4/tc_44.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.6 KiB

BIN

libraries/map-custom/build/intermediates/packaged_res/debug/drawable-ldpi-v4/tc_68.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.6 KiB

BIN

libraries/map-custom/build/intermediates/packaged_res/debug/drawable-ldpi-v4/tc_84.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.6 KiB

BIN

libraries/map-custom/build/intermediates/packaged_res/debug/drawable-ldpi-v4/tc_85.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.7 KiB

BIN

libraries/map-custom/build/intermediates/packaged_res/debug/drawable-mdpi-v4/map_api_ic_current_location2.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 12 KiB

BIN

libraries/map-custom/build/intermediates/packaged_res/debug/drawable-xhdpi-v4/ic_1.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 10 KiB

BIN

libraries/map-custom/build/intermediates/packaged_res/debug/drawable-xhdpi-v4/ic_10.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 11 KiB

BIN

libraries/map-custom/build/intermediates/packaged_res/debug/drawable-xhdpi-v4/ic_11.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 7.5 KiB

BIN

libraries/map-custom/build/intermediates/packaged_res/debug/drawable-xhdpi-v4/ic_12.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 6.7 KiB

BIN

libraries/map-custom/build/intermediates/packaged_res/debug/drawable-xhdpi-v4/ic_13.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 9.3 KiB

BIN

libraries/map-custom/build/intermediates/packaged_res/debug/drawable-xhdpi-v4/ic_14.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 12 KiB

BIN

libraries/map-custom/build/intermediates/packaged_res/debug/drawable-xhdpi-v4/ic_15.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 9.7 KiB

BIN

libraries/map-custom/build/intermediates/packaged_res/debug/drawable-xhdpi-v4/ic_16.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 12 KiB

BIN

libraries/map-custom/build/intermediates/packaged_res/debug/drawable-xhdpi-v4/ic_17.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 7.6 KiB

BIN

libraries/map-custom/build/intermediates/packaged_res/debug/drawable-xhdpi-v4/ic_18.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 7.0 KiB

BIN

libraries/map-custom/build/intermediates/packaged_res/debug/drawable-xhdpi-v4/ic_19.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 8.8 KiB

BIN

libraries/map-custom/build/intermediates/packaged_res/debug/drawable-xhdpi-v4/ic_2.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 6.8 KiB

BIN

libraries/map-custom/build/intermediates/packaged_res/debug/drawable-xhdpi-v4/ic_20.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 5.8 KiB

BIN

libraries/map-custom/build/intermediates/packaged_res/debug/drawable-xhdpi-v4/ic_21.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 8.9 KiB

BIN

libraries/map-custom/build/intermediates/packaged_res/debug/drawable-xhdpi-v4/ic_22.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 7.4 KiB

Some files were not shown because too many files have changed in this diff Show More