From dd8c5601f5a521fbf48a2bdcaf4b5ccc13340753 Mon Sep 17 00:00:00 2001 From: Marvin W Date: Mon, 10 Jul 2023 16:38:20 +0200 Subject: [PATCH] Build: Change system for optional components - Nearby can now be configured through local build property, enabled by default - Exposure Notifications is not displayed in settings if not used for >14 days - Flavors per map type remain (but moved maps implementations) --- .../gms/ui/settings/SettingsProvider.kt | 58 ++++++++++++++ .../core/src/main/res/values-be/strings.xml | 7 ++ .../core/src/main/res/values-de/strings.xml | 7 ++ .../core/src/main/res/values-es/strings.xml | 7 ++ .../core/src/main/res/values-fr/strings.xml | 5 ++ .../core/src/main/res/values-it/strings.xml | 7 ++ .../core/src/main/res/values-ja/strings.xml | 7 ++ .../core/src/main/res/values-pl/strings.xml | 5 ++ .../core/src/main/res/values-ru/strings.xml | 7 ++ .../core/src/main/res/values-uk/strings.xml | 5 ++ .../src/main/res/values-zh-rCN/strings.xml | 7 ++ .../core/src/main/res/values/strings.xml | 7 ++ play-services-core/build.gradle | 43 +++++------ .../org/microg/gms/ui/SettingsActivity.java | 11 ++- .../org/microg/gms/ui/SettingsFragment.kt | 73 ++++++++++++++---- .../src/main/res/navigation/nav_settings.xml | 4 - .../src/main/res/values-be/strings.xml | 7 -- .../src/main/res/values-de/strings.xml | 7 -- .../src/main/res/values-es/strings.xml | 7 -- .../src/main/res/values-fr/strings.xml | 5 -- .../src/main/res/values-it/strings.xml | 7 -- .../src/main/res/values-ja/strings.xml | 7 -- .../src/main/res/values-pl/strings.xml | 5 -- .../src/main/res/values-ru/strings.xml | 7 -- .../src/main/res/values-uk/strings.xml | 5 -- .../src/main/res/values-zh-rCN/strings.xml | 6 -- .../src/main/res/values/strings.xml | 7 -- .../src/main/res/xml/preferences_start.xml | 12 +-- .../gms/ui/NearbyPreferencesIntegration.kt | 37 --------- .../gms/ui/NearbyPreferencesIntegration.kt | 21 ----- .../res/navigation/nav_nearby.xml | 6 -- .../src/withoutNearby/res/values/strings.xml | 8 -- .../core/mapbox}/build.gradle | 0 .../core/mapbox}/src/main/AndroidManifest.xml | 0 ...Open Sans Regular,Arial Unicode MS Regular | 0 .../src/main/assets/Roboto Bold/0-255.pbf | Bin .../src/main/assets/Roboto Bold/1024-1279.pbf | Bin .../main/assets/Roboto Bold/10240-10495.pbf | 0 .../main/assets/Roboto Bold/10496-10751.pbf | 0 .../main/assets/Roboto Bold/10752-11007.pbf | 0 .../main/assets/Roboto Bold/11008-11263.pbf | 0 .../main/assets/Roboto Bold/11264-11519.pbf | 0 .../main/assets/Roboto Bold/11520-11775.pbf | 0 .../main/assets/Roboto Bold/11776-12031.pbf | 0 .../main/assets/Roboto Bold/12032-12287.pbf | 0 .../main/assets/Roboto Bold/12288-12543.pbf | 0 .../main/assets/Roboto Bold/12544-12799.pbf | 0 .../src/main/assets/Roboto Bold/1280-1535.pbf | Bin .../main/assets/Roboto Bold/12800-13055.pbf | 0 .../main/assets/Roboto Bold/13056-13311.pbf | 0 .../main/assets/Roboto Bold/13312-13567.pbf | 0 .../main/assets/Roboto Bold/13568-13823.pbf | 0 .../main/assets/Roboto Bold/13824-14079.pbf | 0 .../main/assets/Roboto Bold/14080-14335.pbf | 0 .../main/assets/Roboto Bold/14336-14591.pbf | 0 .../main/assets/Roboto Bold/14592-14847.pbf | 0 .../main/assets/Roboto Bold/14848-15103.pbf | 0 .../main/assets/Roboto Bold/15104-15359.pbf | 0 .../src/main/assets/Roboto Bold/1536-1791.pbf | 0 .../main/assets/Roboto Bold/15360-15615.pbf | 0 .../main/assets/Roboto Bold/15616-15871.pbf | 0 .../main/assets/Roboto Bold/15872-16127.pbf | 0 .../main/assets/Roboto Bold/16128-16383.pbf | 0 .../main/assets/Roboto Bold/16384-16639.pbf | 0 .../main/assets/Roboto Bold/16640-16895.pbf | 0 .../main/assets/Roboto Bold/16896-17151.pbf | 0 .../main/assets/Roboto Bold/17152-17407.pbf | 0 .../main/assets/Roboto Bold/17408-17663.pbf | 0 .../main/assets/Roboto Bold/17664-17919.pbf | 0 .../src/main/assets/Roboto Bold/1792-2047.pbf | 0 .../main/assets/Roboto Bold/17920-18175.pbf | 0 .../main/assets/Roboto Bold/18176-18431.pbf | 0 .../main/assets/Roboto Bold/18432-18687.pbf | 0 .../main/assets/Roboto Bold/18688-18943.pbf | 0 .../main/assets/Roboto Bold/18944-19199.pbf | 0 .../main/assets/Roboto Bold/19200-19455.pbf | 0 .../main/assets/Roboto Bold/19456-19711.pbf | 0 .../main/assets/Roboto Bold/19712-19967.pbf | 0 .../main/assets/Roboto Bold/19968-20223.pbf | 0 .../main/assets/Roboto Bold/20224-20479.pbf | 0 .../src/main/assets/Roboto Bold/2048-2303.pbf | 0 .../main/assets/Roboto Bold/20480-20735.pbf | 0 .../main/assets/Roboto Bold/20736-20991.pbf | 0 .../main/assets/Roboto Bold/20992-21247.pbf | 0 .../main/assets/Roboto Bold/21248-21503.pbf | 0 .../main/assets/Roboto Bold/21504-21759.pbf | 0 .../main/assets/Roboto Bold/21760-22015.pbf | 0 .../main/assets/Roboto Bold/22016-22271.pbf | 0 .../main/assets/Roboto Bold/22272-22527.pbf | 0 .../main/assets/Roboto Bold/22528-22783.pbf | 0 .../main/assets/Roboto Bold/22784-23039.pbf | 0 .../src/main/assets/Roboto Bold/2304-2559.pbf | 0 .../main/assets/Roboto Bold/23040-23295.pbf | 0 .../main/assets/Roboto Bold/23296-23551.pbf | 0 .../main/assets/Roboto Bold/23552-23807.pbf | 0 .../main/assets/Roboto Bold/23808-24063.pbf | 0 .../main/assets/Roboto Bold/24064-24319.pbf | 0 .../main/assets/Roboto Bold/24320-24575.pbf | 0 .../main/assets/Roboto Bold/24576-24831.pbf | 0 .../main/assets/Roboto Bold/24832-25087.pbf | 0 .../main/assets/Roboto Bold/25088-25343.pbf | 0 .../main/assets/Roboto Bold/25344-25599.pbf | 0 .../src/main/assets/Roboto Bold/256-511.pbf | Bin .../src/main/assets/Roboto Bold/2560-2815.pbf | 0 .../main/assets/Roboto Bold/25600-25855.pbf | 0 .../main/assets/Roboto Bold/25856-26111.pbf | 0 .../main/assets/Roboto Bold/26112-26367.pbf | 0 .../main/assets/Roboto Bold/26368-26623.pbf | 0 .../main/assets/Roboto Bold/26624-26879.pbf | 0 .../main/assets/Roboto Bold/26880-27135.pbf | 0 .../main/assets/Roboto Bold/27136-27391.pbf | 0 .../main/assets/Roboto Bold/27392-27647.pbf | 0 .../main/assets/Roboto Bold/27648-27903.pbf | 0 .../main/assets/Roboto Bold/27904-28159.pbf | 0 .../src/main/assets/Roboto Bold/2816-3071.pbf | 0 .../main/assets/Roboto Bold/28160-28415.pbf | 0 .../main/assets/Roboto Bold/28416-28671.pbf | 0 .../main/assets/Roboto Bold/28672-28927.pbf | 0 .../main/assets/Roboto Bold/28928-29183.pbf | 0 .../main/assets/Roboto Bold/29184-29439.pbf | 0 .../main/assets/Roboto Bold/29440-29695.pbf | 0 .../main/assets/Roboto Bold/29696-29951.pbf | 0 .../main/assets/Roboto Bold/29952-30207.pbf | 0 .../main/assets/Roboto Bold/30208-30463.pbf | 0 .../main/assets/Roboto Bold/30464-30719.pbf | 0 .../src/main/assets/Roboto Bold/3072-3327.pbf | 0 .../main/assets/Roboto Bold/30720-30975.pbf | 0 .../main/assets/Roboto Bold/30976-31231.pbf | 0 .../main/assets/Roboto Bold/31232-31487.pbf | 0 .../main/assets/Roboto Bold/31488-31743.pbf | 0 .../main/assets/Roboto Bold/31744-31999.pbf | 0 .../main/assets/Roboto Bold/32000-32255.pbf | 0 .../main/assets/Roboto Bold/32256-32511.pbf | 0 .../main/assets/Roboto Bold/32512-32767.pbf | 0 .../main/assets/Roboto Bold/32768-33023.pbf | 0 .../main/assets/Roboto Bold/33024-33279.pbf | 0 .../src/main/assets/Roboto Bold/3328-3583.pbf | 0 .../main/assets/Roboto Bold/33280-33535.pbf | 0 .../main/assets/Roboto Bold/33536-33791.pbf | 0 .../main/assets/Roboto Bold/33792-34047.pbf | 0 .../main/assets/Roboto Bold/34048-34303.pbf | 0 .../main/assets/Roboto Bold/34304-34559.pbf | 0 .../main/assets/Roboto Bold/34560-34815.pbf | 0 .../main/assets/Roboto Bold/34816-35071.pbf | 0 .../main/assets/Roboto Bold/35072-35327.pbf | 0 .../main/assets/Roboto Bold/35328-35583.pbf | 0 .../main/assets/Roboto Bold/35584-35839.pbf | 0 .../src/main/assets/Roboto Bold/3584-3839.pbf | 0 .../main/assets/Roboto Bold/35840-36095.pbf | 0 .../main/assets/Roboto Bold/36096-36351.pbf | 0 .../main/assets/Roboto Bold/36352-36607.pbf | 0 .../main/assets/Roboto Bold/36608-36863.pbf | 0 .../main/assets/Roboto Bold/36864-37119.pbf | 0 .../main/assets/Roboto Bold/37120-37375.pbf | 0 .../main/assets/Roboto Bold/37376-37631.pbf | 0 .../main/assets/Roboto Bold/37632-37887.pbf | 0 .../main/assets/Roboto Bold/37888-38143.pbf | 0 .../main/assets/Roboto Bold/38144-38399.pbf | 0 .../src/main/assets/Roboto Bold/3840-4095.pbf | 0 .../main/assets/Roboto Bold/38400-38655.pbf | 0 .../main/assets/Roboto Bold/38656-38911.pbf | 0 .../main/assets/Roboto Bold/38912-39167.pbf | 0 .../main/assets/Roboto Bold/39168-39423.pbf | 0 .../main/assets/Roboto Bold/39424-39679.pbf | 0 .../main/assets/Roboto Bold/39680-39935.pbf | 0 .../main/assets/Roboto Bold/39936-40191.pbf | 0 .../main/assets/Roboto Bold/40192-40447.pbf | 0 .../main/assets/Roboto Bold/40448-40703.pbf | 0 .../main/assets/Roboto Bold/40704-40959.pbf | 0 .../src/main/assets/Roboto Bold/4096-4351.pbf | 0 .../main/assets/Roboto Bold/40960-41215.pbf | 0 .../main/assets/Roboto Bold/41216-41471.pbf | 0 .../main/assets/Roboto Bold/41472-41727.pbf | 0 .../main/assets/Roboto Bold/41728-41983.pbf | 0 .../main/assets/Roboto Bold/41984-42239.pbf | 0 .../main/assets/Roboto Bold/42240-42495.pbf | 0 .../main/assets/Roboto Bold/42496-42751.pbf | 0 .../main/assets/Roboto Bold/42752-43007.pbf | 0 .../main/assets/Roboto Bold/43008-43263.pbf | 0 .../main/assets/Roboto Bold/43264-43519.pbf | 0 .../src/main/assets/Roboto Bold/4352-4607.pbf | 0 .../main/assets/Roboto Bold/43520-43775.pbf | 0 .../main/assets/Roboto Bold/43776-44031.pbf | 0 .../main/assets/Roboto Bold/44032-44287.pbf | 0 .../main/assets/Roboto Bold/44288-44543.pbf | 0 .../main/assets/Roboto Bold/44544-44799.pbf | 0 .../main/assets/Roboto Bold/44800-45055.pbf | 0 .../main/assets/Roboto Bold/45056-45311.pbf | 0 .../main/assets/Roboto Bold/45312-45567.pbf | 0 .../main/assets/Roboto Bold/45568-45823.pbf | 0 .../main/assets/Roboto Bold/45824-46079.pbf | 0 .../src/main/assets/Roboto Bold/4608-4863.pbf | 0 .../main/assets/Roboto Bold/46080-46335.pbf | 0 .../main/assets/Roboto Bold/46336-46591.pbf | 0 .../main/assets/Roboto Bold/46592-46847.pbf | 0 .../main/assets/Roboto Bold/46848-47103.pbf | 0 .../main/assets/Roboto Bold/47104-47359.pbf | 0 .../main/assets/Roboto Bold/47360-47615.pbf | 0 .../main/assets/Roboto Bold/47616-47871.pbf | 0 .../main/assets/Roboto Bold/47872-48127.pbf | 0 .../main/assets/Roboto Bold/48128-48383.pbf | 0 .../main/assets/Roboto Bold/48384-48639.pbf | 0 .../src/main/assets/Roboto Bold/4864-5119.pbf | 0 .../main/assets/Roboto Bold/48640-48895.pbf | 0 .../main/assets/Roboto Bold/48896-49151.pbf | 0 .../main/assets/Roboto Bold/49152-49407.pbf | 0 .../main/assets/Roboto Bold/49408-49663.pbf | 0 .../main/assets/Roboto Bold/49664-49919.pbf | 0 .../main/assets/Roboto Bold/49920-50175.pbf | 0 .../main/assets/Roboto Bold/50176-50431.pbf | 0 .../main/assets/Roboto Bold/50432-50687.pbf | 0 .../main/assets/Roboto Bold/50688-50943.pbf | 0 .../main/assets/Roboto Bold/50944-51199.pbf | 0 .../src/main/assets/Roboto Bold/512-767.pbf | Bin .../src/main/assets/Roboto Bold/5120-5375.pbf | 0 .../main/assets/Roboto Bold/51200-51455.pbf | 0 .../main/assets/Roboto Bold/51456-51711.pbf | 0 .../main/assets/Roboto Bold/51712-51967.pbf | 0 .../main/assets/Roboto Bold/51968-52223.pbf | 0 .../main/assets/Roboto Bold/52224-52479.pbf | 0 .../main/assets/Roboto Bold/52480-52735.pbf | 0 .../main/assets/Roboto Bold/52736-52991.pbf | 0 .../main/assets/Roboto Bold/52992-53247.pbf | 0 .../main/assets/Roboto Bold/53248-53503.pbf | 0 .../main/assets/Roboto Bold/53504-53759.pbf | 0 .../src/main/assets/Roboto Bold/5376-5631.pbf | 0 .../main/assets/Roboto Bold/53760-54015.pbf | 0 .../main/assets/Roboto Bold/54016-54271.pbf | 0 .../main/assets/Roboto Bold/54272-54527.pbf | 0 .../main/assets/Roboto Bold/54528-54783.pbf | 0 .../main/assets/Roboto Bold/54784-55039.pbf | 0 .../main/assets/Roboto Bold/55040-55295.pbf | 0 .../main/assets/Roboto Bold/55296-55551.pbf | 0 .../main/assets/Roboto Bold/55552-55807.pbf | 0 .../main/assets/Roboto Bold/55808-56063.pbf | 0 .../main/assets/Roboto Bold/56064-56319.pbf | 0 .../src/main/assets/Roboto Bold/5632-5887.pbf | 0 .../main/assets/Roboto Bold/56320-56575.pbf | 0 .../main/assets/Roboto Bold/56576-56831.pbf | 0 .../main/assets/Roboto Bold/56832-57087.pbf | 0 .../main/assets/Roboto Bold/57088-57343.pbf | 0 .../main/assets/Roboto Bold/57344-57599.pbf | 0 .../main/assets/Roboto Bold/57600-57855.pbf | 0 .../main/assets/Roboto Bold/57856-58111.pbf | 0 .../main/assets/Roboto Bold/58112-58367.pbf | 0 .../main/assets/Roboto Bold/58368-58623.pbf | 0 .../main/assets/Roboto Bold/58624-58879.pbf | 0 .../src/main/assets/Roboto Bold/5888-6143.pbf | 0 .../main/assets/Roboto Bold/58880-59135.pbf | 0 .../main/assets/Roboto Bold/59136-59391.pbf | 0 .../main/assets/Roboto Bold/59392-59647.pbf | 0 .../main/assets/Roboto Bold/59648-59903.pbf | 0 .../main/assets/Roboto Bold/59904-60159.pbf | 0 .../main/assets/Roboto Bold/60160-60415.pbf | 0 .../main/assets/Roboto Bold/60416-60671.pbf | 0 .../main/assets/Roboto Bold/60672-60927.pbf | 0 .../main/assets/Roboto Bold/60928-61183.pbf | 0 .../main/assets/Roboto Bold/61184-61439.pbf | 0 .../src/main/assets/Roboto Bold/6144-6399.pbf | 0 .../main/assets/Roboto Bold/61440-61695.pbf | 0 .../main/assets/Roboto Bold/61696-61951.pbf | 0 .../main/assets/Roboto Bold/61952-62207.pbf | 0 .../main/assets/Roboto Bold/62208-62463.pbf | 0 .../main/assets/Roboto Bold/62464-62719.pbf | 0 .../main/assets/Roboto Bold/62720-62975.pbf | 0 .../main/assets/Roboto Bold/62976-63231.pbf | Bin .../main/assets/Roboto Bold/63232-63487.pbf | 0 .../main/assets/Roboto Bold/63488-63743.pbf | 0 .../main/assets/Roboto Bold/63744-63999.pbf | 0 .../src/main/assets/Roboto Bold/6400-6655.pbf | 0 .../main/assets/Roboto Bold/64000-64255.pbf | 0 .../main/assets/Roboto Bold/64256-64511.pbf | Bin .../main/assets/Roboto Bold/64512-64767.pbf | 0 .../main/assets/Roboto Bold/64768-65023.pbf | 0 .../main/assets/Roboto Bold/65024-65279.pbf | Bin .../main/assets/Roboto Bold/65280-65535.pbf | Bin .../src/main/assets/Roboto Bold/6656-6911.pbf | 0 .../src/main/assets/Roboto Bold/6912-7167.pbf | 0 .../src/main/assets/Roboto Bold/7168-7423.pbf | 0 .../src/main/assets/Roboto Bold/7424-7679.pbf | 0 .../src/main/assets/Roboto Bold/768-1023.pbf | Bin .../src/main/assets/Roboto Bold/7680-7935.pbf | Bin .../src/main/assets/Roboto Bold/7936-8191.pbf | Bin .../src/main/assets/Roboto Bold/8192-8447.pbf | Bin .../src/main/assets/Roboto Bold/8448-8703.pbf | Bin .../src/main/assets/Roboto Bold/8704-8959.pbf | Bin .../src/main/assets/Roboto Bold/8960-9215.pbf | 0 .../src/main/assets/Roboto Bold/9216-9471.pbf | 0 .../src/main/assets/Roboto Bold/9472-9727.pbf | Bin .../src/main/assets/Roboto Bold/9728-9983.pbf | 0 .../main/assets/Roboto Bold/9984-10239.pbf | 0 .../src/main/assets/Roboto Medium/0-255.pbf | Bin .../main/assets/Roboto Medium/1024-1279.pbf | Bin .../main/assets/Roboto Medium/10240-10495.pbf | 0 .../main/assets/Roboto Medium/10496-10751.pbf | 0 .../main/assets/Roboto Medium/10752-11007.pbf | 0 .../main/assets/Roboto Medium/11008-11263.pbf | 0 .../main/assets/Roboto Medium/11264-11519.pbf | 0 .../main/assets/Roboto Medium/11520-11775.pbf | 0 .../main/assets/Roboto Medium/11776-12031.pbf | 0 .../main/assets/Roboto Medium/12032-12287.pbf | 0 .../main/assets/Roboto Medium/12288-12543.pbf | 0 .../main/assets/Roboto Medium/12544-12799.pbf | 0 .../main/assets/Roboto Medium/1280-1535.pbf | Bin .../main/assets/Roboto Medium/12800-13055.pbf | 0 .../main/assets/Roboto Medium/13056-13311.pbf | 0 .../main/assets/Roboto Medium/13312-13567.pbf | 0 .../main/assets/Roboto Medium/13568-13823.pbf | 0 .../main/assets/Roboto Medium/13824-14079.pbf | 0 .../main/assets/Roboto Medium/14080-14335.pbf | 0 .../main/assets/Roboto Medium/14336-14591.pbf | 0 .../main/assets/Roboto Medium/14592-14847.pbf | 0 .../main/assets/Roboto Medium/14848-15103.pbf | 0 .../main/assets/Roboto Medium/15104-15359.pbf | 0 .../main/assets/Roboto Medium/1536-1791.pbf | 0 .../main/assets/Roboto Medium/15360-15615.pbf | 0 .../main/assets/Roboto Medium/15616-15871.pbf | 0 .../main/assets/Roboto Medium/15872-16127.pbf | 0 .../main/assets/Roboto Medium/16128-16383.pbf | 0 .../main/assets/Roboto Medium/16384-16639.pbf | 0 .../main/assets/Roboto Medium/16640-16895.pbf | 0 .../main/assets/Roboto Medium/16896-17151.pbf | 0 .../main/assets/Roboto Medium/17152-17407.pbf | 0 .../main/assets/Roboto Medium/17408-17663.pbf | 0 .../main/assets/Roboto Medium/17664-17919.pbf | 0 .../main/assets/Roboto Medium/1792-2047.pbf | 0 .../main/assets/Roboto Medium/17920-18175.pbf | 0 .../main/assets/Roboto Medium/18176-18431.pbf | 0 .../main/assets/Roboto Medium/18432-18687.pbf | 0 .../main/assets/Roboto Medium/18688-18943.pbf | 0 .../main/assets/Roboto Medium/18944-19199.pbf | 0 .../main/assets/Roboto Medium/19200-19455.pbf | 0 .../main/assets/Roboto Medium/19456-19711.pbf | 0 .../main/assets/Roboto Medium/19712-19967.pbf | 0 .../main/assets/Roboto Medium/19968-20223.pbf | 0 .../main/assets/Roboto Medium/20224-20479.pbf | 0 .../main/assets/Roboto Medium/2048-2303.pbf | 0 .../main/assets/Roboto Medium/20480-20735.pbf | 0 .../main/assets/Roboto Medium/20736-20991.pbf | 0 .../main/assets/Roboto Medium/20992-21247.pbf | 0 .../main/assets/Roboto Medium/21248-21503.pbf | 0 .../main/assets/Roboto Medium/21504-21759.pbf | 0 .../main/assets/Roboto Medium/21760-22015.pbf | 0 .../main/assets/Roboto Medium/22016-22271.pbf | 0 .../main/assets/Roboto Medium/22272-22527.pbf | 0 .../main/assets/Roboto Medium/22528-22783.pbf | 0 .../main/assets/Roboto Medium/22784-23039.pbf | 0 .../main/assets/Roboto Medium/2304-2559.pbf | 0 .../main/assets/Roboto Medium/23040-23295.pbf | 0 .../main/assets/Roboto Medium/23296-23551.pbf | 0 .../main/assets/Roboto Medium/23552-23807.pbf | 0 .../main/assets/Roboto Medium/23808-24063.pbf | 0 .../main/assets/Roboto Medium/24064-24319.pbf | 0 .../main/assets/Roboto Medium/24320-24575.pbf | 0 .../main/assets/Roboto Medium/24576-24831.pbf | 0 .../main/assets/Roboto Medium/24832-25087.pbf | 0 .../main/assets/Roboto Medium/25088-25343.pbf | 0 .../main/assets/Roboto Medium/25344-25599.pbf | 0 .../src/main/assets/Roboto Medium/256-511.pbf | Bin .../main/assets/Roboto Medium/2560-2815.pbf | 0 .../main/assets/Roboto Medium/25600-25855.pbf | 0 .../main/assets/Roboto Medium/25856-26111.pbf | 0 .../main/assets/Roboto Medium/26112-26367.pbf | 0 .../main/assets/Roboto Medium/26368-26623.pbf | 0 .../main/assets/Roboto Medium/26624-26879.pbf | 0 .../main/assets/Roboto Medium/26880-27135.pbf | 0 .../main/assets/Roboto Medium/27136-27391.pbf | 0 .../main/assets/Roboto Medium/27392-27647.pbf | 0 .../main/assets/Roboto Medium/27648-27903.pbf | 0 .../main/assets/Roboto Medium/27904-28159.pbf | 0 .../main/assets/Roboto Medium/2816-3071.pbf | 0 .../main/assets/Roboto Medium/28160-28415.pbf | 0 .../main/assets/Roboto Medium/28416-28671.pbf | 0 .../main/assets/Roboto Medium/28672-28927.pbf | 0 .../main/assets/Roboto Medium/28928-29183.pbf | 0 .../main/assets/Roboto Medium/29184-29439.pbf | 0 .../main/assets/Roboto Medium/29440-29695.pbf | 0 .../main/assets/Roboto Medium/29696-29951.pbf | 0 .../main/assets/Roboto Medium/29952-30207.pbf | 0 .../main/assets/Roboto Medium/30208-30463.pbf | 0 .../main/assets/Roboto Medium/30464-30719.pbf | 0 .../main/assets/Roboto Medium/3072-3327.pbf | 0 .../main/assets/Roboto Medium/30720-30975.pbf | 0 .../main/assets/Roboto Medium/30976-31231.pbf | 0 .../main/assets/Roboto Medium/31232-31487.pbf | 0 .../main/assets/Roboto Medium/31488-31743.pbf | 0 .../main/assets/Roboto Medium/31744-31999.pbf | 0 .../main/assets/Roboto Medium/32000-32255.pbf | 0 .../main/assets/Roboto Medium/32256-32511.pbf | 0 .../main/assets/Roboto Medium/32512-32767.pbf | 0 .../main/assets/Roboto Medium/32768-33023.pbf | 0 .../main/assets/Roboto Medium/33024-33279.pbf | 0 .../main/assets/Roboto Medium/3328-3583.pbf | 0 .../main/assets/Roboto Medium/33280-33535.pbf | 0 .../main/assets/Roboto Medium/33536-33791.pbf | 0 .../main/assets/Roboto Medium/33792-34047.pbf | 0 .../main/assets/Roboto Medium/34048-34303.pbf | 0 .../main/assets/Roboto Medium/34304-34559.pbf | 0 .../main/assets/Roboto Medium/34560-34815.pbf | 0 .../main/assets/Roboto Medium/34816-35071.pbf | 0 .../main/assets/Roboto Medium/35072-35327.pbf | 0 .../main/assets/Roboto Medium/35328-35583.pbf | 0 .../main/assets/Roboto Medium/35584-35839.pbf | 0 .../main/assets/Roboto Medium/3584-3839.pbf | 0 .../main/assets/Roboto Medium/35840-36095.pbf | 0 .../main/assets/Roboto Medium/36096-36351.pbf | 0 .../main/assets/Roboto Medium/36352-36607.pbf | 0 .../main/assets/Roboto Medium/36608-36863.pbf | 0 .../main/assets/Roboto Medium/36864-37119.pbf | 0 .../main/assets/Roboto Medium/37120-37375.pbf | 0 .../main/assets/Roboto Medium/37376-37631.pbf | 0 .../main/assets/Roboto Medium/37632-37887.pbf | 0 .../main/assets/Roboto Medium/37888-38143.pbf | 0 .../main/assets/Roboto Medium/38144-38399.pbf | 0 .../main/assets/Roboto Medium/3840-4095.pbf | 0 .../main/assets/Roboto Medium/38400-38655.pbf | 0 .../main/assets/Roboto Medium/38656-38911.pbf | 0 .../main/assets/Roboto Medium/38912-39167.pbf | 0 .../main/assets/Roboto Medium/39168-39423.pbf | 0 .../main/assets/Roboto Medium/39424-39679.pbf | 0 .../main/assets/Roboto Medium/39680-39935.pbf | 0 .../main/assets/Roboto Medium/39936-40191.pbf | 0 .../main/assets/Roboto Medium/40192-40447.pbf | 0 .../main/assets/Roboto Medium/40448-40703.pbf | 0 .../main/assets/Roboto Medium/40704-40959.pbf | 0 .../main/assets/Roboto Medium/4096-4351.pbf | 0 .../main/assets/Roboto Medium/40960-41215.pbf | 0 .../main/assets/Roboto Medium/41216-41471.pbf | 0 .../main/assets/Roboto Medium/41472-41727.pbf | 0 .../main/assets/Roboto Medium/41728-41983.pbf | 0 .../main/assets/Roboto Medium/41984-42239.pbf | 0 .../main/assets/Roboto Medium/42240-42495.pbf | 0 .../main/assets/Roboto Medium/42496-42751.pbf | 0 .../main/assets/Roboto Medium/42752-43007.pbf | 0 .../main/assets/Roboto Medium/43008-43263.pbf | 0 .../main/assets/Roboto Medium/43264-43519.pbf | 0 .../main/assets/Roboto Medium/4352-4607.pbf | 0 .../main/assets/Roboto Medium/43520-43775.pbf | 0 .../main/assets/Roboto Medium/43776-44031.pbf | 0 .../main/assets/Roboto Medium/44032-44287.pbf | 0 .../main/assets/Roboto Medium/44288-44543.pbf | 0 .../main/assets/Roboto Medium/44544-44799.pbf | 0 .../main/assets/Roboto Medium/44800-45055.pbf | 0 .../main/assets/Roboto Medium/45056-45311.pbf | 0 .../main/assets/Roboto Medium/45312-45567.pbf | 0 .../main/assets/Roboto Medium/45568-45823.pbf | 0 .../main/assets/Roboto Medium/45824-46079.pbf | 0 .../main/assets/Roboto Medium/4608-4863.pbf | 0 .../main/assets/Roboto Medium/46080-46335.pbf | 0 .../main/assets/Roboto Medium/46336-46591.pbf | 0 .../main/assets/Roboto Medium/46592-46847.pbf | 0 .../main/assets/Roboto Medium/46848-47103.pbf | 0 .../main/assets/Roboto Medium/47104-47359.pbf | 0 .../main/assets/Roboto Medium/47360-47615.pbf | 0 .../main/assets/Roboto Medium/47616-47871.pbf | 0 .../main/assets/Roboto Medium/47872-48127.pbf | 0 .../main/assets/Roboto Medium/48128-48383.pbf | 0 .../main/assets/Roboto Medium/48384-48639.pbf | 0 .../main/assets/Roboto Medium/4864-5119.pbf | 0 .../main/assets/Roboto Medium/48640-48895.pbf | 0 .../main/assets/Roboto Medium/48896-49151.pbf | 0 .../main/assets/Roboto Medium/49152-49407.pbf | 0 .../main/assets/Roboto Medium/49408-49663.pbf | 0 .../main/assets/Roboto Medium/49664-49919.pbf | 0 .../main/assets/Roboto Medium/49920-50175.pbf | 0 .../main/assets/Roboto Medium/50176-50431.pbf | 0 .../main/assets/Roboto Medium/50432-50687.pbf | 0 .../main/assets/Roboto Medium/50688-50943.pbf | 0 .../main/assets/Roboto Medium/50944-51199.pbf | 0 .../src/main/assets/Roboto Medium/512-767.pbf | Bin .../main/assets/Roboto Medium/5120-5375.pbf | 0 .../main/assets/Roboto Medium/51200-51455.pbf | 0 .../main/assets/Roboto Medium/51456-51711.pbf | 0 .../main/assets/Roboto Medium/51712-51967.pbf | 0 .../main/assets/Roboto Medium/51968-52223.pbf | 0 .../main/assets/Roboto Medium/52224-52479.pbf | 0 .../main/assets/Roboto Medium/52480-52735.pbf | 0 .../main/assets/Roboto Medium/52736-52991.pbf | 0 .../main/assets/Roboto Medium/52992-53247.pbf | 0 .../main/assets/Roboto Medium/53248-53503.pbf | 0 .../main/assets/Roboto Medium/53504-53759.pbf | 0 .../main/assets/Roboto Medium/5376-5631.pbf | 0 .../main/assets/Roboto Medium/53760-54015.pbf | 0 .../main/assets/Roboto Medium/54016-54271.pbf | 0 .../main/assets/Roboto Medium/54272-54527.pbf | 0 .../main/assets/Roboto Medium/54528-54783.pbf | 0 .../main/assets/Roboto Medium/54784-55039.pbf | 0 .../main/assets/Roboto Medium/55040-55295.pbf | 0 .../main/assets/Roboto Medium/55296-55551.pbf | 0 .../main/assets/Roboto Medium/55552-55807.pbf | 0 .../main/assets/Roboto Medium/55808-56063.pbf | 0 .../main/assets/Roboto Medium/56064-56319.pbf | 0 .../main/assets/Roboto Medium/5632-5887.pbf | 0 .../main/assets/Roboto Medium/56320-56575.pbf | 0 .../main/assets/Roboto Medium/56576-56831.pbf | 0 .../main/assets/Roboto Medium/56832-57087.pbf | 0 .../main/assets/Roboto Medium/57088-57343.pbf | 0 .../main/assets/Roboto Medium/57344-57599.pbf | 0 .../main/assets/Roboto Medium/57600-57855.pbf | 0 .../main/assets/Roboto Medium/57856-58111.pbf | 0 .../main/assets/Roboto Medium/58112-58367.pbf | 0 .../main/assets/Roboto Medium/58368-58623.pbf | 0 .../main/assets/Roboto Medium/58624-58879.pbf | 0 .../main/assets/Roboto Medium/5888-6143.pbf | 0 .../main/assets/Roboto Medium/58880-59135.pbf | 0 .../main/assets/Roboto Medium/59136-59391.pbf | 0 .../main/assets/Roboto Medium/59392-59647.pbf | 0 .../main/assets/Roboto Medium/59648-59903.pbf | 0 .../main/assets/Roboto Medium/59904-60159.pbf | 0 .../main/assets/Roboto Medium/60160-60415.pbf | 0 .../main/assets/Roboto Medium/60416-60671.pbf | 0 .../main/assets/Roboto Medium/60672-60927.pbf | 0 .../main/assets/Roboto Medium/60928-61183.pbf | 0 .../main/assets/Roboto Medium/61184-61439.pbf | 0 .../main/assets/Roboto Medium/6144-6399.pbf | 0 .../main/assets/Roboto Medium/61440-61695.pbf | 0 .../main/assets/Roboto Medium/61696-61951.pbf | 0 .../main/assets/Roboto Medium/61952-62207.pbf | 0 .../main/assets/Roboto Medium/62208-62463.pbf | 0 .../main/assets/Roboto Medium/62464-62719.pbf | 0 .../main/assets/Roboto Medium/62720-62975.pbf | 0 .../main/assets/Roboto Medium/62976-63231.pbf | Bin .../main/assets/Roboto Medium/63232-63487.pbf | 0 .../main/assets/Roboto Medium/63488-63743.pbf | 0 .../main/assets/Roboto Medium/63744-63999.pbf | 0 .../main/assets/Roboto Medium/6400-6655.pbf | 0 .../main/assets/Roboto Medium/64000-64255.pbf | 0 .../main/assets/Roboto Medium/64256-64511.pbf | Bin .../main/assets/Roboto Medium/64512-64767.pbf | 0 .../main/assets/Roboto Medium/64768-65023.pbf | 0 .../main/assets/Roboto Medium/65024-65279.pbf | Bin .../main/assets/Roboto Medium/65280-65535.pbf | Bin .../main/assets/Roboto Medium/6656-6911.pbf | 0 .../main/assets/Roboto Medium/6912-7167.pbf | 0 .../main/assets/Roboto Medium/7168-7423.pbf | 0 .../main/assets/Roboto Medium/7424-7679.pbf | 0 .../main/assets/Roboto Medium/768-1023.pbf | Bin .../main/assets/Roboto Medium/7680-7935.pbf | Bin .../main/assets/Roboto Medium/7936-8191.pbf | Bin .../main/assets/Roboto Medium/8192-8447.pbf | Bin .../main/assets/Roboto Medium/8448-8703.pbf | Bin .../main/assets/Roboto Medium/8704-8959.pbf | Bin .../main/assets/Roboto Medium/8960-9215.pbf | 0 .../main/assets/Roboto Medium/9216-9471.pbf | 0 .../main/assets/Roboto Medium/9472-9727.pbf | Bin .../main/assets/Roboto Medium/9728-9983.pbf | 0 .../main/assets/Roboto Medium/9984-10239.pbf | 0 .../src/main/assets/Roboto Regular/0-255.pbf | Bin .../main/assets/Roboto Regular/1024-1279.pbf | Bin .../assets/Roboto Regular/10240-10495.pbf | 0 .../assets/Roboto Regular/10496-10751.pbf | 0 .../assets/Roboto Regular/10752-11007.pbf | 0 .../assets/Roboto Regular/11008-11263.pbf | 0 .../assets/Roboto Regular/11264-11519.pbf | 0 .../assets/Roboto Regular/11520-11775.pbf | 0 .../assets/Roboto Regular/11776-12031.pbf | 0 .../assets/Roboto Regular/12032-12287.pbf | 0 .../assets/Roboto Regular/12288-12543.pbf | 0 .../assets/Roboto Regular/12544-12799.pbf | 0 .../main/assets/Roboto Regular/1280-1535.pbf | Bin .../assets/Roboto Regular/12800-13055.pbf | 0 .../assets/Roboto Regular/13056-13311.pbf | 0 .../assets/Roboto Regular/13312-13567.pbf | 0 .../assets/Roboto Regular/13568-13823.pbf | 0 .../assets/Roboto Regular/13824-14079.pbf | 0 .../assets/Roboto Regular/14080-14335.pbf | 0 .../assets/Roboto Regular/14336-14591.pbf | 0 .../assets/Roboto Regular/14592-14847.pbf | 0 .../assets/Roboto Regular/14848-15103.pbf | 0 .../assets/Roboto Regular/15104-15359.pbf | 0 .../main/assets/Roboto Regular/1536-1791.pbf | 0 .../assets/Roboto Regular/15360-15615.pbf | 0 .../assets/Roboto Regular/15616-15871.pbf | 0 .../assets/Roboto Regular/15872-16127.pbf | 0 .../assets/Roboto Regular/16128-16383.pbf | 0 .../assets/Roboto Regular/16384-16639.pbf | 0 .../assets/Roboto Regular/16640-16895.pbf | 0 .../assets/Roboto Regular/16896-17151.pbf | 0 .../assets/Roboto Regular/17152-17407.pbf | 0 .../assets/Roboto Regular/17408-17663.pbf | 0 .../assets/Roboto Regular/17664-17919.pbf | 0 .../main/assets/Roboto Regular/1792-2047.pbf | 0 .../assets/Roboto Regular/17920-18175.pbf | 0 .../assets/Roboto Regular/18176-18431.pbf | 0 .../assets/Roboto Regular/18432-18687.pbf | 0 .../assets/Roboto Regular/18688-18943.pbf | 0 .../assets/Roboto Regular/18944-19199.pbf | 0 .../assets/Roboto Regular/19200-19455.pbf | 0 .../assets/Roboto Regular/19456-19711.pbf | 0 .../assets/Roboto Regular/19712-19967.pbf | 0 .../assets/Roboto Regular/19968-20223.pbf | 0 .../assets/Roboto Regular/20224-20479.pbf | 0 .../main/assets/Roboto Regular/2048-2303.pbf | 0 .../assets/Roboto Regular/20480-20735.pbf | 0 .../assets/Roboto Regular/20736-20991.pbf | 0 .../assets/Roboto Regular/20992-21247.pbf | 0 .../assets/Roboto Regular/21248-21503.pbf | 0 .../assets/Roboto Regular/21504-21759.pbf | 0 .../assets/Roboto Regular/21760-22015.pbf | 0 .../assets/Roboto Regular/22016-22271.pbf | 0 .../assets/Roboto Regular/22272-22527.pbf | 0 .../assets/Roboto Regular/22528-22783.pbf | 0 .../assets/Roboto Regular/22784-23039.pbf | 0 .../main/assets/Roboto Regular/2304-2559.pbf | 0 .../assets/Roboto Regular/23040-23295.pbf | 0 .../assets/Roboto Regular/23296-23551.pbf | 0 .../assets/Roboto Regular/23552-23807.pbf | 0 .../assets/Roboto Regular/23808-24063.pbf | 0 .../assets/Roboto Regular/24064-24319.pbf | 0 .../assets/Roboto Regular/24320-24575.pbf | 0 .../assets/Roboto Regular/24576-24831.pbf | 0 .../assets/Roboto Regular/24832-25087.pbf | 0 .../assets/Roboto Regular/25088-25343.pbf | 0 .../assets/Roboto Regular/25344-25599.pbf | 0 .../main/assets/Roboto Regular/256-511.pbf | Bin .../main/assets/Roboto Regular/2560-2815.pbf | 0 .../assets/Roboto Regular/25600-25855.pbf | 0 .../assets/Roboto Regular/25856-26111.pbf | 0 .../assets/Roboto Regular/26112-26367.pbf | 0 .../assets/Roboto Regular/26368-26623.pbf | 0 .../assets/Roboto Regular/26624-26879.pbf | 0 .../assets/Roboto Regular/26880-27135.pbf | 0 .../assets/Roboto Regular/27136-27391.pbf | 0 .../assets/Roboto Regular/27392-27647.pbf | 0 .../assets/Roboto Regular/27648-27903.pbf | 0 .../assets/Roboto Regular/27904-28159.pbf | 0 .../main/assets/Roboto Regular/2816-3071.pbf | 0 .../assets/Roboto Regular/28160-28415.pbf | 0 .../assets/Roboto Regular/28416-28671.pbf | 0 .../assets/Roboto Regular/28672-28927.pbf | 0 .../assets/Roboto Regular/28928-29183.pbf | 0 .../assets/Roboto Regular/29184-29439.pbf | 0 .../assets/Roboto Regular/29440-29695.pbf | 0 .../assets/Roboto Regular/29696-29951.pbf | 0 .../assets/Roboto Regular/29952-30207.pbf | 0 .../assets/Roboto Regular/30208-30463.pbf | 0 .../assets/Roboto Regular/30464-30719.pbf | 0 .../main/assets/Roboto Regular/3072-3327.pbf | 0 .../assets/Roboto Regular/30720-30975.pbf | 0 .../assets/Roboto Regular/30976-31231.pbf | 0 .../assets/Roboto Regular/31232-31487.pbf | 0 .../assets/Roboto Regular/31488-31743.pbf | 0 .../assets/Roboto Regular/31744-31999.pbf | 0 .../assets/Roboto Regular/32000-32255.pbf | 0 .../assets/Roboto Regular/32256-32511.pbf | 0 .../assets/Roboto Regular/32512-32767.pbf | 0 .../assets/Roboto Regular/32768-33023.pbf | 0 .../assets/Roboto Regular/33024-33279.pbf | 0 .../main/assets/Roboto Regular/3328-3583.pbf | 0 .../assets/Roboto Regular/33280-33535.pbf | 0 .../assets/Roboto Regular/33536-33791.pbf | 0 .../assets/Roboto Regular/33792-34047.pbf | 0 .../assets/Roboto Regular/34048-34303.pbf | 0 .../assets/Roboto Regular/34304-34559.pbf | 0 .../assets/Roboto Regular/34560-34815.pbf | 0 .../assets/Roboto Regular/34816-35071.pbf | 0 .../assets/Roboto Regular/35072-35327.pbf | 0 .../assets/Roboto Regular/35328-35583.pbf | 0 .../assets/Roboto Regular/35584-35839.pbf | 0 .../main/assets/Roboto Regular/3584-3839.pbf | 0 .../assets/Roboto Regular/35840-36095.pbf | 0 .../assets/Roboto Regular/36096-36351.pbf | 0 .../assets/Roboto Regular/36352-36607.pbf | 0 .../assets/Roboto Regular/36608-36863.pbf | 0 .../assets/Roboto Regular/36864-37119.pbf | 0 .../assets/Roboto Regular/37120-37375.pbf | 0 .../assets/Roboto Regular/37376-37631.pbf | 0 .../assets/Roboto Regular/37632-37887.pbf | 0 .../assets/Roboto Regular/37888-38143.pbf | 0 .../assets/Roboto Regular/38144-38399.pbf | 0 .../main/assets/Roboto Regular/3840-4095.pbf | 0 .../assets/Roboto Regular/38400-38655.pbf | 0 .../assets/Roboto Regular/38656-38911.pbf | 0 .../assets/Roboto Regular/38912-39167.pbf | 0 .../assets/Roboto Regular/39168-39423.pbf | 0 .../assets/Roboto Regular/39424-39679.pbf | 0 .../assets/Roboto Regular/39680-39935.pbf | 0 .../assets/Roboto Regular/39936-40191.pbf | 0 .../assets/Roboto Regular/40192-40447.pbf | 0 .../assets/Roboto Regular/40448-40703.pbf | 0 .../assets/Roboto Regular/40704-40959.pbf | 0 .../main/assets/Roboto Regular/4096-4351.pbf | 0 .../assets/Roboto Regular/40960-41215.pbf | 0 .../assets/Roboto Regular/41216-41471.pbf | 0 .../assets/Roboto Regular/41472-41727.pbf | 0 .../assets/Roboto Regular/41728-41983.pbf | 0 .../assets/Roboto Regular/41984-42239.pbf | 0 .../assets/Roboto Regular/42240-42495.pbf | 0 .../assets/Roboto Regular/42496-42751.pbf | 0 .../assets/Roboto Regular/42752-43007.pbf | Bin .../assets/Roboto Regular/43008-43263.pbf | 0 .../assets/Roboto Regular/43264-43519.pbf | 0 .../main/assets/Roboto Regular/4352-4607.pbf | 0 .../assets/Roboto Regular/43520-43775.pbf | 0 .../assets/Roboto Regular/43776-44031.pbf | Bin .../assets/Roboto Regular/44032-44287.pbf | 0 .../assets/Roboto Regular/44288-44543.pbf | 0 .../assets/Roboto Regular/44544-44799.pbf | 0 .../assets/Roboto Regular/44800-45055.pbf | 0 .../assets/Roboto Regular/45056-45311.pbf | 0 .../assets/Roboto Regular/45312-45567.pbf | 0 .../assets/Roboto Regular/45568-45823.pbf | 0 .../assets/Roboto Regular/45824-46079.pbf | 0 .../main/assets/Roboto Regular/4608-4863.pbf | 0 .../assets/Roboto Regular/46080-46335.pbf | 0 .../assets/Roboto Regular/46336-46591.pbf | 0 .../assets/Roboto Regular/46592-46847.pbf | 0 .../assets/Roboto Regular/46848-47103.pbf | 0 .../assets/Roboto Regular/47104-47359.pbf | 0 .../assets/Roboto Regular/47360-47615.pbf | 0 .../assets/Roboto Regular/47616-47871.pbf | 0 .../assets/Roboto Regular/47872-48127.pbf | 0 .../assets/Roboto Regular/48128-48383.pbf | 0 .../assets/Roboto Regular/48384-48639.pbf | 0 .../main/assets/Roboto Regular/4864-5119.pbf | 0 .../assets/Roboto Regular/48640-48895.pbf | 0 .../assets/Roboto Regular/48896-49151.pbf | 0 .../assets/Roboto Regular/49152-49407.pbf | 0 .../assets/Roboto Regular/49408-49663.pbf | 0 .../assets/Roboto Regular/49664-49919.pbf | 0 .../assets/Roboto Regular/49920-50175.pbf | 0 .../assets/Roboto Regular/50176-50431.pbf | 0 .../assets/Roboto Regular/50432-50687.pbf | 0 .../assets/Roboto Regular/50688-50943.pbf | 0 .../assets/Roboto Regular/50944-51199.pbf | 0 .../main/assets/Roboto Regular/512-767.pbf | Bin .../main/assets/Roboto Regular/5120-5375.pbf | 0 .../assets/Roboto Regular/51200-51455.pbf | 0 .../assets/Roboto Regular/51456-51711.pbf | 0 .../assets/Roboto Regular/51712-51967.pbf | 0 .../assets/Roboto Regular/51968-52223.pbf | 0 .../assets/Roboto Regular/52224-52479.pbf | 0 .../assets/Roboto Regular/52480-52735.pbf | 0 .../assets/Roboto Regular/52736-52991.pbf | 0 .../assets/Roboto Regular/52992-53247.pbf | 0 .../assets/Roboto Regular/53248-53503.pbf | 0 .../assets/Roboto Regular/53504-53759.pbf | 0 .../main/assets/Roboto Regular/5376-5631.pbf | 0 .../assets/Roboto Regular/53760-54015.pbf | 0 .../assets/Roboto Regular/54016-54271.pbf | 0 .../assets/Roboto Regular/54272-54527.pbf | 0 .../assets/Roboto Regular/54528-54783.pbf | 0 .../assets/Roboto Regular/54784-55039.pbf | 0 .../assets/Roboto Regular/55040-55295.pbf | 0 .../assets/Roboto Regular/55296-55551.pbf | 0 .../assets/Roboto Regular/55552-55807.pbf | 0 .../assets/Roboto Regular/55808-56063.pbf | 0 .../assets/Roboto Regular/56064-56319.pbf | 0 .../main/assets/Roboto Regular/5632-5887.pbf | 0 .../assets/Roboto Regular/56320-56575.pbf | 0 .../assets/Roboto Regular/56576-56831.pbf | 0 .../assets/Roboto Regular/56832-57087.pbf | 0 .../assets/Roboto Regular/57088-57343.pbf | 0 .../assets/Roboto Regular/57344-57599.pbf | 0 .../assets/Roboto Regular/57600-57855.pbf | 0 .../assets/Roboto Regular/57856-58111.pbf | 0 .../assets/Roboto Regular/58112-58367.pbf | 0 .../assets/Roboto Regular/58368-58623.pbf | 0 .../assets/Roboto Regular/58624-58879.pbf | 0 .../main/assets/Roboto Regular/5888-6143.pbf | 0 .../assets/Roboto Regular/58880-59135.pbf | 0 .../assets/Roboto Regular/59136-59391.pbf | 0 .../assets/Roboto Regular/59392-59647.pbf | 0 .../assets/Roboto Regular/59648-59903.pbf | 0 .../assets/Roboto Regular/59904-60159.pbf | 0 .../assets/Roboto Regular/60160-60415.pbf | 0 .../assets/Roboto Regular/60416-60671.pbf | 0 .../assets/Roboto Regular/60672-60927.pbf | 0 .../assets/Roboto Regular/60928-61183.pbf | 0 .../assets/Roboto Regular/61184-61439.pbf | 0 .../main/assets/Roboto Regular/6144-6399.pbf | 0 .../assets/Roboto Regular/61440-61695.pbf | 0 .../assets/Roboto Regular/61696-61951.pbf | 0 .../assets/Roboto Regular/61952-62207.pbf | 0 .../assets/Roboto Regular/62208-62463.pbf | 0 .../assets/Roboto Regular/62464-62719.pbf | 0 .../assets/Roboto Regular/62720-62975.pbf | 0 .../assets/Roboto Regular/62976-63231.pbf | 0 .../assets/Roboto Regular/63232-63487.pbf | 0 .../assets/Roboto Regular/63488-63743.pbf | 0 .../assets/Roboto Regular/63744-63999.pbf | 0 .../main/assets/Roboto Regular/6400-6655.pbf | 0 .../assets/Roboto Regular/64000-64255.pbf | 0 .../assets/Roboto Regular/64256-64511.pbf | Bin .../assets/Roboto Regular/64512-64767.pbf | 0 .../assets/Roboto Regular/64768-65023.pbf | 0 .../assets/Roboto Regular/65024-65279.pbf | Bin .../assets/Roboto Regular/65280-65535.pbf | Bin .../main/assets/Roboto Regular/6656-6911.pbf | 0 .../main/assets/Roboto Regular/6912-7167.pbf | 0 .../main/assets/Roboto Regular/7168-7423.pbf | 0 .../main/assets/Roboto Regular/7424-7679.pbf | 0 .../main/assets/Roboto Regular/768-1023.pbf | Bin .../main/assets/Roboto Regular/7680-7935.pbf | Bin .../main/assets/Roboto Regular/7936-8191.pbf | Bin .../main/assets/Roboto Regular/8192-8447.pbf | Bin .../main/assets/Roboto Regular/8448-8703.pbf | Bin .../main/assets/Roboto Regular/8704-8959.pbf | Bin .../main/assets/Roboto Regular/8960-9215.pbf | 0 .../main/assets/Roboto Regular/9216-9471.pbf | 0 .../main/assets/Roboto Regular/9472-9727.pbf | Bin .../main/assets/Roboto Regular/9728-9983.pbf | 0 .../main/assets/Roboto Regular/9984-10239.pbf | 0 .../core/mapbox}/src/main/assets/sprites.json | 0 .../core/mapbox}/src/main/assets/sprites.png | Bin .../mapbox}/src/main/assets/sprites@2x.json | 0 .../mapbox}/src/main/assets/sprites@2x.png | Bin .../assets/style-mapbox-outdoors-v12.json | 0 .../assets/style-microg-normal-mapbox.json | 0 .../assets/style-microg-normal-stadia.json | 0 .../assets/style-microg-satellite-mapbox.json | 0 .../assets/style-microg-satellite-stadia.json | 0 .../main/assets/style-stadia-outdoors.json | 0 .../gms/maps_dynamite/ModuleDescriptor.java | 0 .../gms/maps/internal/CreatorImpl.java | 0 .../android/accounts/v1/MapboxAccounts.java | 0 .../gms/maps/mapbox/AbstractGoogleMap.kt | 0 .../maps/mapbox/CameraBoundsWithSizeUpdate.kt | 0 .../gms/maps/mapbox/CameraUpdateFactory.kt | 0 .../gms/maps/mapbox/GoogleLocationEngine.kt | 0 .../org/microg/gms/maps/mapbox/GoogleMap.kt | 0 .../microg/gms/maps/mapbox/LiteGoogleMap.kt | 0 .../org/microg/gms/maps/mapbox/MapFragment.kt | 0 .../org/microg/gms/maps/mapbox/MapView.kt | 0 .../org/microg/gms/maps/mapbox/Pattern.kt | 0 .../org/microg/gms/maps/mapbox/Projection.kt | 0 .../gms/maps/mapbox/SourceLocationEngine.kt | 0 .../org/microg/gms/maps/mapbox/Styles.kt | 0 .../org/microg/gms/maps/mapbox/UiSettings.kt | 0 .../gms/maps/mapbox/model/BitmapDescriptor.kt | 0 .../mapbox/model/BitmapDescriptorFactory.kt | 0 .../microg/gms/maps/mapbox/model/Circle.kt | 0 .../gms/maps/mapbox/model/GroundOverlay.kt | 0 .../gms/maps/mapbox/model/InfoWindow.kt | 0 .../microg/gms/maps/mapbox/model/Marker.kt | 0 .../microg/gms/maps/mapbox/model/Markup.kt | 0 .../microg/gms/maps/mapbox/model/Polygon.kt | 0 .../microg/gms/maps/mapbox/model/Polyline.kt | 0 .../gms/maps/mapbox/model/TileOverlay.kt | 0 .../gms/maps/mapbox/utils/MapContext.kt | 0 .../gms/maps/mapbox/utils/MultiArchLoader.kt | 0 .../gms/maps/mapbox/utils/typeConverter.kt | 0 .../res/drawable-hdpi/maps_default_marker.png | Bin .../res/drawable-ldpi/maps_default_marker.png | Bin .../res/drawable-mdpi/maps_default_marker.png | Bin .../drawable-xhdpi/maps_default_marker.png | Bin .../drawable-xxhdpi/maps_default_marker.png | Bin .../drawable-xxxhdpi/maps_default_marker.png | Bin .../src/main/res/drawable/location_dot.xml | 0 .../main/res/drawable/maps_default_bubble.xml | 0 .../res/layout/maps_default_bubble_layout.xml | 0 .../core/vtm}/build.gradle | 6 +- .../core/vtm/microg-theme}/build.gradle | 0 .../resources/assets/styles/microg.xml | 0 .../resources/assets/symbols/dot_white.svg | 0 .../assets/symbols/transit/train_station.svg | 0 .../symbols/transit/train_station_small.svg | 0 .../src/org/oscim/theme/MicrogThemes.java | 0 .../core/vtm}/src/main/AndroidManifest.xml | 0 .../gms/maps/internal/CreatorImpl.java | 0 .../maps/vtm/ApplicationContextWrapper.java | 0 .../org/microg/gms/maps/vtm/BackendMap.java | 0 .../microg/gms/maps/vtm/BackendMapView.java | 0 .../microg/gms/maps/vtm/ContainerLayout.java | 0 .../gms/maps/vtm/GmsMapsTypeHelper.java | 0 .../microg/gms/maps/vtm/GoogleMapImpl.java | 0 .../microg/gms/maps/vtm/MapFragmentImpl.java | 0 .../org/microg/gms/maps/vtm/MapViewImpl.java | 0 .../microg/gms/maps/vtm/ProjectionImpl.java | 0 .../gms/maps/vtm/ResourcesContainer.java | 0 .../microg/gms/maps/vtm/UiSettingsImpl.java | 0 .../vtm/bitmap/AbstractBitmapDescriptor.java | 0 .../vtm/bitmap/AssetBitmapDescriptor.java | 0 .../vtm/bitmap/BitmapBitmapDescriptor.java | 0 .../bitmap/BitmapDescriptorFactoryImpl.java | 0 .../maps/vtm/bitmap/BitmapDescriptorImpl.java | 0 .../vtm/bitmap/DefaultBitmapDescriptor.java | 0 .../maps/vtm/bitmap/FileBitmapDescriptor.java | 0 .../maps/vtm/bitmap/PathBitmapDescriptor.java | 0 .../vtm/bitmap/ResourceBitmapDescriptor.java | 0 .../gms/maps/vtm/camera/CameraUpdate.java | 0 .../vtm/camera/CameraUpdateFactoryImpl.java | 0 .../vtm/camera/MapPositionCameraUpdate.java | 0 .../gms/maps/vtm/camera/NoCameraUpdate.java | 0 .../gms/maps/vtm/data/SharedTileCache.java | 0 .../gms/maps/vtm/data/SharedTileProvider.java | 0 .../gms/maps/vtm/markup/CircleImpl.java | 0 .../maps/vtm/markup/ClearableVectorLayer.java | 0 .../gms/maps/vtm/markup/DrawableMarkup.java | 0 .../maps/vtm/markup/GroundOverlayImpl.java | 0 .../gms/maps/vtm/markup/InfoWindow.java | 0 .../gms/maps/vtm/markup/MarkerImpl.java | 0 .../gms/maps/vtm/markup/MarkerItemMarkup.java | 0 .../microg/gms/maps/vtm/markup/Markup.java | 0 .../gms/maps/vtm/markup/PolygonImpl.java | 0 .../gms/maps/vtm/markup/PolylineImpl.java | 0 .../gms/maps/vtm/markup/TileOverlayImpl.java | 0 .../main/res/drawable/maps_default_marker.png | Bin .../res/drawable/maps_default_window.9.png | Bin .../core/vtm}/src/main/res/drawable/nop.png | Bin .../core/package/build.gradle | 47 +++++++++++ .../package/src/main}/AndroidManifest.xml | 13 +++- .../ExposureNotificationsSettingsProvider.kt | 65 ++++++++++++++++ .../core/src/main/AndroidManifest.xml | 5 +- .../exposurenotification/ExposureDatabase.kt | 14 ++++ settings.gradle | 7 +- 906 files changed, 364 insertions(+), 207 deletions(-) create mode 100644 play-services-base/core/src/main/kotlin/org/microg/gms/ui/settings/SettingsProvider.kt delete mode 100644 play-services-core/src/withNearby/kotlin/org/microg/gms/ui/NearbyPreferencesIntegration.kt delete mode 100644 play-services-core/src/withoutNearby/kotlin/org/microg/gms/ui/NearbyPreferencesIntegration.kt delete mode 100644 play-services-core/src/withoutNearby/res/navigation/nav_nearby.xml delete mode 100644 play-services-core/src/withoutNearby/res/values/strings.xml rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/build.gradle (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/AndroidManifest.xml (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Open Sans Regular,Arial Unicode MS Regular (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/0-255.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/1024-1279.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/10240-10495.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/10496-10751.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/10752-11007.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/11008-11263.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/11264-11519.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/11520-11775.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/11776-12031.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/12032-12287.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/12288-12543.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/12544-12799.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/1280-1535.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/12800-13055.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/13056-13311.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/13312-13567.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/13568-13823.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/13824-14079.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/14080-14335.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/14336-14591.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/14592-14847.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/14848-15103.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/15104-15359.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/1536-1791.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/15360-15615.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/15616-15871.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/15872-16127.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/16128-16383.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/16384-16639.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/16640-16895.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/16896-17151.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/17152-17407.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/17408-17663.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/17664-17919.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/1792-2047.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/17920-18175.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/18176-18431.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/18432-18687.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/18688-18943.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/18944-19199.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/19200-19455.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/19456-19711.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/19712-19967.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/19968-20223.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/20224-20479.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/2048-2303.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/20480-20735.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/20736-20991.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/20992-21247.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/21248-21503.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/21504-21759.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/21760-22015.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/22016-22271.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/22272-22527.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/22528-22783.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/22784-23039.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/2304-2559.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/23040-23295.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/23296-23551.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/23552-23807.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/23808-24063.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/24064-24319.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/24320-24575.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/24576-24831.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/24832-25087.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/25088-25343.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/25344-25599.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/256-511.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/2560-2815.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/25600-25855.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/25856-26111.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/26112-26367.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/26368-26623.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/26624-26879.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/26880-27135.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/27136-27391.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/27392-27647.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/27648-27903.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/27904-28159.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/2816-3071.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/28160-28415.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/28416-28671.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/28672-28927.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/28928-29183.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/29184-29439.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/29440-29695.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/29696-29951.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/29952-30207.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/30208-30463.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/30464-30719.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/3072-3327.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/30720-30975.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/30976-31231.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/31232-31487.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/31488-31743.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/31744-31999.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/32000-32255.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/32256-32511.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/32512-32767.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/32768-33023.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/33024-33279.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/3328-3583.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/33280-33535.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/33536-33791.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/33792-34047.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/34048-34303.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/34304-34559.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/34560-34815.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/34816-35071.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/35072-35327.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/35328-35583.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/35584-35839.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/3584-3839.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/35840-36095.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/36096-36351.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/36352-36607.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/36608-36863.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/36864-37119.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/37120-37375.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/37376-37631.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/37632-37887.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/37888-38143.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/38144-38399.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/3840-4095.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/38400-38655.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/38656-38911.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/38912-39167.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/39168-39423.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/39424-39679.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/39680-39935.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/39936-40191.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/40192-40447.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/40448-40703.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/40704-40959.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/4096-4351.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/40960-41215.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/41216-41471.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/41472-41727.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/41728-41983.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/41984-42239.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/42240-42495.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/42496-42751.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/42752-43007.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/43008-43263.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/43264-43519.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/4352-4607.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/43520-43775.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/43776-44031.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/44032-44287.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/44288-44543.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/44544-44799.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/44800-45055.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/45056-45311.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/45312-45567.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/45568-45823.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/45824-46079.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/4608-4863.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/46080-46335.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/46336-46591.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/46592-46847.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/46848-47103.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/47104-47359.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/47360-47615.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/47616-47871.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/47872-48127.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/48128-48383.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/48384-48639.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/4864-5119.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/48640-48895.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/48896-49151.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/49152-49407.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/49408-49663.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/49664-49919.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/49920-50175.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/50176-50431.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/50432-50687.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/50688-50943.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/50944-51199.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/512-767.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/5120-5375.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/51200-51455.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/51456-51711.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/51712-51967.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/51968-52223.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/52224-52479.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/52480-52735.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/52736-52991.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/52992-53247.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/53248-53503.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/53504-53759.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/5376-5631.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/53760-54015.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/54016-54271.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/54272-54527.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/54528-54783.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/54784-55039.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/55040-55295.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/55296-55551.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/55552-55807.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/55808-56063.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/56064-56319.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/5632-5887.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/56320-56575.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/56576-56831.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/56832-57087.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/57088-57343.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/57344-57599.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/57600-57855.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/57856-58111.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/58112-58367.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/58368-58623.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/58624-58879.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/5888-6143.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/58880-59135.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/59136-59391.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/59392-59647.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/59648-59903.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/59904-60159.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/60160-60415.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/60416-60671.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/60672-60927.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/60928-61183.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/61184-61439.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/6144-6399.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/61440-61695.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/61696-61951.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/61952-62207.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/62208-62463.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/62464-62719.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/62720-62975.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/62976-63231.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/63232-63487.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/63488-63743.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/63744-63999.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/6400-6655.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/64000-64255.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/64256-64511.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/64512-64767.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/64768-65023.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/65024-65279.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/65280-65535.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/6656-6911.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/6912-7167.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/7168-7423.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/7424-7679.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/768-1023.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/7680-7935.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/7936-8191.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/8192-8447.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/8448-8703.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/8704-8959.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/8960-9215.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/9216-9471.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/9472-9727.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/9728-9983.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Bold/9984-10239.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/0-255.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/1024-1279.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/10240-10495.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/10496-10751.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/10752-11007.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/11008-11263.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/11264-11519.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/11520-11775.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/11776-12031.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/12032-12287.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/12288-12543.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/12544-12799.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/1280-1535.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/12800-13055.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/13056-13311.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/13312-13567.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/13568-13823.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/13824-14079.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/14080-14335.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/14336-14591.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/14592-14847.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/14848-15103.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/15104-15359.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/1536-1791.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/15360-15615.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/15616-15871.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/15872-16127.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/16128-16383.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/16384-16639.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/16640-16895.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/16896-17151.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/17152-17407.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/17408-17663.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/17664-17919.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/1792-2047.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/17920-18175.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/18176-18431.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/18432-18687.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/18688-18943.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/18944-19199.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/19200-19455.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/19456-19711.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/19712-19967.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/19968-20223.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/20224-20479.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/2048-2303.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/20480-20735.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/20736-20991.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/20992-21247.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/21248-21503.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/21504-21759.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/21760-22015.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/22016-22271.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/22272-22527.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/22528-22783.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/22784-23039.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/2304-2559.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/23040-23295.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/23296-23551.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/23552-23807.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/23808-24063.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/24064-24319.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/24320-24575.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/24576-24831.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/24832-25087.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/25088-25343.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/25344-25599.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/256-511.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/2560-2815.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/25600-25855.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/25856-26111.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/26112-26367.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/26368-26623.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/26624-26879.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/26880-27135.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/27136-27391.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/27392-27647.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/27648-27903.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/27904-28159.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/2816-3071.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/28160-28415.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/28416-28671.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/28672-28927.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/28928-29183.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/29184-29439.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/29440-29695.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/29696-29951.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/29952-30207.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/30208-30463.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/30464-30719.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/3072-3327.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/30720-30975.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/30976-31231.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/31232-31487.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/31488-31743.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/31744-31999.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/32000-32255.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/32256-32511.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/32512-32767.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/32768-33023.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/33024-33279.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/3328-3583.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/33280-33535.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/33536-33791.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/33792-34047.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/34048-34303.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/34304-34559.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/34560-34815.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/34816-35071.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/35072-35327.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/35328-35583.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/35584-35839.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/3584-3839.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/35840-36095.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/36096-36351.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/36352-36607.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/36608-36863.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/36864-37119.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/37120-37375.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/37376-37631.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/37632-37887.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/37888-38143.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/38144-38399.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/3840-4095.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/38400-38655.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/38656-38911.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/38912-39167.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/39168-39423.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/39424-39679.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/39680-39935.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/39936-40191.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/40192-40447.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/40448-40703.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/40704-40959.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/4096-4351.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/40960-41215.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/41216-41471.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/41472-41727.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/41728-41983.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/41984-42239.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/42240-42495.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/42496-42751.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/42752-43007.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/43008-43263.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/43264-43519.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/4352-4607.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/43520-43775.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/43776-44031.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/44032-44287.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/44288-44543.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/44544-44799.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/44800-45055.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/45056-45311.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/45312-45567.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/45568-45823.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/45824-46079.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/4608-4863.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/46080-46335.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/46336-46591.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/46592-46847.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/46848-47103.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/47104-47359.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/47360-47615.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/47616-47871.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/47872-48127.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/48128-48383.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/48384-48639.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/4864-5119.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/48640-48895.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/48896-49151.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/49152-49407.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/49408-49663.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/49664-49919.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/49920-50175.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/50176-50431.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/50432-50687.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/50688-50943.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/50944-51199.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/512-767.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/5120-5375.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/51200-51455.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/51456-51711.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/51712-51967.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/51968-52223.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/52224-52479.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/52480-52735.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/52736-52991.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/52992-53247.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/53248-53503.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/53504-53759.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/5376-5631.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/53760-54015.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/54016-54271.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/54272-54527.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/54528-54783.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/54784-55039.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/55040-55295.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/55296-55551.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/55552-55807.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/55808-56063.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/56064-56319.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/5632-5887.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/56320-56575.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/56576-56831.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/56832-57087.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/57088-57343.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/57344-57599.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/57600-57855.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/57856-58111.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/58112-58367.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/58368-58623.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/58624-58879.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/5888-6143.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/58880-59135.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/59136-59391.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/59392-59647.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/59648-59903.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/59904-60159.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/60160-60415.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/60416-60671.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/60672-60927.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/60928-61183.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/61184-61439.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/6144-6399.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/61440-61695.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/61696-61951.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/61952-62207.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/62208-62463.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/62464-62719.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/62720-62975.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/62976-63231.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/63232-63487.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/63488-63743.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/63744-63999.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/6400-6655.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/64000-64255.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/64256-64511.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/64512-64767.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/64768-65023.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/65024-65279.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/65280-65535.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/6656-6911.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/6912-7167.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/7168-7423.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/7424-7679.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/768-1023.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/7680-7935.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/7936-8191.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/8192-8447.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/8448-8703.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/8704-8959.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/8960-9215.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/9216-9471.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/9472-9727.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/9728-9983.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Medium/9984-10239.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/0-255.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/1024-1279.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/10240-10495.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/10496-10751.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/10752-11007.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/11008-11263.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/11264-11519.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/11520-11775.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/11776-12031.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/12032-12287.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/12288-12543.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/12544-12799.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/1280-1535.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/12800-13055.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/13056-13311.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/13312-13567.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/13568-13823.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/13824-14079.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/14080-14335.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/14336-14591.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/14592-14847.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/14848-15103.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/15104-15359.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/1536-1791.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/15360-15615.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/15616-15871.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/15872-16127.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/16128-16383.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/16384-16639.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/16640-16895.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/16896-17151.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/17152-17407.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/17408-17663.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/17664-17919.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/1792-2047.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/17920-18175.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/18176-18431.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/18432-18687.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/18688-18943.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/18944-19199.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/19200-19455.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/19456-19711.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/19712-19967.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/19968-20223.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/20224-20479.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/2048-2303.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/20480-20735.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/20736-20991.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/20992-21247.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/21248-21503.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/21504-21759.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/21760-22015.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/22016-22271.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/22272-22527.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/22528-22783.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/22784-23039.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/2304-2559.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/23040-23295.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/23296-23551.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/23552-23807.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/23808-24063.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/24064-24319.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/24320-24575.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/24576-24831.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/24832-25087.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/25088-25343.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/25344-25599.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/256-511.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/2560-2815.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/25600-25855.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/25856-26111.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/26112-26367.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/26368-26623.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/26624-26879.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/26880-27135.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/27136-27391.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/27392-27647.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/27648-27903.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/27904-28159.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/2816-3071.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/28160-28415.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/28416-28671.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/28672-28927.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/28928-29183.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/29184-29439.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/29440-29695.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/29696-29951.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/29952-30207.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/30208-30463.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/30464-30719.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/3072-3327.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/30720-30975.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/30976-31231.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/31232-31487.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/31488-31743.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/31744-31999.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/32000-32255.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/32256-32511.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/32512-32767.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/32768-33023.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/33024-33279.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/3328-3583.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/33280-33535.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/33536-33791.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/33792-34047.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/34048-34303.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/34304-34559.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/34560-34815.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/34816-35071.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/35072-35327.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/35328-35583.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/35584-35839.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/3584-3839.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/35840-36095.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/36096-36351.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/36352-36607.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/36608-36863.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/36864-37119.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/37120-37375.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/37376-37631.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/37632-37887.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/37888-38143.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/38144-38399.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/3840-4095.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/38400-38655.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/38656-38911.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/38912-39167.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/39168-39423.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/39424-39679.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/39680-39935.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/39936-40191.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/40192-40447.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/40448-40703.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/40704-40959.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/4096-4351.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/40960-41215.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/41216-41471.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/41472-41727.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/41728-41983.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/41984-42239.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/42240-42495.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/42496-42751.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/42752-43007.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/43008-43263.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/43264-43519.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/4352-4607.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/43520-43775.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/43776-44031.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/44032-44287.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/44288-44543.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/44544-44799.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/44800-45055.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/45056-45311.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/45312-45567.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/45568-45823.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/45824-46079.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/4608-4863.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/46080-46335.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/46336-46591.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/46592-46847.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/46848-47103.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/47104-47359.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/47360-47615.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/47616-47871.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/47872-48127.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/48128-48383.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/48384-48639.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/4864-5119.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/48640-48895.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/48896-49151.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/49152-49407.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/49408-49663.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/49664-49919.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/49920-50175.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/50176-50431.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/50432-50687.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/50688-50943.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/50944-51199.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/512-767.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/5120-5375.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/51200-51455.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/51456-51711.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/51712-51967.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/51968-52223.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/52224-52479.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/52480-52735.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/52736-52991.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/52992-53247.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/53248-53503.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/53504-53759.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/5376-5631.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/53760-54015.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/54016-54271.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/54272-54527.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/54528-54783.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/54784-55039.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/55040-55295.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/55296-55551.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/55552-55807.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/55808-56063.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/56064-56319.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/5632-5887.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/56320-56575.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/56576-56831.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/56832-57087.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/57088-57343.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/57344-57599.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/57600-57855.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/57856-58111.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/58112-58367.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/58368-58623.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/58624-58879.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/5888-6143.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/58880-59135.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/59136-59391.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/59392-59647.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/59648-59903.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/59904-60159.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/60160-60415.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/60416-60671.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/60672-60927.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/60928-61183.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/61184-61439.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/6144-6399.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/61440-61695.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/61696-61951.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/61952-62207.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/62208-62463.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/62464-62719.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/62720-62975.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/62976-63231.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/63232-63487.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/63488-63743.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/63744-63999.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/6400-6655.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/64000-64255.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/64256-64511.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/64512-64767.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/64768-65023.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/65024-65279.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/65280-65535.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/6656-6911.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/6912-7167.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/7168-7423.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/7424-7679.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/768-1023.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/7680-7935.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/7936-8191.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/8192-8447.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/8448-8703.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/8704-8959.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/8960-9215.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/9216-9471.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/9472-9727.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/9728-9983.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/Roboto Regular/9984-10239.pbf (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/sprites.json (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/sprites.png (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/sprites@2x.json (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/sprites@2x.png (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/style-mapbox-outdoors-v12.json (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/style-microg-normal-mapbox.json (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/style-microg-normal-stadia.json (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/style-microg-satellite-mapbox.json (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/style-microg-satellite-stadia.json (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/assets/style-stadia-outdoors.json (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/java/com/google/android/gms/dynamite/descriptors/com/google/android/gms/maps_dynamite/ModuleDescriptor.java (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/java/com/google/android/gms/maps/internal/CreatorImpl.java (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/java/com/mapbox/android/accounts/v1/MapboxAccounts.java (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/kotlin/org/microg/gms/maps/mapbox/AbstractGoogleMap.kt (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/kotlin/org/microg/gms/maps/mapbox/CameraBoundsWithSizeUpdate.kt (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/kotlin/org/microg/gms/maps/mapbox/CameraUpdateFactory.kt (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/kotlin/org/microg/gms/maps/mapbox/GoogleLocationEngine.kt (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/kotlin/org/microg/gms/maps/mapbox/GoogleMap.kt (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/kotlin/org/microg/gms/maps/mapbox/LiteGoogleMap.kt (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/kotlin/org/microg/gms/maps/mapbox/MapFragment.kt (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/kotlin/org/microg/gms/maps/mapbox/MapView.kt (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/kotlin/org/microg/gms/maps/mapbox/Pattern.kt (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/kotlin/org/microg/gms/maps/mapbox/Projection.kt (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/kotlin/org/microg/gms/maps/mapbox/SourceLocationEngine.kt (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/kotlin/org/microg/gms/maps/mapbox/Styles.kt (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/kotlin/org/microg/gms/maps/mapbox/UiSettings.kt (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/kotlin/org/microg/gms/maps/mapbox/model/BitmapDescriptor.kt (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/kotlin/org/microg/gms/maps/mapbox/model/BitmapDescriptorFactory.kt (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/kotlin/org/microg/gms/maps/mapbox/model/Circle.kt (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/kotlin/org/microg/gms/maps/mapbox/model/GroundOverlay.kt (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/kotlin/org/microg/gms/maps/mapbox/model/InfoWindow.kt (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/kotlin/org/microg/gms/maps/mapbox/model/Marker.kt (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/kotlin/org/microg/gms/maps/mapbox/model/Markup.kt (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/kotlin/org/microg/gms/maps/mapbox/model/Polygon.kt (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/kotlin/org/microg/gms/maps/mapbox/model/Polyline.kt (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/kotlin/org/microg/gms/maps/mapbox/model/TileOverlay.kt (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/kotlin/org/microg/gms/maps/mapbox/utils/MapContext.kt (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/kotlin/org/microg/gms/maps/mapbox/utils/MultiArchLoader.kt (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/kotlin/org/microg/gms/maps/mapbox/utils/typeConverter.kt (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/res/drawable-hdpi/maps_default_marker.png (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/res/drawable-ldpi/maps_default_marker.png (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/res/drawable-mdpi/maps_default_marker.png (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/res/drawable-xhdpi/maps_default_marker.png (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/res/drawable-xxhdpi/maps_default_marker.png (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/res/drawable-xxxhdpi/maps_default_marker.png (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/res/drawable/location_dot.xml (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/res/drawable/maps_default_bubble.xml (100%) rename {play-services-maps-core-mapbox => play-services-maps/core/mapbox}/src/main/res/layout/maps_default_bubble_layout.xml (100%) rename {play-services-maps-core-vtm => play-services-maps/core/vtm}/build.gradle (91%) rename {play-services-maps-core-vtm/vtm-microg-theme => play-services-maps/core/vtm/microg-theme}/build.gradle (100%) rename {play-services-maps-core-vtm/vtm-microg-theme => play-services-maps/core/vtm/microg-theme}/resources/assets/styles/microg.xml (100%) rename {play-services-maps-core-vtm/vtm-microg-theme => play-services-maps/core/vtm/microg-theme}/resources/assets/symbols/dot_white.svg (100%) rename {play-services-maps-core-vtm/vtm-microg-theme => play-services-maps/core/vtm/microg-theme}/resources/assets/symbols/transit/train_station.svg (100%) rename {play-services-maps-core-vtm/vtm-microg-theme => play-services-maps/core/vtm/microg-theme}/resources/assets/symbols/transit/train_station_small.svg (100%) rename {play-services-maps-core-vtm/vtm-microg-theme => play-services-maps/core/vtm/microg-theme}/src/org/oscim/theme/MicrogThemes.java (100%) rename {play-services-maps-core-vtm => play-services-maps/core/vtm}/src/main/AndroidManifest.xml (100%) rename {play-services-maps-core-vtm => play-services-maps/core/vtm}/src/main/java/com/google/android/gms/maps/internal/CreatorImpl.java (100%) rename {play-services-maps-core-vtm => play-services-maps/core/vtm}/src/main/java/org/microg/gms/maps/vtm/ApplicationContextWrapper.java (100%) rename {play-services-maps-core-vtm => play-services-maps/core/vtm}/src/main/java/org/microg/gms/maps/vtm/BackendMap.java (100%) rename {play-services-maps-core-vtm => play-services-maps/core/vtm}/src/main/java/org/microg/gms/maps/vtm/BackendMapView.java (100%) rename {play-services-maps-core-vtm => play-services-maps/core/vtm}/src/main/java/org/microg/gms/maps/vtm/ContainerLayout.java (100%) rename {play-services-maps-core-vtm => play-services-maps/core/vtm}/src/main/java/org/microg/gms/maps/vtm/GmsMapsTypeHelper.java (100%) rename {play-services-maps-core-vtm => play-services-maps/core/vtm}/src/main/java/org/microg/gms/maps/vtm/GoogleMapImpl.java (100%) rename {play-services-maps-core-vtm => play-services-maps/core/vtm}/src/main/java/org/microg/gms/maps/vtm/MapFragmentImpl.java (100%) rename {play-services-maps-core-vtm => play-services-maps/core/vtm}/src/main/java/org/microg/gms/maps/vtm/MapViewImpl.java (100%) rename {play-services-maps-core-vtm => play-services-maps/core/vtm}/src/main/java/org/microg/gms/maps/vtm/ProjectionImpl.java (100%) rename {play-services-maps-core-vtm => play-services-maps/core/vtm}/src/main/java/org/microg/gms/maps/vtm/ResourcesContainer.java (100%) rename {play-services-maps-core-vtm => play-services-maps/core/vtm}/src/main/java/org/microg/gms/maps/vtm/UiSettingsImpl.java (100%) rename {play-services-maps-core-vtm => play-services-maps/core/vtm}/src/main/java/org/microg/gms/maps/vtm/bitmap/AbstractBitmapDescriptor.java (100%) rename {play-services-maps-core-vtm => play-services-maps/core/vtm}/src/main/java/org/microg/gms/maps/vtm/bitmap/AssetBitmapDescriptor.java (100%) rename {play-services-maps-core-vtm => play-services-maps/core/vtm}/src/main/java/org/microg/gms/maps/vtm/bitmap/BitmapBitmapDescriptor.java (100%) rename {play-services-maps-core-vtm => play-services-maps/core/vtm}/src/main/java/org/microg/gms/maps/vtm/bitmap/BitmapDescriptorFactoryImpl.java (100%) rename {play-services-maps-core-vtm => play-services-maps/core/vtm}/src/main/java/org/microg/gms/maps/vtm/bitmap/BitmapDescriptorImpl.java (100%) rename {play-services-maps-core-vtm => play-services-maps/core/vtm}/src/main/java/org/microg/gms/maps/vtm/bitmap/DefaultBitmapDescriptor.java (100%) rename {play-services-maps-core-vtm => play-services-maps/core/vtm}/src/main/java/org/microg/gms/maps/vtm/bitmap/FileBitmapDescriptor.java (100%) rename {play-services-maps-core-vtm => play-services-maps/core/vtm}/src/main/java/org/microg/gms/maps/vtm/bitmap/PathBitmapDescriptor.java (100%) rename {play-services-maps-core-vtm => play-services-maps/core/vtm}/src/main/java/org/microg/gms/maps/vtm/bitmap/ResourceBitmapDescriptor.java (100%) rename {play-services-maps-core-vtm => play-services-maps/core/vtm}/src/main/java/org/microg/gms/maps/vtm/camera/CameraUpdate.java (100%) rename {play-services-maps-core-vtm => play-services-maps/core/vtm}/src/main/java/org/microg/gms/maps/vtm/camera/CameraUpdateFactoryImpl.java (100%) rename {play-services-maps-core-vtm => play-services-maps/core/vtm}/src/main/java/org/microg/gms/maps/vtm/camera/MapPositionCameraUpdate.java (100%) rename {play-services-maps-core-vtm => play-services-maps/core/vtm}/src/main/java/org/microg/gms/maps/vtm/camera/NoCameraUpdate.java (100%) rename {play-services-maps-core-vtm => play-services-maps/core/vtm}/src/main/java/org/microg/gms/maps/vtm/data/SharedTileCache.java (100%) rename {play-services-maps-core-vtm => play-services-maps/core/vtm}/src/main/java/org/microg/gms/maps/vtm/data/SharedTileProvider.java (100%) rename {play-services-maps-core-vtm => play-services-maps/core/vtm}/src/main/java/org/microg/gms/maps/vtm/markup/CircleImpl.java (100%) rename {play-services-maps-core-vtm => play-services-maps/core/vtm}/src/main/java/org/microg/gms/maps/vtm/markup/ClearableVectorLayer.java (100%) rename {play-services-maps-core-vtm => play-services-maps/core/vtm}/src/main/java/org/microg/gms/maps/vtm/markup/DrawableMarkup.java (100%) rename {play-services-maps-core-vtm => play-services-maps/core/vtm}/src/main/java/org/microg/gms/maps/vtm/markup/GroundOverlayImpl.java (100%) rename {play-services-maps-core-vtm => play-services-maps/core/vtm}/src/main/java/org/microg/gms/maps/vtm/markup/InfoWindow.java (100%) rename {play-services-maps-core-vtm => play-services-maps/core/vtm}/src/main/java/org/microg/gms/maps/vtm/markup/MarkerImpl.java (100%) rename {play-services-maps-core-vtm => play-services-maps/core/vtm}/src/main/java/org/microg/gms/maps/vtm/markup/MarkerItemMarkup.java (100%) rename {play-services-maps-core-vtm => play-services-maps/core/vtm}/src/main/java/org/microg/gms/maps/vtm/markup/Markup.java (100%) rename {play-services-maps-core-vtm => play-services-maps/core/vtm}/src/main/java/org/microg/gms/maps/vtm/markup/PolygonImpl.java (100%) rename {play-services-maps-core-vtm => play-services-maps/core/vtm}/src/main/java/org/microg/gms/maps/vtm/markup/PolylineImpl.java (100%) rename {play-services-maps-core-vtm => play-services-maps/core/vtm}/src/main/java/org/microg/gms/maps/vtm/markup/TileOverlayImpl.java (100%) rename {play-services-maps-core-vtm => play-services-maps/core/vtm}/src/main/res/drawable/maps_default_marker.png (100%) rename {play-services-maps-core-vtm => play-services-maps/core/vtm}/src/main/res/drawable/maps_default_window.9.png (100%) rename {play-services-maps-core-vtm => play-services-maps/core/vtm}/src/main/res/drawable/nop.png (100%) create mode 100644 play-services-nearby/core/package/build.gradle rename {play-services-core/src/withNearby => play-services-nearby/core/package/src/main}/AndroidManifest.xml (73%) create mode 100644 play-services-nearby/core/package/src/main/kotlin/org/microg/gms/nearby/exposurenotification/ui/ExposureNotificationsSettingsProvider.kt diff --git a/play-services-base/core/src/main/kotlin/org/microg/gms/ui/settings/SettingsProvider.kt b/play-services-base/core/src/main/kotlin/org/microg/gms/ui/settings/SettingsProvider.kt new file mode 100644 index 0000000000..ecebb04216 --- /dev/null +++ b/play-services-base/core/src/main/kotlin/org/microg/gms/ui/settings/SettingsProvider.kt @@ -0,0 +1,58 @@ +/* + * SPDX-FileCopyrightText: 2023 microG Project Team + * SPDX-License-Identifier: Apache-2.0 + */ + +package org.microg.gms.ui.settings + +import android.content.Context +import android.content.Intent +import android.content.pm.PackageManager +import android.graphics.drawable.Drawable +import android.os.Bundle +import android.util.Log +import androidx.navigation.NavController + +private const val TAG = "SettingsProvider" + +interface SettingsProvider { + fun getEntriesStatic(context: Context): List + suspend fun getEntriesDynamic(context: Context): List = getEntriesStatic(context) + + fun preProcessSettingsIntent(intent: Intent) + + fun extendNavigation(navController: NavController) + + companion object { + enum class Group { + HEADER, + GOOGLE, + OTHER, + FOOTER + } + + data class Entry( + val key: String, + val group: Group, + val navigationId: Int, + val title: String, + val summary: String? = null, + val icon: Drawable? = null, + ) + } +} + +fun getAllSettingsProviders(context: Context): List { + val metaData = runCatching { context.packageManager.getApplicationInfo(context.packageName, PackageManager.GET_META_DATA).metaData }.getOrNull() ?: Bundle.EMPTY + return metaData.keySet().asSequence().filter { + it.startsWith("org.microg.gms.ui.settings.entry:") + }.mapNotNull { + runCatching { metaData.getString(it) }.onFailure { Log.w(TAG, it) }.getOrNull() + }.mapNotNull { + runCatching { Class.forName(it) }.onFailure { Log.w(TAG, it) }.getOrNull() + }.filter { + SettingsProvider::class.java.isAssignableFrom(it) + }.mapNotNull { + runCatching { it.getDeclaredField("INSTANCE").get(null) as SettingsProvider }.onFailure { Log.w(TAG, it) }.getOrNull() + }.toList() +} \ No newline at end of file diff --git a/play-services-base/core/src/main/res/values-be/strings.xml b/play-services-base/core/src/main/res/values-be/strings.xml index 7420ee8a05..c019c30e4a 100644 --- a/play-services-base/core/src/main/res/values-be/strings.xml +++ b/play-services-base/core/src/main/res/values-be/strings.xml @@ -15,4 +15,11 @@ Паказаць усё Aдкрыць + + Выключана + Уключана + Аўтаматычна + Уручную + Укл. + Выкл. diff --git a/play-services-base/core/src/main/res/values-de/strings.xml b/play-services-base/core/src/main/res/values-de/strings.xml index c353f0e9b4..1eaffe2dc3 100644 --- a/play-services-base/core/src/main/res/values-de/strings.xml +++ b/play-services-base/core/src/main/res/values-de/strings.xml @@ -15,4 +15,11 @@ Alle anzeigen Öffnen + + Deaktiviert + Aktiviert + Automatisch + Manuell + Ein + Aus diff --git a/play-services-base/core/src/main/res/values-es/strings.xml b/play-services-base/core/src/main/res/values-es/strings.xml index a380438a03..91870f939b 100644 --- a/play-services-base/core/src/main/res/values-es/strings.xml +++ b/play-services-base/core/src/main/res/values-es/strings.xml @@ -11,4 +11,11 @@ Ver todo Abrir + + Desactivado + Activado + Automático + Manual + Encendido + Apagado diff --git a/play-services-base/core/src/main/res/values-fr/strings.xml b/play-services-base/core/src/main/res/values-fr/strings.xml index 15d20d0702..e25c1caa7c 100644 --- a/play-services-base/core/src/main/res/values-fr/strings.xml +++ b/play-services-base/core/src/main/res/values-fr/strings.xml @@ -8,4 +8,9 @@ Avancé Aucun + + Désactivé + Activé + Automatique + Manuel diff --git a/play-services-base/core/src/main/res/values-it/strings.xml b/play-services-base/core/src/main/res/values-it/strings.xml index 189a2e1de9..216c54e3a0 100644 --- a/play-services-base/core/src/main/res/values-it/strings.xml +++ b/play-services-base/core/src/main/res/values-it/strings.xml @@ -9,4 +9,11 @@ Nessuna Mostra tutte Apri + + Disabilitato + Abilitato + Automatico + Manuale + Abilitato + Disabilitato diff --git a/play-services-base/core/src/main/res/values-ja/strings.xml b/play-services-base/core/src/main/res/values-ja/strings.xml index 8f056e66db..0a037fefbc 100644 --- a/play-services-base/core/src/main/res/values-ja/strings.xml +++ b/play-services-base/core/src/main/res/values-ja/strings.xml @@ -11,4 +11,11 @@ 全て表示 開く + + 無効 + 有効 + 自動 + 手動 + On + Off diff --git a/play-services-base/core/src/main/res/values-pl/strings.xml b/play-services-base/core/src/main/res/values-pl/strings.xml index 2af5a5ae16..dc8dfe74e0 100644 --- a/play-services-base/core/src/main/res/values-pl/strings.xml +++ b/play-services-base/core/src/main/res/values-pl/strings.xml @@ -8,4 +8,9 @@ Zaawansowane Brak + + Nieaktywny + Aktywny + Automatyczny + Ręczny diff --git a/play-services-base/core/src/main/res/values-ru/strings.xml b/play-services-base/core/src/main/res/values-ru/strings.xml index 69dc64fdd3..bea92fde07 100644 --- a/play-services-base/core/src/main/res/values-ru/strings.xml +++ b/play-services-base/core/src/main/res/values-ru/strings.xml @@ -15,4 +15,11 @@ Показать всё Открыть + + Выключено + Включено + Автоматически + Вручную + Вкл. + Выкл. diff --git a/play-services-base/core/src/main/res/values-uk/strings.xml b/play-services-base/core/src/main/res/values-uk/strings.xml index ad2ff3d153..5da45c35dd 100644 --- a/play-services-base/core/src/main/res/values-uk/strings.xml +++ b/play-services-base/core/src/main/res/values-uk/strings.xml @@ -8,4 +8,9 @@ Додатково Порожньо + + Вимкнуто + Увімкнуто + Автоматично + Вручну diff --git a/play-services-base/core/src/main/res/values-zh-rCN/strings.xml b/play-services-base/core/src/main/res/values-zh-rCN/strings.xml index 6916323f7b..71ec792476 100644 --- a/play-services-base/core/src/main/res/values-zh-rCN/strings.xml +++ b/play-services-base/core/src/main/res/values-zh-rCN/strings.xml @@ -8,4 +8,11 @@ 无 全部显示 打开 + + 已禁用 + 已启用 + 自动 + 手动 + 开 + 关 diff --git a/play-services-base/core/src/main/res/values/strings.xml b/play-services-base/core/src/main/res/values/strings.xml index 911bc43757..a51ab4587a 100644 --- a/play-services-base/core/src/main/res/values/strings.xml +++ b/play-services-base/core/src/main/res/values/strings.xml @@ -15,4 +15,11 @@ See all Open + + Disabled + Enabled + Automatic + Manual + On + Off diff --git a/play-services-core/build.gradle b/play-services-core/build.gradle index 7984bf6360..a08f45effa 100644 --- a/play-services-core/build.gradle +++ b/play-services-core/build.gradle @@ -6,11 +6,14 @@ apply plugin: 'com.android.application' apply plugin: 'kotlin-android' +def hasModule(String name, boolean enabledByDefault) { + return localProperties.getProperty("modules." + name, enabledByDefault.toString()).toBoolean() +} + configurations { - withMapboxImplementation - withVtmImplementation - withNearbyImplementation - withoutNearbyImplementation + mapboxRuntimeOnly + vtmRuntimeOnly + defaultRuntimeOnly } dependencies { @@ -35,8 +38,6 @@ dependencies { implementation project(':play-services-gmscompliance-core') implementation project(':play-services-location-core') implementation project(':play-services-location-core-base') - implementation project(':play-services-location-core-provider') - withNearbyImplementation project(':play-services-nearby-core') implementation project(':play-services-oss-licenses-core') implementation project(':play-services-pay-core') implementation project(':play-services-recaptcha-core') @@ -63,8 +64,11 @@ dependencies { implementation project(':play-services-safetynet') implementation project(':play-services-tasks-ktx') - withMapboxImplementation project(':play-services-maps-core-mapbox') - withVtmImplementation project(':play-services-maps-core-vtm') + mapboxRuntimeOnly project(':play-services-maps-core-mapbox') + vtmRuntimeOnly project(':play-services-maps-core-vtm') + defaultRuntimeOnly project(':play-services-location-core-provider') + + if (hasModule("nearby", true)) runtimeOnly project(':play-services-nearby-core-package') // AndroidX UI implementation "androidx.multidex:multidex:$multidexVersion" @@ -123,12 +127,6 @@ android { main { java.srcDirs += 'src/main/kotlin' } - withNearby { - java.srcDirs += 'src/withNearby/kotlin' - } - withoutNearby { - java.srcDirs += 'src/withoutNearby/kotlin' - } } lintOptions { @@ -142,21 +140,16 @@ android { } } - flavorDimensions 'maps', 'nearby' + flavorDimensions = ['maps', 'target'] productFlavors { - withMapbox { - dimension 'maps' + "default" { + dimension 'target' } - withVtm { + "mapbox" { dimension 'maps' - versionNameSuffix '-vtm' } - withNearby { - dimension 'nearby' - } - withoutNearby { - dimension 'nearby' - versionNameSuffix '-noen' + "vtm" { + dimension 'maps' } } diff --git a/play-services-core/src/main/java/org/microg/gms/ui/SettingsActivity.java b/play-services-core/src/main/java/org/microg/gms/ui/SettingsActivity.java index 2ea293f44e..1fade6da71 100644 --- a/play-services-core/src/main/java/org/microg/gms/ui/SettingsActivity.java +++ b/play-services-core/src/main/java/org/microg/gms/ui/SettingsActivity.java @@ -11,6 +11,9 @@ import androidx.navigation.ui.NavigationUI; import com.google.android.gms.R; +import org.microg.gms.ui.settings.SettingsProvider; + +import static org.microg.gms.ui.settings.SettingsProviderKt.getAllSettingsProviders; public class SettingsActivity extends AppCompatActivity { private AppBarConfiguration appBarConfiguration; @@ -24,10 +27,16 @@ protected void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); Intent intent = getIntent(); - NearbyPreferencesIntegration.Companion.preProcessSettingsIntent(intent); + for (SettingsProvider settingsProvider : getAllSettingsProviders(this)) { + settingsProvider.preProcessSettingsIntent(intent); + } setContentView(R.layout.settings_root_activity); + for (SettingsProvider settingsProvider : getAllSettingsProviders(this)) { + settingsProvider.extendNavigation(getNavController()); + } + appBarConfiguration = new AppBarConfiguration.Builder(getNavController().getGraph()).build(); NavigationUI.setupActionBarWithNavController(this, getNavController(), appBarConfiguration); } diff --git a/play-services-core/src/main/kotlin/org/microg/gms/ui/SettingsFragment.kt b/play-services-core/src/main/kotlin/org/microg/gms/ui/SettingsFragment.kt index 1cbb3c7553..6d3d6f7d23 100644 --- a/play-services-core/src/main/kotlin/org/microg/gms/ui/SettingsFragment.kt +++ b/play-services-core/src/main/kotlin/org/microg/gms/ui/SettingsFragment.kt @@ -5,20 +5,24 @@ package org.microg.gms.ui -import android.content.Context import android.os.Bundle +import android.util.Log import androidx.lifecycle.lifecycleScope import androidx.navigation.fragment.findNavController import androidx.preference.Preference +import androidx.preference.PreferenceCategory import com.google.android.gms.R import org.microg.gms.checkin.CheckinPreferences import org.microg.gms.gcm.GcmDatabase import org.microg.gms.gcm.GcmPrefs -import org.microg.gms.gcm.getGcmServiceInfo import org.microg.gms.safetynet.SafetyNetPreferences +import org.microg.gms.ui.settings.SettingsProvider +import org.microg.gms.ui.settings.getAllSettingsProviders import org.microg.tools.ui.ResourceSettingsFragment class SettingsFragment : ResourceSettingsFragment() { + private val createdPreferences = mutableListOf() + override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) { super.onCreatePreferences(savedInstanceState, rootKey) @@ -38,19 +42,49 @@ class SettingsFragment : ResourceSettingsFragment() { findNavController().navigate(requireContext(), R.id.openLocationSettings) true } - findPreference(PREF_EXPOSURE)?.onPreferenceClickListener = Preference.OnPreferenceClickListener { - findNavController().navigate(requireContext(), NearbyPreferencesIntegration.exposureNotificationNavigationId) - true - } findPreference(PREF_ABOUT)!!.onPreferenceClickListener = Preference.OnPreferenceClickListener { findNavController().navigate(requireContext(), R.id.openAbout) true } findPreference(PREF_ABOUT)!!.summary = getString(org.microg.tools.ui.R.string.about_version_str, AboutFragment.getSelfVersion(context)) - findPreference(PREF_EXPOSURE)?.isVisible = NearbyPreferencesIntegration.isAvailable - findPreference(PREF_EXPOSURE)?.icon = NearbyPreferencesIntegration.getIcon(requireContext()) - findPreference(PREF_EXPOSURE)?.summary = NearbyPreferencesIntegration.getExposurePreferenceSummary(requireContext()) + for (entry in getAllSettingsProviders(requireContext()).flatMap { it.getEntriesStatic(requireContext()) }) { + entry.createPreference() + } + } + + private fun SettingsProvider.Companion.Entry.createPreference(): Preference? { + val preference = Preference(requireContext()).fillFromEntry(this) + try { + if (findPreference(when (group) { + SettingsProvider.Companion.Group.HEADER -> "prefcat_header" + SettingsProvider.Companion.Group.GOOGLE -> "prefcat_google_services" + SettingsProvider.Companion.Group.OTHER -> "prefcat_other_services" + SettingsProvider.Companion.Group.FOOTER -> "prefcat_footer" + })?.addPreference(preference) == true) { + createdPreferences.add(preference) + return preference + } else { + Log.w(TAG, "Preference not added $key") + } + } catch (e: Exception) { + Log.w(TAG, "Failed adding preference $key", e) + } + return null + } + + private fun Preference.fillFromEntry(entry: SettingsProvider.Companion.Entry): Preference { + key = entry.key + title = entry.title + summary = entry.summary + icon = entry.icon + isPersistent = false + isVisible = true + setOnPreferenceClickListener { + findNavController().navigate(requireContext(), entry.navigationId) + true + } + return this } override fun onResume() { @@ -60,13 +94,25 @@ class SettingsFragment : ResourceSettingsFragment() { val database = GcmDatabase(context) val regCount = database.registrationList.size database.close() - findPreference(PREF_GCM)!!.summary = context.getString(R.string.service_status_enabled_short) + " - " + context.resources.getQuantityString(R.plurals.gcm_registered_apps_counter, regCount, regCount) + findPreference(PREF_GCM)!!.summary = context.getString(org.microg.gms.base.core.R.string.service_status_enabled_short) + " - " + context.resources.getQuantityString(R.plurals.gcm_registered_apps_counter, regCount, regCount) } else { - findPreference(PREF_GCM)!!.setSummary(R.string.service_status_disabled_short) + findPreference(PREF_GCM)!!.setSummary(org.microg.gms.base.core.R.string.service_status_disabled_short) } - findPreference(PREF_CHECKIN)!!.setSummary(if (CheckinPreferences.isEnabled(requireContext())) R.string.service_status_enabled_short else R.string.service_status_disabled_short) - findPreference(PREF_SNET)!!.setSummary(if (SafetyNetPreferences.isEnabled(requireContext())) R.string.service_status_enabled_short else R.string.service_status_disabled_short) + findPreference(PREF_CHECKIN)!!.setSummary(if (CheckinPreferences.isEnabled(requireContext())) org.microg.gms.base.core.R.string.service_status_enabled_short else org.microg.gms.base.core.R.string.service_status_disabled_short) + findPreference(PREF_SNET)!!.setSummary(if (SafetyNetPreferences.isEnabled(requireContext())) org.microg.gms.base.core.R.string.service_status_enabled_short else org.microg.gms.base.core.R.string.service_status_disabled_short) + + lifecycleScope.launchWhenResumed { + val entries = getAllSettingsProviders(requireContext()).flatMap { it.getEntriesDynamic(requireContext()) } + for (preference in createdPreferences) { + if (!entries.any { it.key == preference.key }) preference.isVisible = false + } + for (entry in entries) { + val preference = createdPreferences.find { it.key == entry.key } + if (preference != null) preference.fillFromEntry(entry) + else entry.createPreference() + } + } } companion object { @@ -75,7 +121,6 @@ class SettingsFragment : ResourceSettingsFragment() { const val PREF_SNET = "pref_snet" const val PREF_LOCATION = "pref_location" const val PREF_CHECKIN = "pref_checkin" - const val PREF_EXPOSURE = "pref_exposure" } init { diff --git a/play-services-core/src/main/res/navigation/nav_settings.xml b/play-services-core/src/main/res/navigation/nav_settings.xml index 61ae70f21e..7effe7c323 100644 --- a/play-services-core/src/main/res/navigation/nav_settings.xml +++ b/play-services-core/src/main/res/navigation/nav_settings.xml @@ -26,9 +26,6 @@ - @@ -154,6 +151,5 @@ - diff --git a/play-services-core/src/main/res/values-be/strings.xml b/play-services-core/src/main/res/values-be/strings.xml index 9a0c652a96..13a17abfa0 100644 --- a/play-services-core/src/main/res/values-be/strings.xml +++ b/play-services-core/src/main/res/values-be/strings.xml @@ -48,13 +48,6 @@ Воблачны абмен паведамленнямі Google SafetyNet - Выключана - Уключана - Аўтаматычна - Уручную - Укл. - Выкл. - Google Play Гульні %1$s хоча выкарыстоўваць Play Гульні Каб выкарыстоўваць магчымасці Play Гульні, трэба ўсталяваць прыкладанне Google Play Гульні. Прыкладанне можа працаваць і без яго, але магчымыя праблемы у яго рабоце. diff --git a/play-services-core/src/main/res/values-de/strings.xml b/play-services-core/src/main/res/values-de/strings.xml index 52b309dfa1..0d62e65c1b 100644 --- a/play-services-core/src/main/res/values-de/strings.xml +++ b/play-services-core/src/main/res/values-de/strings.xml @@ -59,13 +59,6 @@ Dies kann einige Minuten dauern." Cloud Messaging Google SafetyNet - Deaktiviert - Aktiviert - Automatisch - Manuell - Ein - Aus - Google Play Games %1$s möchte Play Games benutzen Um Play Games zu nutzen, ist die Installation der Google Play Games App erforderlich. Diese App funktioniert eventuell auch ohne Play Games, verhält sich dabei unter Umständen aber ungewöhnlich. diff --git a/play-services-core/src/main/res/values-es/strings.xml b/play-services-core/src/main/res/values-es/strings.xml index 8995433bda..01b0833090 100644 --- a/play-services-core/src/main/res/values-es/strings.xml +++ b/play-services-core/src/main/res/values-es/strings.xml @@ -57,13 +57,6 @@ Esto podría tardar algunos minutos." Cloud Messaging Google SafetyNet - Desactivado - Activado - Automático - Manual - Encendido - Apagado - Google Play Juegos %1$s quiere usar Play Juegos Para usar Play Juegos es necesario instalar la aplicación Google Play Juegos. La aplicación puede continuar sin Play Juegos, pero es posible que funcione inesperadamente. diff --git a/play-services-core/src/main/res/values-fr/strings.xml b/play-services-core/src/main/res/values-fr/strings.xml index a3dba94dbc..1ffb2ee1b8 100644 --- a/play-services-core/src/main/res/values-fr/strings.xml +++ b/play-services-core/src/main/res/values-fr/strings.xml @@ -49,11 +49,6 @@ Ceci peut prendre plusieurs minutes." Cloud Messaging Google SafetyNet - Désactivé - Activé - Automatique - Manuel - Google Play Jeux %1$s voudrait utiliser Play Jeux Pour utiliser Play Jeux il est requis d’installer l’application Google Play Jeux. L’application peut poursuivre sans Play Jeux, mais il est possible qu’elle se comporte de manière imprévue. diff --git a/play-services-core/src/main/res/values-it/strings.xml b/play-services-core/src/main/res/values-it/strings.xml index 7be0417347..b225d93aad 100644 --- a/play-services-core/src/main/res/values-it/strings.xml +++ b/play-services-core/src/main/res/values-it/strings.xml @@ -51,13 +51,6 @@ Questa operazione può richiedere alcuni secondi." Messaggistica cloud SafetyNet - Disabilitato - Abilitato - Automatico - Manuale - Abilitato - Disabilitato - Google Play Giochi %1$s vorrebbe utilizzare Play Giochi Per usare Play Giochi è necessario installare l\'applicazione Google Play Giochi. L\'applicazione può continuare ad essere utilizzata senza Play Giochi, ma è possibile che funzioni in modo anomalo. diff --git a/play-services-core/src/main/res/values-ja/strings.xml b/play-services-core/src/main/res/values-ja/strings.xml index 92b3b6c1cf..119116a8f6 100644 --- a/play-services-core/src/main/res/values-ja/strings.xml +++ b/play-services-core/src/main/res/values-ja/strings.xml @@ -54,13 +54,6 @@ Googleデバイス登録 Cloud Messaging - 無効 - 有効 - 自動 - 手動 - On - Off - Google Play ゲーム %1$s が Play Gamesの使用を要求しています。 Play Gamesを使用するには、Google Play ゲーム アプリが必要です。 Google Playゲームアプリ無しでも続行できますが、予期しない動作をする可能性があります。 diff --git a/play-services-core/src/main/res/values-pl/strings.xml b/play-services-core/src/main/res/values-pl/strings.xml index df3bf60d96..67768d4a10 100644 --- a/play-services-core/src/main/res/values-pl/strings.xml +++ b/play-services-core/src/main/res/values-pl/strings.xml @@ -49,11 +49,6 @@ To zajmie kilka minut. Cloud Messaging Google SafetyNet - Nieaktywny - Aktywny - Automatyczny - Ręczny - Gry Google Play %1$s chce wykorzystać Gry Google Play Aby korzystać z gier Google Play wymagana jest instalacja aplikacji Gry Google Play . Aplikacja może dalej działać bez Gry Google Play, ale możliwe, że nie będzie działać prawidłowo. diff --git a/play-services-core/src/main/res/values-ru/strings.xml b/play-services-core/src/main/res/values-ru/strings.xml index 8ca6329bb5..81ee34bf73 100644 --- a/play-services-core/src/main/res/values-ru/strings.xml +++ b/play-services-core/src/main/res/values-ru/strings.xml @@ -48,13 +48,6 @@ Облачный обмен сообщениями Google SafetyNet - Выключено - Включено - Автоматически - Вручную - Вкл. - Выкл. - Google Play Игры %1$s хочет использовать Play Игры Чтобы использовать возможности Play Игры, нужно установить приложение Google Play Игры . Приложение может работать и без него, но возможны проблемы в его работе. diff --git a/play-services-core/src/main/res/values-uk/strings.xml b/play-services-core/src/main/res/values-uk/strings.xml index 453b23ec68..6e82526650 100644 --- a/play-services-core/src/main/res/values-uk/strings.xml +++ b/play-services-core/src/main/res/values-uk/strings.xml @@ -56,11 +56,6 @@ Cloud Messaging Google SafetyNet - Вимкнуто - Увімкнуто - Автоматично - Вручну - Ігри Google Play %1$s бажає використовувати Play ігри Для використання можливостей Play Games, необхідно встановити додаток Google Play Games. Додаток може працювати і без нього, але можливі проблеми під час роботи. diff --git a/play-services-core/src/main/res/values-zh-rCN/strings.xml b/play-services-core/src/main/res/values-zh-rCN/strings.xml index a7f39d14a5..98db060837 100644 --- a/play-services-core/src/main/res/values-zh-rCN/strings.xml +++ b/play-services-core/src/main/res/values-zh-rCN/strings.xml @@ -14,12 +14,6 @@ 需要认证 向其他应用发送 C2DM 消息 Google 云端消息推送 - 已禁用 - 已启用 - 自动 - 手动 - 开 - 关 Google Play 游戏 要使用 Play 游戏，您需要安装“Google Play 游戏”应用。您的应用在 Play 游戏未安装时也许能继续运行，但也可能发生异常。 选择一个地点 diff --git a/play-services-core/src/main/res/values/strings.xml b/play-services-core/src/main/res/values/strings.xml index fccdb0e038..9359bed107 100644 --- a/play-services-core/src/main/res/values/strings.xml +++ b/play-services-core/src/main/res/values/strings.xml @@ -58,13 +58,6 @@ This can take a couple of minutes." Cloud Messaging Google SafetyNet - Disabled - Enabled - Automatic - Manual - On - Off - Google Play Games %1$s would like to use Play Games To use Play Games it is required to install the Google Play Games app. The application might continue without Play Games, but it is possible that it will behave unexpectedly. diff --git a/play-services-core/src/main/res/xml/preferences_start.xml b/play-services-core/src/main/res/xml/preferences_start.xml index 80cc686e76..2336cf9aac 100644 --- a/play-services-core/src/main/res/xml/preferences_start.xml +++ b/play-services-core/src/main/res/xml/preferences_start.xml @@ -16,7 +16,7 @@ - + - + - + - - + = 21 - - val exposureNotificationNavigationId: Int = R.id.openExposureNotificationSettings - } -} diff --git a/play-services-core/src/withoutNearby/kotlin/org/microg/gms/ui/NearbyPreferencesIntegration.kt b/play-services-core/src/withoutNearby/kotlin/org/microg/gms/ui/NearbyPreferencesIntegration.kt deleted file mode 100644 index db317c397a..0000000000 --- a/play-services-core/src/withoutNearby/kotlin/org/microg/gms/ui/NearbyPreferencesIntegration.kt +++ /dev/null @@ -1,21 +0,0 @@ -/* - * SPDX-FileCopyrightText: 2020, microG Project Team - * SPDX-License-Identifier: Apache-2.0 - */ - -package org.microg.gms.ui - -import android.content.Context -import android.content.Intent -import android.graphics.drawable.Drawable -import com.google.android.gms.R - -interface NearbyPreferencesIntegration { - companion object { - fun getExposurePreferenceSummary(context: Context): String = context.getString(R.string.service_status_disabled_short) - fun preProcessSettingsIntent(intent: Intent) {} - fun getIcon(context: Context): Drawable? = null - const val exposureNotificationNavigationId: Int = 0 - const val isAvailable: Boolean = false - } -} diff --git a/play-services-core/src/withoutNearby/res/navigation/nav_nearby.xml b/play-services-core/src/withoutNearby/res/navigation/nav_nearby.xml deleted file mode 100644 index 2132683efd..0000000000 --- a/play-services-core/src/withoutNearby/res/navigation/nav_nearby.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - diff --git a/play-services-core/src/withoutNearby/res/values/strings.xml b/play-services-core/src/withoutNearby/res/values/strings.xml deleted file mode 100644 index 0f737dcd0e..0000000000 --- a/play-services-core/src/withoutNearby/res/values/strings.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - Exposure Notifications - diff --git a/play-services-maps-core-mapbox/build.gradle b/play-services-maps/core/mapbox/build.gradle similarity index 100% rename from play-services-maps-core-mapbox/build.gradle rename to play-services-maps/core/mapbox/build.gradle diff --git a/play-services-maps-core-mapbox/src/main/AndroidManifest.xml b/play-services-maps/core/mapbox/src/main/AndroidManifest.xml similarity index 100% rename from play-services-maps-core-mapbox/src/main/AndroidManifest.xml rename to play-services-maps/core/mapbox/src/main/AndroidManifest.xml diff --git a/play-services-maps-core-mapbox/src/main/assets/Open Sans Regular,Arial Unicode MS Regular b/play-services-maps/core/mapbox/src/main/assets/Open Sans Regular,Arial Unicode MS Regular similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Open Sans Regular,Arial Unicode MS Regular rename to play-services-maps/core/mapbox/src/main/assets/Open Sans Regular,Arial Unicode MS Regular diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/0-255.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/0-255.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/0-255.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/0-255.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/1024-1279.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/1024-1279.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/1024-1279.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/1024-1279.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/10240-10495.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/10240-10495.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/10240-10495.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/10240-10495.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/10496-10751.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/10496-10751.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/10496-10751.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/10496-10751.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/10752-11007.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/10752-11007.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/10752-11007.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/10752-11007.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/11008-11263.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/11008-11263.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/11008-11263.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/11008-11263.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/11264-11519.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/11264-11519.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/11264-11519.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/11264-11519.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/11520-11775.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/11520-11775.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/11520-11775.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/11520-11775.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/11776-12031.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/11776-12031.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/11776-12031.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/11776-12031.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/12032-12287.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/12032-12287.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/12032-12287.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/12032-12287.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/12288-12543.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/12288-12543.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/12288-12543.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/12288-12543.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/12544-12799.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/12544-12799.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/12544-12799.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/12544-12799.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/1280-1535.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/1280-1535.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/1280-1535.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/1280-1535.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/12800-13055.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/12800-13055.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/12800-13055.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/12800-13055.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/13056-13311.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/13056-13311.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/13056-13311.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/13056-13311.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/13312-13567.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/13312-13567.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/13312-13567.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/13312-13567.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/13568-13823.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/13568-13823.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/13568-13823.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/13568-13823.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/13824-14079.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/13824-14079.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/13824-14079.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/13824-14079.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/14080-14335.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/14080-14335.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/14080-14335.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/14080-14335.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/14336-14591.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/14336-14591.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/14336-14591.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/14336-14591.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/14592-14847.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/14592-14847.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/14592-14847.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/14592-14847.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/14848-15103.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/14848-15103.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/14848-15103.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/14848-15103.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/15104-15359.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/15104-15359.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/15104-15359.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/15104-15359.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/1536-1791.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/1536-1791.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/1536-1791.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/1536-1791.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/15360-15615.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/15360-15615.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/15360-15615.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/15360-15615.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/15616-15871.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/15616-15871.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/15616-15871.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/15616-15871.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/15872-16127.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/15872-16127.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/15872-16127.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/15872-16127.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/16128-16383.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/16128-16383.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/16128-16383.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/16128-16383.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/16384-16639.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/16384-16639.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/16384-16639.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/16384-16639.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/16640-16895.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/16640-16895.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/16640-16895.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/16640-16895.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/16896-17151.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/16896-17151.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/16896-17151.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/16896-17151.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/17152-17407.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/17152-17407.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/17152-17407.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/17152-17407.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/17408-17663.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/17408-17663.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/17408-17663.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/17408-17663.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/17664-17919.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/17664-17919.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/17664-17919.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/17664-17919.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/1792-2047.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/1792-2047.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/1792-2047.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/1792-2047.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/17920-18175.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/17920-18175.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/17920-18175.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/17920-18175.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/18176-18431.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/18176-18431.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/18176-18431.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/18176-18431.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/18432-18687.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/18432-18687.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/18432-18687.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/18432-18687.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/18688-18943.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/18688-18943.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/18688-18943.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/18688-18943.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/18944-19199.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/18944-19199.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/18944-19199.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/18944-19199.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/19200-19455.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/19200-19455.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/19200-19455.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/19200-19455.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/19456-19711.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/19456-19711.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/19456-19711.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/19456-19711.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/19712-19967.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/19712-19967.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/19712-19967.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/19712-19967.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/19968-20223.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/19968-20223.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/19968-20223.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/19968-20223.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/20224-20479.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/20224-20479.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/20224-20479.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/20224-20479.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/2048-2303.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/2048-2303.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/2048-2303.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/2048-2303.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/20480-20735.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/20480-20735.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/20480-20735.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/20480-20735.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/20736-20991.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/20736-20991.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/20736-20991.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/20736-20991.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/20992-21247.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/20992-21247.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/20992-21247.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/20992-21247.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/21248-21503.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/21248-21503.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/21248-21503.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/21248-21503.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/21504-21759.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/21504-21759.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/21504-21759.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/21504-21759.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/21760-22015.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/21760-22015.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/21760-22015.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/21760-22015.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/22016-22271.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/22016-22271.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/22016-22271.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/22016-22271.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/22272-22527.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/22272-22527.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/22272-22527.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/22272-22527.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/22528-22783.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/22528-22783.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/22528-22783.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/22528-22783.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/22784-23039.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/22784-23039.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/22784-23039.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/22784-23039.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/2304-2559.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/2304-2559.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/2304-2559.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/2304-2559.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/23040-23295.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/23040-23295.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/23040-23295.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/23040-23295.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/23296-23551.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/23296-23551.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/23296-23551.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/23296-23551.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/23552-23807.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/23552-23807.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/23552-23807.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/23552-23807.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/23808-24063.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/23808-24063.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/23808-24063.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/23808-24063.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/24064-24319.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/24064-24319.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/24064-24319.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/24064-24319.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/24320-24575.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/24320-24575.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/24320-24575.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/24320-24575.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/24576-24831.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/24576-24831.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/24576-24831.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/24576-24831.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/24832-25087.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/24832-25087.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/24832-25087.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/24832-25087.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/25088-25343.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/25088-25343.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/25088-25343.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/25088-25343.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/25344-25599.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/25344-25599.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/25344-25599.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/25344-25599.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/256-511.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/256-511.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/256-511.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/256-511.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/2560-2815.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/2560-2815.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/2560-2815.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/2560-2815.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/25600-25855.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/25600-25855.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/25600-25855.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/25600-25855.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/25856-26111.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/25856-26111.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/25856-26111.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/25856-26111.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/26112-26367.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/26112-26367.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/26112-26367.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/26112-26367.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/26368-26623.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/26368-26623.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/26368-26623.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/26368-26623.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/26624-26879.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/26624-26879.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/26624-26879.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/26624-26879.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/26880-27135.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/26880-27135.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/26880-27135.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/26880-27135.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/27136-27391.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/27136-27391.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/27136-27391.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/27136-27391.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/27392-27647.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/27392-27647.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/27392-27647.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/27392-27647.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/27648-27903.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/27648-27903.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/27648-27903.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/27648-27903.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/27904-28159.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/27904-28159.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/27904-28159.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/27904-28159.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/2816-3071.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/2816-3071.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/2816-3071.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/2816-3071.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/28160-28415.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/28160-28415.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/28160-28415.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/28160-28415.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/28416-28671.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/28416-28671.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/28416-28671.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/28416-28671.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/28672-28927.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/28672-28927.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/28672-28927.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/28672-28927.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/28928-29183.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/28928-29183.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/28928-29183.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/28928-29183.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/29184-29439.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/29184-29439.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/29184-29439.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/29184-29439.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/29440-29695.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/29440-29695.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/29440-29695.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/29440-29695.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/29696-29951.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/29696-29951.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/29696-29951.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/29696-29951.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/29952-30207.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/29952-30207.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/29952-30207.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/29952-30207.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/30208-30463.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/30208-30463.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/30208-30463.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/30208-30463.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/30464-30719.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/30464-30719.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/30464-30719.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/30464-30719.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/3072-3327.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/3072-3327.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/3072-3327.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/3072-3327.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/30720-30975.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/30720-30975.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/30720-30975.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/30720-30975.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/30976-31231.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/30976-31231.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/30976-31231.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/30976-31231.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/31232-31487.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/31232-31487.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/31232-31487.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/31232-31487.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/31488-31743.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/31488-31743.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/31488-31743.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/31488-31743.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/31744-31999.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/31744-31999.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/31744-31999.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/31744-31999.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/32000-32255.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/32000-32255.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/32000-32255.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/32000-32255.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/32256-32511.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/32256-32511.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/32256-32511.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/32256-32511.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/32512-32767.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/32512-32767.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/32512-32767.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/32512-32767.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/32768-33023.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/32768-33023.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/32768-33023.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/32768-33023.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/33024-33279.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/33024-33279.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/33024-33279.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/33024-33279.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/3328-3583.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/3328-3583.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/3328-3583.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/3328-3583.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/33280-33535.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/33280-33535.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/33280-33535.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/33280-33535.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/33536-33791.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/33536-33791.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/33536-33791.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/33536-33791.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/33792-34047.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/33792-34047.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/33792-34047.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/33792-34047.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/34048-34303.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/34048-34303.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/34048-34303.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/34048-34303.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/34304-34559.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/34304-34559.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/34304-34559.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/34304-34559.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/34560-34815.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/34560-34815.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/34560-34815.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/34560-34815.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/34816-35071.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/34816-35071.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/34816-35071.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/34816-35071.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/35072-35327.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/35072-35327.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/35072-35327.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/35072-35327.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/35328-35583.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/35328-35583.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/35328-35583.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/35328-35583.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/35584-35839.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/35584-35839.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/35584-35839.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/35584-35839.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/3584-3839.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/3584-3839.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/3584-3839.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/3584-3839.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/35840-36095.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/35840-36095.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/35840-36095.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/35840-36095.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/36096-36351.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/36096-36351.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/36096-36351.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/36096-36351.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/36352-36607.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/36352-36607.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/36352-36607.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/36352-36607.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/36608-36863.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/36608-36863.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/36608-36863.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/36608-36863.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/36864-37119.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/36864-37119.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/36864-37119.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/36864-37119.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/37120-37375.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/37120-37375.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/37120-37375.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/37120-37375.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/37376-37631.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/37376-37631.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/37376-37631.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/37376-37631.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/37632-37887.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/37632-37887.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/37632-37887.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/37632-37887.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/37888-38143.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/37888-38143.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/37888-38143.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/37888-38143.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/38144-38399.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/38144-38399.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/38144-38399.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/38144-38399.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/3840-4095.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/3840-4095.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/3840-4095.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/3840-4095.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/38400-38655.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/38400-38655.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/38400-38655.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/38400-38655.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/38656-38911.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/38656-38911.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/38656-38911.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/38656-38911.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/38912-39167.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/38912-39167.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/38912-39167.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/38912-39167.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/39168-39423.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/39168-39423.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/39168-39423.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/39168-39423.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/39424-39679.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/39424-39679.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/39424-39679.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/39424-39679.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/39680-39935.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/39680-39935.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/39680-39935.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/39680-39935.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/39936-40191.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/39936-40191.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/39936-40191.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/39936-40191.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/40192-40447.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/40192-40447.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/40192-40447.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/40192-40447.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/40448-40703.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/40448-40703.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/40448-40703.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/40448-40703.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/40704-40959.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/40704-40959.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/40704-40959.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/40704-40959.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/4096-4351.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/4096-4351.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/4096-4351.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/4096-4351.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/40960-41215.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/40960-41215.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/40960-41215.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/40960-41215.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/41216-41471.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/41216-41471.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/41216-41471.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/41216-41471.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/41472-41727.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/41472-41727.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/41472-41727.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/41472-41727.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/41728-41983.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/41728-41983.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/41728-41983.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/41728-41983.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/41984-42239.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/41984-42239.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/41984-42239.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/41984-42239.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/42240-42495.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/42240-42495.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/42240-42495.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/42240-42495.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/42496-42751.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/42496-42751.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/42496-42751.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/42496-42751.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/42752-43007.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/42752-43007.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/42752-43007.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/42752-43007.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/43008-43263.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/43008-43263.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/43008-43263.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/43008-43263.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/43264-43519.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/43264-43519.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/43264-43519.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/43264-43519.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/4352-4607.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/4352-4607.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/4352-4607.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/4352-4607.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/43520-43775.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/43520-43775.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/43520-43775.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/43520-43775.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/43776-44031.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/43776-44031.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/43776-44031.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/43776-44031.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/44032-44287.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/44032-44287.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/44032-44287.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/44032-44287.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/44288-44543.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/44288-44543.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/44288-44543.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/44288-44543.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/44544-44799.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/44544-44799.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/44544-44799.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/44544-44799.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/44800-45055.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/44800-45055.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/44800-45055.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/44800-45055.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/45056-45311.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/45056-45311.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/45056-45311.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/45056-45311.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/45312-45567.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/45312-45567.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/45312-45567.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/45312-45567.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/45568-45823.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/45568-45823.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/45568-45823.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/45568-45823.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/45824-46079.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/45824-46079.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/45824-46079.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/45824-46079.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/4608-4863.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/4608-4863.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/4608-4863.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/4608-4863.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/46080-46335.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/46080-46335.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/46080-46335.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/46080-46335.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/46336-46591.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/46336-46591.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/46336-46591.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/46336-46591.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/46592-46847.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/46592-46847.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/46592-46847.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/46592-46847.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/46848-47103.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/46848-47103.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/46848-47103.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/46848-47103.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/47104-47359.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/47104-47359.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/47104-47359.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/47104-47359.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/47360-47615.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/47360-47615.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/47360-47615.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/47360-47615.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/47616-47871.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/47616-47871.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/47616-47871.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/47616-47871.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/47872-48127.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/47872-48127.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/47872-48127.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/47872-48127.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/48128-48383.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/48128-48383.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/48128-48383.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/48128-48383.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/48384-48639.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/48384-48639.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/48384-48639.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/48384-48639.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/4864-5119.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/4864-5119.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/4864-5119.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/4864-5119.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/48640-48895.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/48640-48895.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/48640-48895.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/48640-48895.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/48896-49151.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/48896-49151.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/48896-49151.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/48896-49151.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/49152-49407.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/49152-49407.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/49152-49407.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/49152-49407.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/49408-49663.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/49408-49663.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/49408-49663.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/49408-49663.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/49664-49919.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/49664-49919.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/49664-49919.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/49664-49919.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/49920-50175.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/49920-50175.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/49920-50175.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/49920-50175.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/50176-50431.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/50176-50431.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/50176-50431.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/50176-50431.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/50432-50687.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/50432-50687.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/50432-50687.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/50432-50687.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/50688-50943.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/50688-50943.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/50688-50943.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/50688-50943.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/50944-51199.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/50944-51199.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/50944-51199.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/50944-51199.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/512-767.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/512-767.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/512-767.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/512-767.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/5120-5375.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/5120-5375.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/5120-5375.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/5120-5375.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/51200-51455.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/51200-51455.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/51200-51455.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/51200-51455.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/51456-51711.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/51456-51711.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/51456-51711.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/51456-51711.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/51712-51967.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/51712-51967.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/51712-51967.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/51712-51967.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/51968-52223.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/51968-52223.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/51968-52223.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/51968-52223.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/52224-52479.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/52224-52479.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/52224-52479.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/52224-52479.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/52480-52735.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/52480-52735.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/52480-52735.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/52480-52735.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/52736-52991.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/52736-52991.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/52736-52991.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/52736-52991.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/52992-53247.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/52992-53247.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/52992-53247.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/52992-53247.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/53248-53503.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/53248-53503.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/53248-53503.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/53248-53503.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/53504-53759.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/53504-53759.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/53504-53759.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/53504-53759.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/5376-5631.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/5376-5631.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/5376-5631.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/5376-5631.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/53760-54015.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/53760-54015.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/53760-54015.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/53760-54015.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/54016-54271.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/54016-54271.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/54016-54271.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/54016-54271.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/54272-54527.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/54272-54527.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/54272-54527.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/54272-54527.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/54528-54783.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/54528-54783.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/54528-54783.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/54528-54783.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/54784-55039.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/54784-55039.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/54784-55039.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/54784-55039.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/55040-55295.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/55040-55295.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/55040-55295.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/55040-55295.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/55296-55551.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/55296-55551.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/55296-55551.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/55296-55551.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/55552-55807.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/55552-55807.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/55552-55807.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/55552-55807.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/55808-56063.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/55808-56063.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/55808-56063.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/55808-56063.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/56064-56319.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/56064-56319.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/56064-56319.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/56064-56319.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/5632-5887.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/5632-5887.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/5632-5887.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/5632-5887.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/56320-56575.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/56320-56575.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/56320-56575.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/56320-56575.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/56576-56831.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/56576-56831.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/56576-56831.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/56576-56831.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/56832-57087.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/56832-57087.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/56832-57087.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/56832-57087.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/57088-57343.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/57088-57343.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/57088-57343.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/57088-57343.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/57344-57599.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/57344-57599.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/57344-57599.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/57344-57599.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/57600-57855.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/57600-57855.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/57600-57855.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/57600-57855.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/57856-58111.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/57856-58111.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/57856-58111.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/57856-58111.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/58112-58367.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/58112-58367.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/58112-58367.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/58112-58367.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/58368-58623.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/58368-58623.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/58368-58623.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/58368-58623.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/58624-58879.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/58624-58879.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/58624-58879.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/58624-58879.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/5888-6143.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/5888-6143.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/5888-6143.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/5888-6143.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/58880-59135.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/58880-59135.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/58880-59135.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/58880-59135.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/59136-59391.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/59136-59391.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/59136-59391.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/59136-59391.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/59392-59647.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/59392-59647.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/59392-59647.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/59392-59647.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/59648-59903.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/59648-59903.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/59648-59903.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/59648-59903.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/59904-60159.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/59904-60159.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/59904-60159.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/59904-60159.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/60160-60415.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/60160-60415.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/60160-60415.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/60160-60415.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/60416-60671.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/60416-60671.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/60416-60671.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/60416-60671.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/60672-60927.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/60672-60927.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/60672-60927.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/60672-60927.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/60928-61183.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/60928-61183.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/60928-61183.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/60928-61183.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/61184-61439.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/61184-61439.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/61184-61439.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/61184-61439.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/6144-6399.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/6144-6399.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/6144-6399.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/6144-6399.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/61440-61695.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/61440-61695.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/61440-61695.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/61440-61695.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/61696-61951.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/61696-61951.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/61696-61951.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/61696-61951.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/61952-62207.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/61952-62207.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/61952-62207.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/61952-62207.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/62208-62463.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/62208-62463.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/62208-62463.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/62208-62463.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/62464-62719.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/62464-62719.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/62464-62719.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/62464-62719.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/62720-62975.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/62720-62975.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/62720-62975.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/62720-62975.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/62976-63231.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/62976-63231.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/62976-63231.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/62976-63231.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/63232-63487.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/63232-63487.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/63232-63487.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/63232-63487.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/63488-63743.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/63488-63743.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/63488-63743.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/63488-63743.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/63744-63999.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/63744-63999.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/63744-63999.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/63744-63999.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/6400-6655.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/6400-6655.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/6400-6655.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/6400-6655.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/64000-64255.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/64000-64255.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/64000-64255.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/64000-64255.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/64256-64511.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/64256-64511.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/64256-64511.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/64256-64511.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/64512-64767.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/64512-64767.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/64512-64767.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/64512-64767.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/64768-65023.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/64768-65023.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/64768-65023.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/64768-65023.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/65024-65279.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/65024-65279.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/65024-65279.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/65024-65279.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/65280-65535.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/65280-65535.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/65280-65535.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/65280-65535.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/6656-6911.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/6656-6911.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/6656-6911.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/6656-6911.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/6912-7167.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/6912-7167.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/6912-7167.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/6912-7167.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/7168-7423.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/7168-7423.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/7168-7423.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/7168-7423.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/7424-7679.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/7424-7679.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/7424-7679.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/7424-7679.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/768-1023.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/768-1023.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/768-1023.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/768-1023.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/7680-7935.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/7680-7935.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/7680-7935.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/7680-7935.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/7936-8191.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/7936-8191.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/7936-8191.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/7936-8191.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/8192-8447.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/8192-8447.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/8192-8447.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/8192-8447.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/8448-8703.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/8448-8703.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/8448-8703.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/8448-8703.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/8704-8959.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/8704-8959.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/8704-8959.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/8704-8959.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/8960-9215.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/8960-9215.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/8960-9215.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/8960-9215.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/9216-9471.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/9216-9471.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/9216-9471.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/9216-9471.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/9472-9727.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/9472-9727.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/9472-9727.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/9472-9727.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/9728-9983.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/9728-9983.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/9728-9983.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/9728-9983.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/9984-10239.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/9984-10239.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/9984-10239.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/9984-10239.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/0-255.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/0-255.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/0-255.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/0-255.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/1024-1279.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/1024-1279.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/1024-1279.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/1024-1279.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/10240-10495.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/10240-10495.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/10240-10495.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/10240-10495.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/10496-10751.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/10496-10751.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/10496-10751.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/10496-10751.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/10752-11007.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/10752-11007.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/10752-11007.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/10752-11007.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/11008-11263.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/11008-11263.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/11008-11263.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/11008-11263.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/11264-11519.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/11264-11519.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/11264-11519.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/11264-11519.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/11520-11775.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/11520-11775.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/11520-11775.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/11520-11775.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/11776-12031.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/11776-12031.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/11776-12031.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/11776-12031.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/12032-12287.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/12032-12287.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/12032-12287.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/12032-12287.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/12288-12543.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/12288-12543.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/12288-12543.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/12288-12543.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/12544-12799.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/12544-12799.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/12544-12799.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/12544-12799.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/1280-1535.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/1280-1535.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/1280-1535.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/1280-1535.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/12800-13055.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/12800-13055.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/12800-13055.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/12800-13055.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/13056-13311.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/13056-13311.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/13056-13311.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/13056-13311.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/13312-13567.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/13312-13567.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/13312-13567.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/13312-13567.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/13568-13823.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/13568-13823.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/13568-13823.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/13568-13823.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/13824-14079.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/13824-14079.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/13824-14079.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/13824-14079.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/14080-14335.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/14080-14335.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/14080-14335.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/14080-14335.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/14336-14591.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/14336-14591.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/14336-14591.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/14336-14591.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/14592-14847.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/14592-14847.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/14592-14847.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/14592-14847.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/14848-15103.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/14848-15103.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/14848-15103.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/14848-15103.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/15104-15359.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/15104-15359.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/15104-15359.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/15104-15359.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/1536-1791.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/1536-1791.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/1536-1791.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/1536-1791.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/15360-15615.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/15360-15615.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/15360-15615.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/15360-15615.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/15616-15871.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/15616-15871.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/15616-15871.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/15616-15871.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/15872-16127.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/15872-16127.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/15872-16127.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/15872-16127.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/16128-16383.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/16128-16383.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/16128-16383.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/16128-16383.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/16384-16639.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/16384-16639.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/16384-16639.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/16384-16639.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/16640-16895.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/16640-16895.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/16640-16895.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/16640-16895.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/16896-17151.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/16896-17151.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/16896-17151.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/16896-17151.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/17152-17407.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/17152-17407.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/17152-17407.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/17152-17407.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/17408-17663.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/17408-17663.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/17408-17663.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/17408-17663.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/17664-17919.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/17664-17919.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/17664-17919.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/17664-17919.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/1792-2047.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/1792-2047.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/1792-2047.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/1792-2047.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/17920-18175.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/17920-18175.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/17920-18175.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/17920-18175.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/18176-18431.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/18176-18431.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/18176-18431.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/18176-18431.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/18432-18687.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/18432-18687.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/18432-18687.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/18432-18687.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/18688-18943.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/18688-18943.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/18688-18943.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/18688-18943.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/18944-19199.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/18944-19199.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/18944-19199.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/18944-19199.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/19200-19455.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/19200-19455.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/19200-19455.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/19200-19455.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/19456-19711.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/19456-19711.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/19456-19711.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/19456-19711.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/19712-19967.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/19712-19967.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/19712-19967.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/19712-19967.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/19968-20223.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/19968-20223.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/19968-20223.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/19968-20223.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/20224-20479.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/20224-20479.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/20224-20479.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/20224-20479.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/2048-2303.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/2048-2303.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/2048-2303.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/2048-2303.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/20480-20735.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/20480-20735.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/20480-20735.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/20480-20735.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/20736-20991.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/20736-20991.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/20736-20991.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/20736-20991.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/20992-21247.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/20992-21247.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/20992-21247.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/20992-21247.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/21248-21503.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/21248-21503.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/21248-21503.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/21248-21503.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/21504-21759.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/21504-21759.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/21504-21759.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/21504-21759.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/21760-22015.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/21760-22015.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/21760-22015.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/21760-22015.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/22016-22271.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/22016-22271.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/22016-22271.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/22016-22271.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/22272-22527.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/22272-22527.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/22272-22527.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/22272-22527.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/22528-22783.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/22528-22783.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/22528-22783.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/22528-22783.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/22784-23039.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/22784-23039.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/22784-23039.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/22784-23039.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/2304-2559.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/2304-2559.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/2304-2559.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/2304-2559.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/23040-23295.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/23040-23295.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/23040-23295.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/23040-23295.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/23296-23551.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/23296-23551.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/23296-23551.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/23296-23551.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/23552-23807.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/23552-23807.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/23552-23807.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/23552-23807.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/23808-24063.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/23808-24063.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/23808-24063.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/23808-24063.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/24064-24319.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/24064-24319.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/24064-24319.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/24064-24319.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/24320-24575.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/24320-24575.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/24320-24575.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/24320-24575.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/24576-24831.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/24576-24831.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/24576-24831.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/24576-24831.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/24832-25087.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/24832-25087.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/24832-25087.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/24832-25087.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/25088-25343.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/25088-25343.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/25088-25343.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/25088-25343.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/25344-25599.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/25344-25599.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/25344-25599.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/25344-25599.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/256-511.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/256-511.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/256-511.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/256-511.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/2560-2815.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/2560-2815.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/2560-2815.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/2560-2815.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/25600-25855.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/25600-25855.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/25600-25855.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/25600-25855.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/25856-26111.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/25856-26111.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/25856-26111.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/25856-26111.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/26112-26367.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/26112-26367.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/26112-26367.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/26112-26367.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/26368-26623.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/26368-26623.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/26368-26623.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/26368-26623.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/26624-26879.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/26624-26879.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/26624-26879.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/26624-26879.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/26880-27135.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/26880-27135.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/26880-27135.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/26880-27135.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/27136-27391.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/27136-27391.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/27136-27391.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/27136-27391.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/27392-27647.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/27392-27647.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/27392-27647.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/27392-27647.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/27648-27903.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/27648-27903.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/27648-27903.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/27648-27903.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/27904-28159.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/27904-28159.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/27904-28159.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/27904-28159.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/2816-3071.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/2816-3071.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/2816-3071.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/2816-3071.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/28160-28415.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/28160-28415.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/28160-28415.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/28160-28415.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/28416-28671.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/28416-28671.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/28416-28671.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/28416-28671.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/28672-28927.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/28672-28927.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/28672-28927.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/28672-28927.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/28928-29183.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/28928-29183.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/28928-29183.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/28928-29183.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/29184-29439.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/29184-29439.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/29184-29439.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/29184-29439.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/29440-29695.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/29440-29695.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/29440-29695.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/29440-29695.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/29696-29951.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/29696-29951.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/29696-29951.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/29696-29951.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/29952-30207.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/29952-30207.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/29952-30207.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/29952-30207.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/30208-30463.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/30208-30463.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/30208-30463.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/30208-30463.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/30464-30719.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/30464-30719.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/30464-30719.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/30464-30719.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/3072-3327.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/3072-3327.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/3072-3327.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/3072-3327.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/30720-30975.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/30720-30975.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/30720-30975.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/30720-30975.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/30976-31231.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/30976-31231.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/30976-31231.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/30976-31231.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/31232-31487.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/31232-31487.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/31232-31487.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/31232-31487.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/31488-31743.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/31488-31743.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/31488-31743.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/31488-31743.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/31744-31999.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/31744-31999.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/31744-31999.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/31744-31999.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/32000-32255.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/32000-32255.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/32000-32255.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/32000-32255.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/32256-32511.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/32256-32511.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/32256-32511.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/32256-32511.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/32512-32767.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/32512-32767.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/32512-32767.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/32512-32767.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/32768-33023.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/32768-33023.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/32768-33023.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/32768-33023.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/33024-33279.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/33024-33279.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/33024-33279.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/33024-33279.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/3328-3583.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/3328-3583.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/3328-3583.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/3328-3583.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/33280-33535.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/33280-33535.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/33280-33535.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/33280-33535.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/33536-33791.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/33536-33791.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/33536-33791.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/33536-33791.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/33792-34047.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/33792-34047.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/33792-34047.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/33792-34047.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/34048-34303.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/34048-34303.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/34048-34303.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/34048-34303.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/34304-34559.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/34304-34559.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/34304-34559.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/34304-34559.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/34560-34815.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/34560-34815.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/34560-34815.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/34560-34815.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/34816-35071.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/34816-35071.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/34816-35071.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/34816-35071.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/35072-35327.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/35072-35327.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/35072-35327.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/35072-35327.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/35328-35583.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/35328-35583.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/35328-35583.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/35328-35583.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/35584-35839.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/35584-35839.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/35584-35839.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/35584-35839.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/3584-3839.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/3584-3839.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/3584-3839.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/3584-3839.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/35840-36095.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/35840-36095.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/35840-36095.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/35840-36095.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/36096-36351.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/36096-36351.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/36096-36351.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/36096-36351.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/36352-36607.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/36352-36607.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/36352-36607.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/36352-36607.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/36608-36863.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/36608-36863.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/36608-36863.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/36608-36863.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/36864-37119.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/36864-37119.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/36864-37119.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/36864-37119.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/37120-37375.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/37120-37375.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/37120-37375.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/37120-37375.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/37376-37631.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/37376-37631.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/37376-37631.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/37376-37631.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/37632-37887.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/37632-37887.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/37632-37887.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/37632-37887.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/37888-38143.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/37888-38143.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/37888-38143.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/37888-38143.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/38144-38399.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/38144-38399.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/38144-38399.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/38144-38399.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/3840-4095.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/3840-4095.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/3840-4095.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/3840-4095.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/38400-38655.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/38400-38655.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/38400-38655.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/38400-38655.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/38656-38911.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/38656-38911.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/38656-38911.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/38656-38911.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/38912-39167.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/38912-39167.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/38912-39167.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/38912-39167.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/39168-39423.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/39168-39423.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/39168-39423.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/39168-39423.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/39424-39679.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/39424-39679.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/39424-39679.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/39424-39679.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/39680-39935.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/39680-39935.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/39680-39935.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/39680-39935.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/39936-40191.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/39936-40191.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/39936-40191.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/39936-40191.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/40192-40447.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/40192-40447.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/40192-40447.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/40192-40447.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/40448-40703.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/40448-40703.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/40448-40703.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/40448-40703.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/40704-40959.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/40704-40959.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/40704-40959.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/40704-40959.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/4096-4351.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/4096-4351.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/4096-4351.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/4096-4351.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/40960-41215.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/40960-41215.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/40960-41215.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/40960-41215.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/41216-41471.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/41216-41471.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/41216-41471.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/41216-41471.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/41472-41727.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/41472-41727.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/41472-41727.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/41472-41727.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/41728-41983.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/41728-41983.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/41728-41983.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/41728-41983.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/41984-42239.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/41984-42239.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/41984-42239.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/41984-42239.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/42240-42495.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/42240-42495.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/42240-42495.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/42240-42495.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/42496-42751.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/42496-42751.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/42496-42751.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/42496-42751.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/42752-43007.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/42752-43007.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/42752-43007.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/42752-43007.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/43008-43263.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/43008-43263.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/43008-43263.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/43008-43263.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/43264-43519.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/43264-43519.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/43264-43519.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/43264-43519.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/4352-4607.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/4352-4607.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/4352-4607.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/4352-4607.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/43520-43775.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/43520-43775.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/43520-43775.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/43520-43775.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/43776-44031.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/43776-44031.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/43776-44031.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/43776-44031.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/44032-44287.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/44032-44287.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/44032-44287.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/44032-44287.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/44288-44543.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/44288-44543.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/44288-44543.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/44288-44543.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/44544-44799.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/44544-44799.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/44544-44799.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/44544-44799.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/44800-45055.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/44800-45055.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/44800-45055.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/44800-45055.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/45056-45311.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/45056-45311.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/45056-45311.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/45056-45311.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/45312-45567.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/45312-45567.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/45312-45567.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/45312-45567.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/45568-45823.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/45568-45823.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/45568-45823.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/45568-45823.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/45824-46079.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/45824-46079.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/45824-46079.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/45824-46079.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/4608-4863.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/4608-4863.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/4608-4863.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/4608-4863.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/46080-46335.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/46080-46335.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/46080-46335.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/46080-46335.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/46336-46591.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/46336-46591.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/46336-46591.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/46336-46591.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/46592-46847.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/46592-46847.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/46592-46847.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/46592-46847.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/46848-47103.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/46848-47103.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/46848-47103.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/46848-47103.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/47104-47359.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/47104-47359.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/47104-47359.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/47104-47359.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/47360-47615.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/47360-47615.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/47360-47615.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/47360-47615.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/47616-47871.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/47616-47871.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/47616-47871.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/47616-47871.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/47872-48127.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/47872-48127.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/47872-48127.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/47872-48127.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/48128-48383.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/48128-48383.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/48128-48383.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/48128-48383.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/48384-48639.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/48384-48639.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/48384-48639.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/48384-48639.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/4864-5119.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/4864-5119.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/4864-5119.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/4864-5119.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/48640-48895.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/48640-48895.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/48640-48895.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/48640-48895.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/48896-49151.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/48896-49151.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/48896-49151.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/48896-49151.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/49152-49407.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/49152-49407.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/49152-49407.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/49152-49407.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/49408-49663.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/49408-49663.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/49408-49663.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/49408-49663.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/49664-49919.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/49664-49919.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/49664-49919.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/49664-49919.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/49920-50175.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/49920-50175.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/49920-50175.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/49920-50175.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/50176-50431.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/50176-50431.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/50176-50431.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/50176-50431.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/50432-50687.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/50432-50687.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/50432-50687.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/50432-50687.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/50688-50943.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/50688-50943.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/50688-50943.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/50688-50943.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/50944-51199.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/50944-51199.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/50944-51199.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/50944-51199.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/512-767.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/512-767.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/512-767.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/512-767.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/5120-5375.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/5120-5375.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/5120-5375.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/5120-5375.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/51200-51455.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/51200-51455.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/51200-51455.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/51200-51455.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/51456-51711.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/51456-51711.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/51456-51711.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/51456-51711.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/51712-51967.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/51712-51967.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/51712-51967.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/51712-51967.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/51968-52223.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/51968-52223.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/51968-52223.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/51968-52223.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/52224-52479.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/52224-52479.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/52224-52479.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/52224-52479.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/52480-52735.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/52480-52735.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/52480-52735.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/52480-52735.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/52736-52991.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/52736-52991.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/52736-52991.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/52736-52991.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/52992-53247.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/52992-53247.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/52992-53247.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/52992-53247.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/53248-53503.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/53248-53503.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/53248-53503.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/53248-53503.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/53504-53759.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/53504-53759.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/53504-53759.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/53504-53759.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/5376-5631.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/5376-5631.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/5376-5631.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/5376-5631.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/53760-54015.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/53760-54015.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/53760-54015.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/53760-54015.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/54016-54271.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/54016-54271.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/54016-54271.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/54016-54271.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/54272-54527.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/54272-54527.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/54272-54527.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/54272-54527.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/54528-54783.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/54528-54783.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/54528-54783.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/54528-54783.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/54784-55039.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/54784-55039.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/54784-55039.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/54784-55039.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/55040-55295.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/55040-55295.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/55040-55295.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/55040-55295.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/55296-55551.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/55296-55551.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/55296-55551.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/55296-55551.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/55552-55807.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/55552-55807.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/55552-55807.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/55552-55807.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/55808-56063.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/55808-56063.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/55808-56063.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/55808-56063.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/56064-56319.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/56064-56319.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/56064-56319.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/56064-56319.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/5632-5887.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/5632-5887.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/5632-5887.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/5632-5887.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/56320-56575.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/56320-56575.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/56320-56575.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/56320-56575.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/56576-56831.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/56576-56831.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/56576-56831.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/56576-56831.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/56832-57087.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/56832-57087.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/56832-57087.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/56832-57087.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/57088-57343.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/57088-57343.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/57088-57343.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/57088-57343.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/57344-57599.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/57344-57599.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/57344-57599.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/57344-57599.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/57600-57855.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/57600-57855.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/57600-57855.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/57600-57855.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/57856-58111.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/57856-58111.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/57856-58111.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/57856-58111.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/58112-58367.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/58112-58367.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/58112-58367.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/58112-58367.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/58368-58623.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/58368-58623.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/58368-58623.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/58368-58623.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/58624-58879.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/58624-58879.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/58624-58879.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/58624-58879.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/5888-6143.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/5888-6143.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/5888-6143.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/5888-6143.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/58880-59135.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/58880-59135.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/58880-59135.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/58880-59135.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/59136-59391.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/59136-59391.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/59136-59391.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/59136-59391.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/59392-59647.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/59392-59647.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/59392-59647.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/59392-59647.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/59648-59903.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/59648-59903.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/59648-59903.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/59648-59903.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/59904-60159.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/59904-60159.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/59904-60159.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/59904-60159.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/60160-60415.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/60160-60415.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/60160-60415.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/60160-60415.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/60416-60671.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/60416-60671.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/60416-60671.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/60416-60671.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/60672-60927.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/60672-60927.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/60672-60927.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/60672-60927.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/60928-61183.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/60928-61183.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/60928-61183.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/60928-61183.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/61184-61439.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/61184-61439.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/61184-61439.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/61184-61439.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/6144-6399.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/6144-6399.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/6144-6399.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/6144-6399.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/61440-61695.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/61440-61695.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/61440-61695.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/61440-61695.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/61696-61951.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/61696-61951.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/61696-61951.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/61696-61951.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/61952-62207.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/61952-62207.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/61952-62207.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/61952-62207.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/62208-62463.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/62208-62463.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/62208-62463.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/62208-62463.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/62464-62719.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/62464-62719.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/62464-62719.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/62464-62719.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/62720-62975.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/62720-62975.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/62720-62975.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/62720-62975.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/62976-63231.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/62976-63231.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/62976-63231.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/62976-63231.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/63232-63487.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/63232-63487.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/63232-63487.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/63232-63487.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/63488-63743.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/63488-63743.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/63488-63743.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/63488-63743.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/63744-63999.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/63744-63999.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/63744-63999.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/63744-63999.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/6400-6655.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/6400-6655.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/6400-6655.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/6400-6655.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/64000-64255.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/64000-64255.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/64000-64255.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/64000-64255.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/64256-64511.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/64256-64511.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/64256-64511.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/64256-64511.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/64512-64767.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/64512-64767.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/64512-64767.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/64512-64767.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/64768-65023.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/64768-65023.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/64768-65023.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/64768-65023.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/65024-65279.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/65024-65279.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/65024-65279.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/65024-65279.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/65280-65535.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/65280-65535.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/65280-65535.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/65280-65535.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/6656-6911.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/6656-6911.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/6656-6911.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/6656-6911.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/6912-7167.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/6912-7167.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/6912-7167.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/6912-7167.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/7168-7423.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/7168-7423.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/7168-7423.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/7168-7423.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/7424-7679.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/7424-7679.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/7424-7679.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/7424-7679.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/768-1023.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/768-1023.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/768-1023.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/768-1023.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/7680-7935.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/7680-7935.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/7680-7935.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/7680-7935.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/7936-8191.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/7936-8191.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/7936-8191.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/7936-8191.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/8192-8447.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/8192-8447.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/8192-8447.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/8192-8447.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/8448-8703.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/8448-8703.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/8448-8703.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/8448-8703.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/8704-8959.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/8704-8959.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/8704-8959.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/8704-8959.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/8960-9215.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/8960-9215.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/8960-9215.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/8960-9215.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/9216-9471.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/9216-9471.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/9216-9471.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/9216-9471.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/9472-9727.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/9472-9727.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/9472-9727.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/9472-9727.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/9728-9983.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/9728-9983.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/9728-9983.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/9728-9983.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/9984-10239.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/9984-10239.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/9984-10239.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/9984-10239.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/0-255.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/0-255.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/0-255.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/0-255.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/1024-1279.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/1024-1279.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/1024-1279.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/1024-1279.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/10240-10495.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/10240-10495.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/10240-10495.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/10240-10495.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/10496-10751.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/10496-10751.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/10496-10751.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/10496-10751.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/10752-11007.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/10752-11007.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/10752-11007.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/10752-11007.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/11008-11263.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/11008-11263.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/11008-11263.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/11008-11263.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/11264-11519.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/11264-11519.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/11264-11519.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/11264-11519.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/11520-11775.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/11520-11775.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/11520-11775.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/11520-11775.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/11776-12031.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/11776-12031.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/11776-12031.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/11776-12031.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/12032-12287.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/12032-12287.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/12032-12287.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/12032-12287.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/12288-12543.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/12288-12543.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/12288-12543.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/12288-12543.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/12544-12799.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/12544-12799.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/12544-12799.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/12544-12799.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/1280-1535.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/1280-1535.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/1280-1535.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/1280-1535.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/12800-13055.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/12800-13055.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/12800-13055.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/12800-13055.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/13056-13311.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/13056-13311.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/13056-13311.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/13056-13311.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/13312-13567.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/13312-13567.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/13312-13567.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/13312-13567.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/13568-13823.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/13568-13823.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/13568-13823.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/13568-13823.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/13824-14079.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/13824-14079.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/13824-14079.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/13824-14079.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/14080-14335.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/14080-14335.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/14080-14335.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/14080-14335.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/14336-14591.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/14336-14591.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/14336-14591.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/14336-14591.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/14592-14847.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/14592-14847.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/14592-14847.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/14592-14847.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/14848-15103.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/14848-15103.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/14848-15103.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/14848-15103.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/15104-15359.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/15104-15359.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/15104-15359.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/15104-15359.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/1536-1791.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/1536-1791.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/1536-1791.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/1536-1791.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/15360-15615.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/15360-15615.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/15360-15615.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/15360-15615.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/15616-15871.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/15616-15871.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/15616-15871.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/15616-15871.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/15872-16127.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/15872-16127.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/15872-16127.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/15872-16127.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/16128-16383.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/16128-16383.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/16128-16383.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/16128-16383.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/16384-16639.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/16384-16639.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/16384-16639.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/16384-16639.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/16640-16895.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/16640-16895.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/16640-16895.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/16640-16895.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/16896-17151.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/16896-17151.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/16896-17151.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/16896-17151.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/17152-17407.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/17152-17407.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/17152-17407.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/17152-17407.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/17408-17663.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/17408-17663.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/17408-17663.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/17408-17663.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/17664-17919.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/17664-17919.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/17664-17919.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/17664-17919.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/1792-2047.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/1792-2047.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/1792-2047.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/1792-2047.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/17920-18175.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/17920-18175.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/17920-18175.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/17920-18175.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/18176-18431.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/18176-18431.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/18176-18431.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/18176-18431.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/18432-18687.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/18432-18687.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/18432-18687.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/18432-18687.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/18688-18943.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/18688-18943.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/18688-18943.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/18688-18943.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/18944-19199.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/18944-19199.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/18944-19199.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/18944-19199.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/19200-19455.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/19200-19455.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/19200-19455.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/19200-19455.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/19456-19711.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/19456-19711.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/19456-19711.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/19456-19711.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/19712-19967.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/19712-19967.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/19712-19967.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/19712-19967.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/19968-20223.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/19968-20223.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/19968-20223.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/19968-20223.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/20224-20479.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/20224-20479.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/20224-20479.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/20224-20479.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/2048-2303.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/2048-2303.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/2048-2303.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/2048-2303.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/20480-20735.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/20480-20735.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/20480-20735.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/20480-20735.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/20736-20991.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/20736-20991.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/20736-20991.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/20736-20991.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/20992-21247.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/20992-21247.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/20992-21247.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/20992-21247.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/21248-21503.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/21248-21503.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/21248-21503.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/21248-21503.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/21504-21759.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/21504-21759.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/21504-21759.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/21504-21759.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/21760-22015.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/21760-22015.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/21760-22015.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/21760-22015.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/22016-22271.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/22016-22271.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/22016-22271.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/22016-22271.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/22272-22527.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/22272-22527.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/22272-22527.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/22272-22527.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/22528-22783.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/22528-22783.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/22528-22783.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/22528-22783.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/22784-23039.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/22784-23039.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/22784-23039.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/22784-23039.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/2304-2559.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/2304-2559.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/2304-2559.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/2304-2559.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/23040-23295.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/23040-23295.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/23040-23295.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/23040-23295.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/23296-23551.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/23296-23551.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/23296-23551.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/23296-23551.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/23552-23807.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/23552-23807.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/23552-23807.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/23552-23807.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/23808-24063.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/23808-24063.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/23808-24063.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/23808-24063.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/24064-24319.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/24064-24319.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/24064-24319.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/24064-24319.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/24320-24575.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/24320-24575.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/24320-24575.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/24320-24575.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/24576-24831.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/24576-24831.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/24576-24831.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/24576-24831.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/24832-25087.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/24832-25087.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/24832-25087.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/24832-25087.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/25088-25343.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/25088-25343.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/25088-25343.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/25088-25343.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/25344-25599.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/25344-25599.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/25344-25599.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/25344-25599.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/256-511.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/256-511.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/256-511.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/256-511.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/2560-2815.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/2560-2815.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/2560-2815.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/2560-2815.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/25600-25855.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/25600-25855.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/25600-25855.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/25600-25855.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/25856-26111.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/25856-26111.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/25856-26111.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/25856-26111.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/26112-26367.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/26112-26367.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/26112-26367.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/26112-26367.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/26368-26623.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/26368-26623.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/26368-26623.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/26368-26623.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/26624-26879.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/26624-26879.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/26624-26879.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/26624-26879.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/26880-27135.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/26880-27135.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/26880-27135.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/26880-27135.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/27136-27391.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/27136-27391.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/27136-27391.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/27136-27391.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/27392-27647.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/27392-27647.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/27392-27647.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/27392-27647.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/27648-27903.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/27648-27903.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/27648-27903.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/27648-27903.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/27904-28159.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/27904-28159.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/27904-28159.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/27904-28159.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/2816-3071.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/2816-3071.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/2816-3071.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/2816-3071.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/28160-28415.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/28160-28415.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/28160-28415.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/28160-28415.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/28416-28671.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/28416-28671.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/28416-28671.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/28416-28671.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/28672-28927.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/28672-28927.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/28672-28927.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/28672-28927.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/28928-29183.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/28928-29183.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/28928-29183.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/28928-29183.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/29184-29439.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/29184-29439.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/29184-29439.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/29184-29439.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/29440-29695.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/29440-29695.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/29440-29695.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/29440-29695.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/29696-29951.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/29696-29951.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/29696-29951.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/29696-29951.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/29952-30207.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/29952-30207.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/29952-30207.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/29952-30207.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/30208-30463.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/30208-30463.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/30208-30463.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/30208-30463.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/30464-30719.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/30464-30719.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/30464-30719.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/30464-30719.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/3072-3327.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/3072-3327.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/3072-3327.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/3072-3327.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/30720-30975.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/30720-30975.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/30720-30975.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/30720-30975.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/30976-31231.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/30976-31231.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/30976-31231.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/30976-31231.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/31232-31487.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/31232-31487.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/31232-31487.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/31232-31487.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/31488-31743.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/31488-31743.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/31488-31743.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/31488-31743.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/31744-31999.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/31744-31999.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/31744-31999.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/31744-31999.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/32000-32255.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/32000-32255.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/32000-32255.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/32000-32255.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/32256-32511.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/32256-32511.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/32256-32511.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/32256-32511.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/32512-32767.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/32512-32767.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/32512-32767.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/32512-32767.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/32768-33023.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/32768-33023.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/32768-33023.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/32768-33023.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/33024-33279.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/33024-33279.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/33024-33279.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/33024-33279.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/3328-3583.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/3328-3583.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/3328-3583.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/3328-3583.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/33280-33535.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/33280-33535.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/33280-33535.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/33280-33535.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/33536-33791.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/33536-33791.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/33536-33791.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/33536-33791.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/33792-34047.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/33792-34047.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/33792-34047.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/33792-34047.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/34048-34303.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/34048-34303.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/34048-34303.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/34048-34303.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/34304-34559.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/34304-34559.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/34304-34559.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/34304-34559.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/34560-34815.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/34560-34815.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/34560-34815.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/34560-34815.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/34816-35071.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/34816-35071.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/34816-35071.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/34816-35071.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/35072-35327.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/35072-35327.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/35072-35327.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/35072-35327.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/35328-35583.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/35328-35583.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/35328-35583.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/35328-35583.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/35584-35839.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/35584-35839.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/35584-35839.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/35584-35839.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/3584-3839.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/3584-3839.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/3584-3839.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/3584-3839.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/35840-36095.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/35840-36095.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/35840-36095.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/35840-36095.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/36096-36351.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/36096-36351.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/36096-36351.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/36096-36351.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/36352-36607.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/36352-36607.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/36352-36607.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/36352-36607.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/36608-36863.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/36608-36863.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/36608-36863.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/36608-36863.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/36864-37119.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/36864-37119.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/36864-37119.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/36864-37119.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/37120-37375.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/37120-37375.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/37120-37375.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/37120-37375.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/37376-37631.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/37376-37631.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/37376-37631.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/37376-37631.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/37632-37887.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/37632-37887.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/37632-37887.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/37632-37887.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/37888-38143.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/37888-38143.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/37888-38143.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/37888-38143.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/38144-38399.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/38144-38399.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/38144-38399.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/38144-38399.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/3840-4095.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/3840-4095.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/3840-4095.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/3840-4095.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/38400-38655.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/38400-38655.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/38400-38655.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/38400-38655.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/38656-38911.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/38656-38911.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/38656-38911.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/38656-38911.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/38912-39167.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/38912-39167.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/38912-39167.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/38912-39167.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/39168-39423.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/39168-39423.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/39168-39423.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/39168-39423.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/39424-39679.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/39424-39679.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/39424-39679.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/39424-39679.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/39680-39935.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/39680-39935.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/39680-39935.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/39680-39935.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/39936-40191.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/39936-40191.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/39936-40191.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/39936-40191.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/40192-40447.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/40192-40447.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/40192-40447.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/40192-40447.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/40448-40703.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/40448-40703.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/40448-40703.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/40448-40703.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/40704-40959.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/40704-40959.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/40704-40959.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/40704-40959.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/4096-4351.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/4096-4351.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/4096-4351.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/4096-4351.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/40960-41215.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/40960-41215.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/40960-41215.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/40960-41215.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/41216-41471.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/41216-41471.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/41216-41471.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/41216-41471.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/41472-41727.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/41472-41727.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/41472-41727.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/41472-41727.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/41728-41983.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/41728-41983.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/41728-41983.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/41728-41983.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/41984-42239.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/41984-42239.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/41984-42239.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/41984-42239.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/42240-42495.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/42240-42495.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/42240-42495.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/42240-42495.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/42496-42751.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/42496-42751.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/42496-42751.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/42496-42751.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/42752-43007.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/42752-43007.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/42752-43007.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/42752-43007.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/43008-43263.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/43008-43263.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/43008-43263.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/43008-43263.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/43264-43519.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/43264-43519.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/43264-43519.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/43264-43519.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/4352-4607.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/4352-4607.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/4352-4607.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/4352-4607.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/43520-43775.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/43520-43775.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/43520-43775.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/43520-43775.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/43776-44031.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/43776-44031.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/43776-44031.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/43776-44031.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/44032-44287.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/44032-44287.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/44032-44287.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/44032-44287.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/44288-44543.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/44288-44543.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/44288-44543.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/44288-44543.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/44544-44799.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/44544-44799.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/44544-44799.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/44544-44799.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/44800-45055.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/44800-45055.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/44800-45055.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/44800-45055.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/45056-45311.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/45056-45311.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/45056-45311.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/45056-45311.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/45312-45567.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/45312-45567.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/45312-45567.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/45312-45567.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/45568-45823.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/45568-45823.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/45568-45823.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/45568-45823.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/45824-46079.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/45824-46079.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/45824-46079.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/45824-46079.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/4608-4863.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/4608-4863.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/4608-4863.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/4608-4863.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/46080-46335.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/46080-46335.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/46080-46335.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/46080-46335.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/46336-46591.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/46336-46591.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/46336-46591.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/46336-46591.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/46592-46847.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/46592-46847.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/46592-46847.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/46592-46847.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/46848-47103.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/46848-47103.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/46848-47103.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/46848-47103.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/47104-47359.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/47104-47359.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/47104-47359.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/47104-47359.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/47360-47615.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/47360-47615.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/47360-47615.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/47360-47615.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/47616-47871.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/47616-47871.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/47616-47871.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/47616-47871.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/47872-48127.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/47872-48127.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/47872-48127.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/47872-48127.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/48128-48383.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/48128-48383.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/48128-48383.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/48128-48383.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/48384-48639.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/48384-48639.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/48384-48639.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/48384-48639.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/4864-5119.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/4864-5119.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/4864-5119.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/4864-5119.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/48640-48895.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/48640-48895.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/48640-48895.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/48640-48895.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/48896-49151.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/48896-49151.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/48896-49151.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/48896-49151.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/49152-49407.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/49152-49407.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/49152-49407.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/49152-49407.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/49408-49663.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/49408-49663.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/49408-49663.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/49408-49663.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/49664-49919.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/49664-49919.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/49664-49919.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/49664-49919.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/49920-50175.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/49920-50175.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/49920-50175.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/49920-50175.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/50176-50431.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/50176-50431.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/50176-50431.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/50176-50431.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/50432-50687.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/50432-50687.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/50432-50687.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/50432-50687.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/50688-50943.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/50688-50943.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/50688-50943.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/50688-50943.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/50944-51199.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/50944-51199.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/50944-51199.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/50944-51199.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/512-767.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/512-767.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/512-767.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/512-767.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/5120-5375.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/5120-5375.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/5120-5375.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/5120-5375.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/51200-51455.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/51200-51455.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/51200-51455.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/51200-51455.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/51456-51711.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/51456-51711.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/51456-51711.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/51456-51711.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/51712-51967.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/51712-51967.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/51712-51967.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/51712-51967.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/51968-52223.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/51968-52223.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/51968-52223.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/51968-52223.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/52224-52479.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/52224-52479.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/52224-52479.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/52224-52479.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/52480-52735.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/52480-52735.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/52480-52735.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/52480-52735.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/52736-52991.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/52736-52991.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/52736-52991.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/52736-52991.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/52992-53247.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/52992-53247.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/52992-53247.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/52992-53247.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/53248-53503.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/53248-53503.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/53248-53503.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/53248-53503.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/53504-53759.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/53504-53759.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/53504-53759.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/53504-53759.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/5376-5631.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/5376-5631.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/5376-5631.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/5376-5631.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/53760-54015.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/53760-54015.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/53760-54015.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/53760-54015.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/54016-54271.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/54016-54271.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/54016-54271.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/54016-54271.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/54272-54527.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/54272-54527.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/54272-54527.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/54272-54527.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/54528-54783.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/54528-54783.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/54528-54783.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/54528-54783.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/54784-55039.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/54784-55039.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/54784-55039.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/54784-55039.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/55040-55295.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/55040-55295.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/55040-55295.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/55040-55295.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/55296-55551.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/55296-55551.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/55296-55551.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/55296-55551.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/55552-55807.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/55552-55807.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/55552-55807.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/55552-55807.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/55808-56063.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/55808-56063.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/55808-56063.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/55808-56063.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/56064-56319.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/56064-56319.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/56064-56319.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/56064-56319.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/5632-5887.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/5632-5887.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/5632-5887.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/5632-5887.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/56320-56575.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/56320-56575.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/56320-56575.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/56320-56575.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/56576-56831.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/56576-56831.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/56576-56831.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/56576-56831.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/56832-57087.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/56832-57087.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/56832-57087.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/56832-57087.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/57088-57343.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/57088-57343.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/57088-57343.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/57088-57343.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/57344-57599.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/57344-57599.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/57344-57599.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/57344-57599.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/57600-57855.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/57600-57855.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/57600-57855.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/57600-57855.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/57856-58111.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/57856-58111.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/57856-58111.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/57856-58111.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/58112-58367.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/58112-58367.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/58112-58367.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/58112-58367.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/58368-58623.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/58368-58623.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/58368-58623.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/58368-58623.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/58624-58879.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/58624-58879.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/58624-58879.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/58624-58879.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/5888-6143.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/5888-6143.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/5888-6143.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/5888-6143.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/58880-59135.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/58880-59135.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/58880-59135.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/58880-59135.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/59136-59391.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/59136-59391.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/59136-59391.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/59136-59391.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/59392-59647.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/59392-59647.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/59392-59647.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/59392-59647.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/59648-59903.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/59648-59903.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/59648-59903.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/59648-59903.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/59904-60159.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/59904-60159.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/59904-60159.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/59904-60159.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/60160-60415.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/60160-60415.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/60160-60415.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/60160-60415.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/60416-60671.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/60416-60671.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/60416-60671.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/60416-60671.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/60672-60927.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/60672-60927.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/60672-60927.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/60672-60927.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/60928-61183.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/60928-61183.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/60928-61183.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/60928-61183.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/61184-61439.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/61184-61439.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/61184-61439.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/61184-61439.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/6144-6399.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/6144-6399.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/6144-6399.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/6144-6399.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/61440-61695.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/61440-61695.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/61440-61695.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/61440-61695.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/61696-61951.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/61696-61951.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/61696-61951.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/61696-61951.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/61952-62207.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/61952-62207.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/61952-62207.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/61952-62207.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/62208-62463.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/62208-62463.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/62208-62463.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/62208-62463.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/62464-62719.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/62464-62719.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/62464-62719.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/62464-62719.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/62720-62975.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/62720-62975.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/62720-62975.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/62720-62975.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/62976-63231.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/62976-63231.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/62976-63231.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/62976-63231.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/63232-63487.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/63232-63487.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/63232-63487.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/63232-63487.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/63488-63743.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/63488-63743.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/63488-63743.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/63488-63743.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/63744-63999.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/63744-63999.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/63744-63999.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/63744-63999.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/6400-6655.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/6400-6655.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/6400-6655.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/6400-6655.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/64000-64255.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/64000-64255.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/64000-64255.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/64000-64255.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/64256-64511.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/64256-64511.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/64256-64511.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/64256-64511.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/64512-64767.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/64512-64767.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/64512-64767.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/64512-64767.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/64768-65023.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/64768-65023.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/64768-65023.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/64768-65023.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/65024-65279.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/65024-65279.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/65024-65279.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/65024-65279.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/65280-65535.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/65280-65535.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/65280-65535.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/65280-65535.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/6656-6911.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/6656-6911.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/6656-6911.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/6656-6911.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/6912-7167.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/6912-7167.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/6912-7167.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/6912-7167.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/7168-7423.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/7168-7423.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/7168-7423.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/7168-7423.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/7424-7679.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/7424-7679.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/7424-7679.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/7424-7679.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/768-1023.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/768-1023.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/768-1023.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/768-1023.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/7680-7935.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/7680-7935.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/7680-7935.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/7680-7935.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/7936-8191.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/7936-8191.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/7936-8191.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/7936-8191.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/8192-8447.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/8192-8447.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/8192-8447.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/8192-8447.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/8448-8703.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/8448-8703.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/8448-8703.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/8448-8703.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/8704-8959.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/8704-8959.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/8704-8959.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/8704-8959.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/8960-9215.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/8960-9215.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/8960-9215.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/8960-9215.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/9216-9471.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/9216-9471.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/9216-9471.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/9216-9471.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/9472-9727.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/9472-9727.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/9472-9727.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/9472-9727.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/9728-9983.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/9728-9983.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/9728-9983.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/9728-9983.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/9984-10239.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/9984-10239.pbf similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/9984-10239.pbf rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/9984-10239.pbf diff --git a/play-services-maps-core-mapbox/src/main/assets/sprites.json b/play-services-maps/core/mapbox/src/main/assets/sprites.json similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/sprites.json rename to play-services-maps/core/mapbox/src/main/assets/sprites.json diff --git a/play-services-maps-core-mapbox/src/main/assets/sprites.png b/play-services-maps/core/mapbox/src/main/assets/sprites.png similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/sprites.png rename to play-services-maps/core/mapbox/src/main/assets/sprites.png diff --git a/play-services-maps-core-mapbox/src/main/assets/sprites@2x.json b/play-services-maps/core/mapbox/src/main/assets/sprites@2x.json similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/sprites@2x.json rename to play-services-maps/core/mapbox/src/main/assets/sprites@2x.json diff --git a/play-services-maps-core-mapbox/src/main/assets/sprites@2x.png b/play-services-maps/core/mapbox/src/main/assets/sprites@2x.png similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/sprites@2x.png rename to play-services-maps/core/mapbox/src/main/assets/sprites@2x.png diff --git a/play-services-maps-core-mapbox/src/main/assets/style-mapbox-outdoors-v12.json b/play-services-maps/core/mapbox/src/main/assets/style-mapbox-outdoors-v12.json similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/style-mapbox-outdoors-v12.json rename to play-services-maps/core/mapbox/src/main/assets/style-mapbox-outdoors-v12.json diff --git a/play-services-maps-core-mapbox/src/main/assets/style-microg-normal-mapbox.json b/play-services-maps/core/mapbox/src/main/assets/style-microg-normal-mapbox.json similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/style-microg-normal-mapbox.json rename to play-services-maps/core/mapbox/src/main/assets/style-microg-normal-mapbox.json diff --git a/play-services-maps-core-mapbox/src/main/assets/style-microg-normal-stadia.json b/play-services-maps/core/mapbox/src/main/assets/style-microg-normal-stadia.json similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/style-microg-normal-stadia.json rename to play-services-maps/core/mapbox/src/main/assets/style-microg-normal-stadia.json diff --git a/play-services-maps-core-mapbox/src/main/assets/style-microg-satellite-mapbox.json b/play-services-maps/core/mapbox/src/main/assets/style-microg-satellite-mapbox.json similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/style-microg-satellite-mapbox.json rename to play-services-maps/core/mapbox/src/main/assets/style-microg-satellite-mapbox.json diff --git a/play-services-maps-core-mapbox/src/main/assets/style-microg-satellite-stadia.json b/play-services-maps/core/mapbox/src/main/assets/style-microg-satellite-stadia.json similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/style-microg-satellite-stadia.json rename to play-services-maps/core/mapbox/src/main/assets/style-microg-satellite-stadia.json diff --git a/play-services-maps-core-mapbox/src/main/assets/style-stadia-outdoors.json b/play-services-maps/core/mapbox/src/main/assets/style-stadia-outdoors.json similarity index 100% rename from play-services-maps-core-mapbox/src/main/assets/style-stadia-outdoors.json rename to play-services-maps/core/mapbox/src/main/assets/style-stadia-outdoors.json diff --git a/play-services-maps-core-mapbox/src/main/java/com/google/android/gms/dynamite/descriptors/com/google/android/gms/maps_dynamite/ModuleDescriptor.java b/play-services-maps/core/mapbox/src/main/java/com/google/android/gms/dynamite/descriptors/com/google/android/gms/maps_dynamite/ModuleDescriptor.java similarity index 100% rename from play-services-maps-core-mapbox/src/main/java/com/google/android/gms/dynamite/descriptors/com/google/android/gms/maps_dynamite/ModuleDescriptor.java rename to play-services-maps/core/mapbox/src/main/java/com/google/android/gms/dynamite/descriptors/com/google/android/gms/maps_dynamite/ModuleDescriptor.java diff --git a/play-services-maps-core-mapbox/src/main/java/com/google/android/gms/maps/internal/CreatorImpl.java b/play-services-maps/core/mapbox/src/main/java/com/google/android/gms/maps/internal/CreatorImpl.java similarity index 100% rename from play-services-maps-core-mapbox/src/main/java/com/google/android/gms/maps/internal/CreatorImpl.java rename to play-services-maps/core/mapbox/src/main/java/com/google/android/gms/maps/internal/CreatorImpl.java diff --git a/play-services-maps-core-mapbox/src/main/java/com/mapbox/android/accounts/v1/MapboxAccounts.java b/play-services-maps/core/mapbox/src/main/java/com/mapbox/android/accounts/v1/MapboxAccounts.java similarity index 100% rename from play-services-maps-core-mapbox/src/main/java/com/mapbox/android/accounts/v1/MapboxAccounts.java rename to play-services-maps/core/mapbox/src/main/java/com/mapbox/android/accounts/v1/MapboxAccounts.java diff --git a/play-services-maps-core-mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/AbstractGoogleMap.kt b/play-services-maps/core/mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/AbstractGoogleMap.kt similarity index 100% rename from play-services-maps-core-mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/AbstractGoogleMap.kt rename to play-services-maps/core/mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/AbstractGoogleMap.kt diff --git a/play-services-maps-core-mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/CameraBoundsWithSizeUpdate.kt b/play-services-maps/core/mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/CameraBoundsWithSizeUpdate.kt similarity index 100% rename from play-services-maps-core-mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/CameraBoundsWithSizeUpdate.kt rename to play-services-maps/core/mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/CameraBoundsWithSizeUpdate.kt diff --git a/play-services-maps-core-mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/CameraUpdateFactory.kt b/play-services-maps/core/mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/CameraUpdateFactory.kt similarity index 100% rename from play-services-maps-core-mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/CameraUpdateFactory.kt rename to play-services-maps/core/mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/CameraUpdateFactory.kt diff --git a/play-services-maps-core-mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/GoogleLocationEngine.kt b/play-services-maps/core/mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/GoogleLocationEngine.kt similarity index 100% rename from play-services-maps-core-mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/GoogleLocationEngine.kt rename to play-services-maps/core/mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/GoogleLocationEngine.kt diff --git a/play-services-maps-core-mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/GoogleMap.kt b/play-services-maps/core/mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/GoogleMap.kt similarity index 100% rename from play-services-maps-core-mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/GoogleMap.kt rename to play-services-maps/core/mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/GoogleMap.kt diff --git a/play-services-maps-core-mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/LiteGoogleMap.kt b/play-services-maps/core/mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/LiteGoogleMap.kt similarity index 100% rename from play-services-maps-core-mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/LiteGoogleMap.kt rename to play-services-maps/core/mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/LiteGoogleMap.kt diff --git a/play-services-maps-core-mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/MapFragment.kt b/play-services-maps/core/mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/MapFragment.kt similarity index 100% rename from play-services-maps-core-mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/MapFragment.kt rename to play-services-maps/core/mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/MapFragment.kt diff --git a/play-services-maps-core-mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/MapView.kt b/play-services-maps/core/mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/MapView.kt similarity index 100% rename from play-services-maps-core-mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/MapView.kt rename to play-services-maps/core/mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/MapView.kt diff --git a/play-services-maps-core-mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/Pattern.kt b/play-services-maps/core/mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/Pattern.kt similarity index 100% rename from play-services-maps-core-mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/Pattern.kt rename to play-services-maps/core/mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/Pattern.kt diff --git a/play-services-maps-core-mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/Projection.kt b/play-services-maps/core/mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/Projection.kt similarity index 100% rename from play-services-maps-core-mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/Projection.kt rename to play-services-maps/core/mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/Projection.kt diff --git a/play-services-maps-core-mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/SourceLocationEngine.kt b/play-services-maps/core/mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/SourceLocationEngine.kt similarity index 100% rename from play-services-maps-core-mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/SourceLocationEngine.kt rename to play-services-maps/core/mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/SourceLocationEngine.kt diff --git a/play-services-maps-core-mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/Styles.kt b/play-services-maps/core/mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/Styles.kt similarity index 100% rename from play-services-maps-core-mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/Styles.kt rename to play-services-maps/core/mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/Styles.kt diff --git a/play-services-maps-core-mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/UiSettings.kt b/play-services-maps/core/mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/UiSettings.kt similarity index 100% rename from play-services-maps-core-mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/UiSettings.kt rename to play-services-maps/core/mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/UiSettings.kt diff --git a/play-services-maps-core-mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/model/BitmapDescriptor.kt b/play-services-maps/core/mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/model/BitmapDescriptor.kt similarity index 100% rename from play-services-maps-core-mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/model/BitmapDescriptor.kt rename to play-services-maps/core/mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/model/BitmapDescriptor.kt diff --git a/play-services-maps-core-mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/model/BitmapDescriptorFactory.kt b/play-services-maps/core/mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/model/BitmapDescriptorFactory.kt similarity index 100% rename from play-services-maps-core-mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/model/BitmapDescriptorFactory.kt rename to play-services-maps/core/mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/model/BitmapDescriptorFactory.kt diff --git a/play-services-maps-core-mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/model/Circle.kt b/play-services-maps/core/mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/model/Circle.kt similarity index 100% rename from play-services-maps-core-mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/model/Circle.kt rename to play-services-maps/core/mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/model/Circle.kt diff --git a/play-services-maps-core-mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/model/GroundOverlay.kt b/play-services-maps/core/mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/model/GroundOverlay.kt similarity index 100% rename from play-services-maps-core-mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/model/GroundOverlay.kt rename to play-services-maps/core/mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/model/GroundOverlay.kt diff --git a/play-services-maps-core-mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/model/InfoWindow.kt b/play-services-maps/core/mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/model/InfoWindow.kt similarity index 100% rename from play-services-maps-core-mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/model/InfoWindow.kt rename to play-services-maps/core/mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/model/InfoWindow.kt diff --git a/play-services-maps-core-mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/model/Marker.kt b/play-services-maps/core/mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/model/Marker.kt similarity index 100% rename from play-services-maps-core-mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/model/Marker.kt rename to play-services-maps/core/mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/model/Marker.kt diff --git a/play-services-maps-core-mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/model/Markup.kt b/play-services-maps/core/mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/model/Markup.kt similarity index 100% rename from play-services-maps-core-mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/model/Markup.kt rename to play-services-maps/core/mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/model/Markup.kt diff --git a/play-services-maps-core-mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/model/Polygon.kt b/play-services-maps/core/mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/model/Polygon.kt similarity index 100% rename from play-services-maps-core-mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/model/Polygon.kt rename to play-services-maps/core/mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/model/Polygon.kt diff --git a/play-services-maps-core-mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/model/Polyline.kt b/play-services-maps/core/mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/model/Polyline.kt similarity index 100% rename from play-services-maps-core-mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/model/Polyline.kt rename to play-services-maps/core/mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/model/Polyline.kt diff --git a/play-services-maps-core-mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/model/TileOverlay.kt b/play-services-maps/core/mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/model/TileOverlay.kt similarity index 100% rename from play-services-maps-core-mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/model/TileOverlay.kt rename to play-services-maps/core/mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/model/TileOverlay.kt diff --git a/play-services-maps-core-mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/utils/MapContext.kt b/play-services-maps/core/mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/utils/MapContext.kt similarity index 100% rename from play-services-maps-core-mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/utils/MapContext.kt rename to play-services-maps/core/mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/utils/MapContext.kt diff --git a/play-services-maps-core-mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/utils/MultiArchLoader.kt b/play-services-maps/core/mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/utils/MultiArchLoader.kt similarity index 100% rename from play-services-maps-core-mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/utils/MultiArchLoader.kt rename to play-services-maps/core/mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/utils/MultiArchLoader.kt diff --git a/play-services-maps-core-mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/utils/typeConverter.kt b/play-services-maps/core/mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/utils/typeConverter.kt similarity index 100% rename from play-services-maps-core-mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/utils/typeConverter.kt rename to play-services-maps/core/mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/utils/typeConverter.kt diff --git a/play-services-maps-core-mapbox/src/main/res/drawable-hdpi/maps_default_marker.png b/play-services-maps/core/mapbox/src/main/res/drawable-hdpi/maps_default_marker.png similarity index 100% rename from play-services-maps-core-mapbox/src/main/res/drawable-hdpi/maps_default_marker.png rename to play-services-maps/core/mapbox/src/main/res/drawable-hdpi/maps_default_marker.png diff --git a/play-services-maps-core-mapbox/src/main/res/drawable-ldpi/maps_default_marker.png b/play-services-maps/core/mapbox/src/main/res/drawable-ldpi/maps_default_marker.png similarity index 100% rename from play-services-maps-core-mapbox/src/main/res/drawable-ldpi/maps_default_marker.png rename to play-services-maps/core/mapbox/src/main/res/drawable-ldpi/maps_default_marker.png diff --git a/play-services-maps-core-mapbox/src/main/res/drawable-mdpi/maps_default_marker.png b/play-services-maps/core/mapbox/src/main/res/drawable-mdpi/maps_default_marker.png similarity index 100% rename from play-services-maps-core-mapbox/src/main/res/drawable-mdpi/maps_default_marker.png rename to play-services-maps/core/mapbox/src/main/res/drawable-mdpi/maps_default_marker.png diff --git a/play-services-maps-core-mapbox/src/main/res/drawable-xhdpi/maps_default_marker.png b/play-services-maps/core/mapbox/src/main/res/drawable-xhdpi/maps_default_marker.png similarity index 100% rename from play-services-maps-core-mapbox/src/main/res/drawable-xhdpi/maps_default_marker.png rename to play-services-maps/core/mapbox/src/main/res/drawable-xhdpi/maps_default_marker.png diff --git a/play-services-maps-core-mapbox/src/main/res/drawable-xxhdpi/maps_default_marker.png b/play-services-maps/core/mapbox/src/main/res/drawable-xxhdpi/maps_default_marker.png similarity index 100% rename from play-services-maps-core-mapbox/src/main/res/drawable-xxhdpi/maps_default_marker.png rename to play-services-maps/core/mapbox/src/main/res/drawable-xxhdpi/maps_default_marker.png diff --git a/play-services-maps-core-mapbox/src/main/res/drawable-xxxhdpi/maps_default_marker.png b/play-services-maps/core/mapbox/src/main/res/drawable-xxxhdpi/maps_default_marker.png similarity index 100% rename from play-services-maps-core-mapbox/src/main/res/drawable-xxxhdpi/maps_default_marker.png rename to play-services-maps/core/mapbox/src/main/res/drawable-xxxhdpi/maps_default_marker.png diff --git a/play-services-maps-core-mapbox/src/main/res/drawable/location_dot.xml b/play-services-maps/core/mapbox/src/main/res/drawable/location_dot.xml similarity index 100% rename from play-services-maps-core-mapbox/src/main/res/drawable/location_dot.xml rename to play-services-maps/core/mapbox/src/main/res/drawable/location_dot.xml diff --git a/play-services-maps-core-mapbox/src/main/res/drawable/maps_default_bubble.xml b/play-services-maps/core/mapbox/src/main/res/drawable/maps_default_bubble.xml similarity index 100% rename from play-services-maps-core-mapbox/src/main/res/drawable/maps_default_bubble.xml rename to play-services-maps/core/mapbox/src/main/res/drawable/maps_default_bubble.xml diff --git a/play-services-maps-core-mapbox/src/main/res/layout/maps_default_bubble_layout.xml b/play-services-maps/core/mapbox/src/main/res/layout/maps_default_bubble_layout.xml similarity index 100% rename from play-services-maps-core-mapbox/src/main/res/layout/maps_default_bubble_layout.xml rename to play-services-maps/core/mapbox/src/main/res/layout/maps_default_bubble_layout.xml diff --git a/play-services-maps-core-vtm/build.gradle b/play-services-maps/core/vtm/build.gradle similarity index 91% rename from play-services-maps-core-vtm/build.gradle rename to play-services-maps/core/vtm/build.gradle index f3683da0f7..1e45d66f13 100644 --- a/play-services-maps-core-vtm/build.gradle +++ b/play-services-maps/core/vtm/build.gradle @@ -27,7 +27,7 @@ dependencies { implementation "org.microg:vtm-android:0.9.1-mod:natives-x86_64" implementation "org.microg:vtm-extras:0.9.1-mod" implementation "org.microg:vtm-jts:0.9.1-mod" - implementation project(":play-services-maps-core-vtm:vtm-microg-theme") + implementation project(":play-services-maps-core-vtm-microg-theme") implementation "androidx.appcompat:appcompat:$appcompatVersion" } @@ -48,8 +48,7 @@ android { buildToolsVersion "$androidBuildVersionTools" defaultConfig { - versionName "temp" - versionCode 1 + versionName version minSdkVersion androidMinSdk targetSdkVersion androidTargetSdk @@ -66,7 +65,6 @@ android { buildTypes { release { minifyEnabled true - proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro" } } diff --git a/play-services-maps-core-vtm/vtm-microg-theme/build.gradle b/play-services-maps/core/vtm/microg-theme/build.gradle similarity index 100% rename from play-services-maps-core-vtm/vtm-microg-theme/build.gradle rename to play-services-maps/core/vtm/microg-theme/build.gradle diff --git a/play-services-maps-core-vtm/vtm-microg-theme/resources/assets/styles/microg.xml b/play-services-maps/core/vtm/microg-theme/resources/assets/styles/microg.xml similarity index 100% rename from play-services-maps-core-vtm/vtm-microg-theme/resources/assets/styles/microg.xml rename to play-services-maps/core/vtm/microg-theme/resources/assets/styles/microg.xml diff --git a/play-services-maps-core-vtm/vtm-microg-theme/resources/assets/symbols/dot_white.svg b/play-services-maps/core/vtm/microg-theme/resources/assets/symbols/dot_white.svg similarity index 100% rename from play-services-maps-core-vtm/vtm-microg-theme/resources/assets/symbols/dot_white.svg rename to play-services-maps/core/vtm/microg-theme/resources/assets/symbols/dot_white.svg diff --git a/play-services-maps-core-vtm/vtm-microg-theme/resources/assets/symbols/transit/train_station.svg b/play-services-maps/core/vtm/microg-theme/resources/assets/symbols/transit/train_station.svg similarity index 100% rename from play-services-maps-core-vtm/vtm-microg-theme/resources/assets/symbols/transit/train_station.svg rename to play-services-maps/core/vtm/microg-theme/resources/assets/symbols/transit/train_station.svg diff --git a/play-services-maps-core-vtm/vtm-microg-theme/resources/assets/symbols/transit/train_station_small.svg b/play-services-maps/core/vtm/microg-theme/resources/assets/symbols/transit/train_station_small.svg similarity index 100% rename from play-services-maps-core-vtm/vtm-microg-theme/resources/assets/symbols/transit/train_station_small.svg rename to play-services-maps/core/vtm/microg-theme/resources/assets/symbols/transit/train_station_small.svg diff --git a/play-services-maps-core-vtm/vtm-microg-theme/src/org/oscim/theme/MicrogThemes.java b/play-services-maps/core/vtm/microg-theme/src/org/oscim/theme/MicrogThemes.java similarity index 100% rename from play-services-maps-core-vtm/vtm-microg-theme/src/org/oscim/theme/MicrogThemes.java rename to play-services-maps/core/vtm/microg-theme/src/org/oscim/theme/MicrogThemes.java diff --git a/play-services-maps-core-vtm/src/main/AndroidManifest.xml b/play-services-maps/core/vtm/src/main/AndroidManifest.xml similarity index 100% rename from play-services-maps-core-vtm/src/main/AndroidManifest.xml rename to play-services-maps/core/vtm/src/main/AndroidManifest.xml diff --git a/play-services-maps-core-vtm/src/main/java/com/google/android/gms/maps/internal/CreatorImpl.java b/play-services-maps/core/vtm/src/main/java/com/google/android/gms/maps/internal/CreatorImpl.java similarity index 100% rename from play-services-maps-core-vtm/src/main/java/com/google/android/gms/maps/internal/CreatorImpl.java rename to play-services-maps/core/vtm/src/main/java/com/google/android/gms/maps/internal/CreatorImpl.java diff --git a/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/ApplicationContextWrapper.java b/play-services-maps/core/vtm/src/main/java/org/microg/gms/maps/vtm/ApplicationContextWrapper.java similarity index 100% rename from play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/ApplicationContextWrapper.java rename to play-services-maps/core/vtm/src/main/java/org/microg/gms/maps/vtm/ApplicationContextWrapper.java diff --git a/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/BackendMap.java b/play-services-maps/core/vtm/src/main/java/org/microg/gms/maps/vtm/BackendMap.java similarity index 100% rename from play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/BackendMap.java rename to play-services-maps/core/vtm/src/main/java/org/microg/gms/maps/vtm/BackendMap.java diff --git a/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/BackendMapView.java b/play-services-maps/core/vtm/src/main/java/org/microg/gms/maps/vtm/BackendMapView.java similarity index 100% rename from play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/BackendMapView.java rename to play-services-maps/core/vtm/src/main/java/org/microg/gms/maps/vtm/BackendMapView.java diff --git a/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/ContainerLayout.java b/play-services-maps/core/vtm/src/main/java/org/microg/gms/maps/vtm/ContainerLayout.java similarity index 100% rename from play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/ContainerLayout.java rename to play-services-maps/core/vtm/src/main/java/org/microg/gms/maps/vtm/ContainerLayout.java diff --git a/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/GmsMapsTypeHelper.java b/play-services-maps/core/vtm/src/main/java/org/microg/gms/maps/vtm/GmsMapsTypeHelper.java similarity index 100% rename from play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/GmsMapsTypeHelper.java rename to play-services-maps/core/vtm/src/main/java/org/microg/gms/maps/vtm/GmsMapsTypeHelper.java diff --git a/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/GoogleMapImpl.java b/play-services-maps/core/vtm/src/main/java/org/microg/gms/maps/vtm/GoogleMapImpl.java similarity index 100% rename from play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/GoogleMapImpl.java rename to play-services-maps/core/vtm/src/main/java/org/microg/gms/maps/vtm/GoogleMapImpl.java diff --git a/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/MapFragmentImpl.java b/play-services-maps/core/vtm/src/main/java/org/microg/gms/maps/vtm/MapFragmentImpl.java similarity index 100% rename from play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/MapFragmentImpl.java rename to play-services-maps/core/vtm/src/main/java/org/microg/gms/maps/vtm/MapFragmentImpl.java diff --git a/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/MapViewImpl.java b/play-services-maps/core/vtm/src/main/java/org/microg/gms/maps/vtm/MapViewImpl.java similarity index 100% rename from play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/MapViewImpl.java rename to play-services-maps/core/vtm/src/main/java/org/microg/gms/maps/vtm/MapViewImpl.java diff --git a/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/ProjectionImpl.java b/play-services-maps/core/vtm/src/main/java/org/microg/gms/maps/vtm/ProjectionImpl.java similarity index 100% rename from play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/ProjectionImpl.java rename to play-services-maps/core/vtm/src/main/java/org/microg/gms/maps/vtm/ProjectionImpl.java diff --git a/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/ResourcesContainer.java b/play-services-maps/core/vtm/src/main/java/org/microg/gms/maps/vtm/ResourcesContainer.java similarity index 100% rename from play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/ResourcesContainer.java rename to play-services-maps/core/vtm/src/main/java/org/microg/gms/maps/vtm/ResourcesContainer.java diff --git a/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/UiSettingsImpl.java b/play-services-maps/core/vtm/src/main/java/org/microg/gms/maps/vtm/UiSettingsImpl.java similarity index 100% rename from play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/UiSettingsImpl.java rename to play-services-maps/core/vtm/src/main/java/org/microg/gms/maps/vtm/UiSettingsImpl.java diff --git a/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/bitmap/AbstractBitmapDescriptor.java b/play-services-maps/core/vtm/src/main/java/org/microg/gms/maps/vtm/bitmap/AbstractBitmapDescriptor.java similarity index 100% rename from play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/bitmap/AbstractBitmapDescriptor.java rename to play-services-maps/core/vtm/src/main/java/org/microg/gms/maps/vtm/bitmap/AbstractBitmapDescriptor.java diff --git a/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/bitmap/AssetBitmapDescriptor.java b/play-services-maps/core/vtm/src/main/java/org/microg/gms/maps/vtm/bitmap/AssetBitmapDescriptor.java similarity index 100% rename from play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/bitmap/AssetBitmapDescriptor.java rename to play-services-maps/core/vtm/src/main/java/org/microg/gms/maps/vtm/bitmap/AssetBitmapDescriptor.java diff --git a/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/bitmap/BitmapBitmapDescriptor.java b/play-services-maps/core/vtm/src/main/java/org/microg/gms/maps/vtm/bitmap/BitmapBitmapDescriptor.java similarity index 100% rename from play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/bitmap/BitmapBitmapDescriptor.java rename to play-services-maps/core/vtm/src/main/java/org/microg/gms/maps/vtm/bitmap/BitmapBitmapDescriptor.java diff --git a/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/bitmap/BitmapDescriptorFactoryImpl.java b/play-services-maps/core/vtm/src/main/java/org/microg/gms/maps/vtm/bitmap/BitmapDescriptorFactoryImpl.java similarity index 100% rename from play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/bitmap/BitmapDescriptorFactoryImpl.java rename to play-services-maps/core/vtm/src/main/java/org/microg/gms/maps/vtm/bitmap/BitmapDescriptorFactoryImpl.java diff --git a/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/bitmap/BitmapDescriptorImpl.java b/play-services-maps/core/vtm/src/main/java/org/microg/gms/maps/vtm/bitmap/BitmapDescriptorImpl.java similarity index 100% rename from play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/bitmap/BitmapDescriptorImpl.java rename to play-services-maps/core/vtm/src/main/java/org/microg/gms/maps/vtm/bitmap/BitmapDescriptorImpl.java diff --git a/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/bitmap/DefaultBitmapDescriptor.java b/play-services-maps/core/vtm/src/main/java/org/microg/gms/maps/vtm/bitmap/DefaultBitmapDescriptor.java similarity index 100% rename from play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/bitmap/DefaultBitmapDescriptor.java rename to play-services-maps/core/vtm/src/main/java/org/microg/gms/maps/vtm/bitmap/DefaultBitmapDescriptor.java diff --git a/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/bitmap/FileBitmapDescriptor.java b/play-services-maps/core/vtm/src/main/java/org/microg/gms/maps/vtm/bitmap/FileBitmapDescriptor.java similarity index 100% rename from play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/bitmap/FileBitmapDescriptor.java rename to play-services-maps/core/vtm/src/main/java/org/microg/gms/maps/vtm/bitmap/FileBitmapDescriptor.java diff --git a/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/bitmap/PathBitmapDescriptor.java b/play-services-maps/core/vtm/src/main/java/org/microg/gms/maps/vtm/bitmap/PathBitmapDescriptor.java similarity index 100% rename from play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/bitmap/PathBitmapDescriptor.java rename to play-services-maps/core/vtm/src/main/java/org/microg/gms/maps/vtm/bitmap/PathBitmapDescriptor.java diff --git a/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/bitmap/ResourceBitmapDescriptor.java b/play-services-maps/core/vtm/src/main/java/org/microg/gms/maps/vtm/bitmap/ResourceBitmapDescriptor.java similarity index 100% rename from play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/bitmap/ResourceBitmapDescriptor.java rename to play-services-maps/core/vtm/src/main/java/org/microg/gms/maps/vtm/bitmap/ResourceBitmapDescriptor.java diff --git a/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/camera/CameraUpdate.java b/play-services-maps/core/vtm/src/main/java/org/microg/gms/maps/vtm/camera/CameraUpdate.java similarity index 100% rename from play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/camera/CameraUpdate.java rename to play-services-maps/core/vtm/src/main/java/org/microg/gms/maps/vtm/camera/CameraUpdate.java diff --git a/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/camera/CameraUpdateFactoryImpl.java b/play-services-maps/core/vtm/src/main/java/org/microg/gms/maps/vtm/camera/CameraUpdateFactoryImpl.java similarity index 100% rename from play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/camera/CameraUpdateFactoryImpl.java rename to play-services-maps/core/vtm/src/main/java/org/microg/gms/maps/vtm/camera/CameraUpdateFactoryImpl.java diff --git a/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/camera/MapPositionCameraUpdate.java b/play-services-maps/core/vtm/src/main/java/org/microg/gms/maps/vtm/camera/MapPositionCameraUpdate.java similarity index 100% rename from play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/camera/MapPositionCameraUpdate.java rename to play-services-maps/core/vtm/src/main/java/org/microg/gms/maps/vtm/camera/MapPositionCameraUpdate.java diff --git a/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/camera/NoCameraUpdate.java b/play-services-maps/core/vtm/src/main/java/org/microg/gms/maps/vtm/camera/NoCameraUpdate.java similarity index 100% rename from play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/camera/NoCameraUpdate.java rename to play-services-maps/core/vtm/src/main/java/org/microg/gms/maps/vtm/camera/NoCameraUpdate.java diff --git a/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/data/SharedTileCache.java b/play-services-maps/core/vtm/src/main/java/org/microg/gms/maps/vtm/data/SharedTileCache.java similarity index 100% rename from play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/data/SharedTileCache.java rename to play-services-maps/core/vtm/src/main/java/org/microg/gms/maps/vtm/data/SharedTileCache.java diff --git a/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/data/SharedTileProvider.java b/play-services-maps/core/vtm/src/main/java/org/microg/gms/maps/vtm/data/SharedTileProvider.java similarity index 100% rename from play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/data/SharedTileProvider.java rename to play-services-maps/core/vtm/src/main/java/org/microg/gms/maps/vtm/data/SharedTileProvider.java diff --git a/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/markup/CircleImpl.java b/play-services-maps/core/vtm/src/main/java/org/microg/gms/maps/vtm/markup/CircleImpl.java similarity index 100% rename from play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/markup/CircleImpl.java rename to play-services-maps/core/vtm/src/main/java/org/microg/gms/maps/vtm/markup/CircleImpl.java diff --git a/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/markup/ClearableVectorLayer.java b/play-services-maps/core/vtm/src/main/java/org/microg/gms/maps/vtm/markup/ClearableVectorLayer.java similarity index 100% rename from play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/markup/ClearableVectorLayer.java rename to play-services-maps/core/vtm/src/main/java/org/microg/gms/maps/vtm/markup/ClearableVectorLayer.java diff --git a/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/markup/DrawableMarkup.java b/play-services-maps/core/vtm/src/main/java/org/microg/gms/maps/vtm/markup/DrawableMarkup.java similarity index 100% rename from play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/markup/DrawableMarkup.java rename to play-services-maps/core/vtm/src/main/java/org/microg/gms/maps/vtm/markup/DrawableMarkup.java diff --git a/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/markup/GroundOverlayImpl.java b/play-services-maps/core/vtm/src/main/java/org/microg/gms/maps/vtm/markup/GroundOverlayImpl.java similarity index 100% rename from play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/markup/GroundOverlayImpl.java rename to play-services-maps/core/vtm/src/main/java/org/microg/gms/maps/vtm/markup/GroundOverlayImpl.java diff --git a/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/markup/InfoWindow.java b/play-services-maps/core/vtm/src/main/java/org/microg/gms/maps/vtm/markup/InfoWindow.java similarity index 100% rename from play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/markup/InfoWindow.java rename to play-services-maps/core/vtm/src/main/java/org/microg/gms/maps/vtm/markup/InfoWindow.java diff --git a/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/markup/MarkerImpl.java b/play-services-maps/core/vtm/src/main/java/org/microg/gms/maps/vtm/markup/MarkerImpl.java similarity index 100% rename from play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/markup/MarkerImpl.java rename to play-services-maps/core/vtm/src/main/java/org/microg/gms/maps/vtm/markup/MarkerImpl.java diff --git a/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/markup/MarkerItemMarkup.java b/play-services-maps/core/vtm/src/main/java/org/microg/gms/maps/vtm/markup/MarkerItemMarkup.java similarity index 100% rename from play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/markup/MarkerItemMarkup.java rename to play-services-maps/core/vtm/src/main/java/org/microg/gms/maps/vtm/markup/MarkerItemMarkup.java diff --git a/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/markup/Markup.java b/play-services-maps/core/vtm/src/main/java/org/microg/gms/maps/vtm/markup/Markup.java similarity index 100% rename from play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/markup/Markup.java rename to play-services-maps/core/vtm/src/main/java/org/microg/gms/maps/vtm/markup/Markup.java diff --git a/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/markup/PolygonImpl.java b/play-services-maps/core/vtm/src/main/java/org/microg/gms/maps/vtm/markup/PolygonImpl.java similarity index 100% rename from play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/markup/PolygonImpl.java rename to play-services-maps/core/vtm/src/main/java/org/microg/gms/maps/vtm/markup/PolygonImpl.java diff --git a/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/markup/PolylineImpl.java b/play-services-maps/core/vtm/src/main/java/org/microg/gms/maps/vtm/markup/PolylineImpl.java similarity index 100% rename from play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/markup/PolylineImpl.java rename to play-services-maps/core/vtm/src/main/java/org/microg/gms/maps/vtm/markup/PolylineImpl.java diff --git a/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/markup/TileOverlayImpl.java b/play-services-maps/core/vtm/src/main/java/org/microg/gms/maps/vtm/markup/TileOverlayImpl.java similarity index 100% rename from play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/markup/TileOverlayImpl.java rename to play-services-maps/core/vtm/src/main/java/org/microg/gms/maps/vtm/markup/TileOverlayImpl.java diff --git a/play-services-maps-core-vtm/src/main/res/drawable/maps_default_marker.png b/play-services-maps/core/vtm/src/main/res/drawable/maps_default_marker.png similarity index 100% rename from play-services-maps-core-vtm/src/main/res/drawable/maps_default_marker.png rename to play-services-maps/core/vtm/src/main/res/drawable/maps_default_marker.png diff --git a/play-services-maps-core-vtm/src/main/res/drawable/maps_default_window.9.png b/play-services-maps/core/vtm/src/main/res/drawable/maps_default_window.9.png similarity index 100% rename from play-services-maps-core-vtm/src/main/res/drawable/maps_default_window.9.png rename to play-services-maps/core/vtm/src/main/res/drawable/maps_default_window.9.png diff --git a/play-services-maps-core-vtm/src/main/res/drawable/nop.png b/play-services-maps/core/vtm/src/main/res/drawable/nop.png similarity index 100% rename from play-services-maps-core-vtm/src/main/res/drawable/nop.png rename to play-services-maps/core/vtm/src/main/res/drawable/nop.png diff --git a/play-services-nearby/core/package/build.gradle b/play-services-nearby/core/package/build.gradle new file mode 100644 index 0000000000..6902e87b8e --- /dev/null +++ b/play-services-nearby/core/package/build.gradle @@ -0,0 +1,47 @@ +/* + * SPDX-FileCopyrightText: 2023 microG Project Team + * SPDX-License-Identifier: Apache-2.0 + */ + +apply plugin: 'com.android.library' +apply plugin: 'kotlin-android' + +dependencies { + implementation project(':play-services-base-core') + implementation project(':play-services-nearby-core') + implementation "androidx.navigation:navigation-fragment-ktx:$navigationVersion" + implementation "androidx.navigation:navigation-ui-ktx:$navigationVersion" + implementation "androidx.preference:preference:$preferenceVersion" +} + +android { + namespace "org.microg.gms.nearby.core.pkg" + + compileSdkVersion androidCompileSdk + buildToolsVersion "$androidBuildVersionTools" + + defaultConfig { + versionName version + minSdkVersion androidMinSdk + targetSdkVersion androidTargetSdk + } + + sourceSets { + main { + java.srcDirs = ['src/main/kotlin'] + } + } + + lintOptions { + disable 'MissingTranslation' + } + + compileOptions { + sourceCompatibility = 1.8 + targetCompatibility = 1.8 + } + + kotlinOptions { + jvmTarget = 1.8 + } +} diff --git a/play-services-core/src/withNearby/AndroidManifest.xml b/play-services-nearby/core/package/src/main/AndroidManifest.xml similarity index 73% rename from play-services-core/src/withNearby/AndroidManifest.xml rename to play-services-nearby/core/package/src/main/AndroidManifest.xml index 2c5b572f9f..4a226e637e 100644 --- a/play-services-core/src/withNearby/AndroidManifest.xml +++ b/play-services-nearby/core/package/src/main/AndroidManifest.xml @@ -1,5 +1,5 @@ @@ -9,11 +9,18 @@ - + + - + + + + + \ No newline at end of file diff --git a/play-services-nearby/core/package/src/main/kotlin/org/microg/gms/nearby/exposurenotification/ui/ExposureNotificationsSettingsProvider.kt b/play-services-nearby/core/package/src/main/kotlin/org/microg/gms/nearby/exposurenotification/ui/ExposureNotificationsSettingsProvider.kt new file mode 100644 index 0000000000..fefc85e78e --- /dev/null +++ b/play-services-nearby/core/package/src/main/kotlin/org/microg/gms/nearby/exposurenotification/ui/ExposureNotificationsSettingsProvider.kt @@ -0,0 +1,65 @@ +/* + * SPDX-FileCopyrightText: 2023 microG Project Team + * SPDX-License-Identifier: Apache-2.0 + */ + +package org.microg.gms.nearby.exposurenotification.ui + +import android.content.Context +import android.content.Intent +import android.net.Uri +import android.os.Build.VERSION.SDK_INT +import androidx.annotation.Keep +import androidx.appcompat.content.res.AppCompatResources +import androidx.navigation.NavController +import com.google.android.gms.nearby.exposurenotification.ExposureNotificationClient +import org.microg.gms.ui.settings.SettingsProvider +import org.microg.gms.nearby.core.R +import org.microg.gms.nearby.exposurenotification.ExposureDatabase +import org.microg.gms.nearby.exposurenotification.ExposurePreferences +import org.microg.gms.ui.settings.SettingsProvider.Companion.Entry +import org.microg.gms.ui.settings.SettingsProvider.Companion.Group.OTHER + +@Keep +object ExposureNotificationsSettingsProvider : SettingsProvider { + override fun getEntriesStatic(context: Context): List { + if (SDK_INT < 21) return emptyList() + if (!ExposurePreferences(context).enabled) return emptyList() + return getEntries(context) + } + + override suspend fun getEntriesDynamic(context: Context): List { + if (SDK_INT < 21) return emptyList() + if (!ExposurePreferences(context).enabled) { + if (ExposureDatabase.with(context) { it.isEmpty }) { + return emptyList() + } + } + return getEntries(context) + } + + private fun getEntries(context: Context) = listOf( + Entry( + key = "pref_exposure", + group = OTHER, + navigationId = R.id.exposureNotificationsFragment, + title = context.getString(R.string.service_name_exposure), + summary = if (ExposurePreferences(context).enabled) { + context.getString(org.microg.gms.base.core.R.string.service_status_enabled_short) + } else { + context.getString(org.microg.gms.base.core.R.string.service_status_disabled_short) + }, + icon = AppCompatResources.getDrawable(context, R.drawable.ic_virus_outline) + ) + ) + + override fun preProcessSettingsIntent(intent: Intent) { + if (ExposureNotificationClient.ACTION_EXPOSURE_NOTIFICATION_SETTINGS == intent.action && intent.data == null) { + intent.data = Uri.parse("x-gms-settings://exposure-notifications") + } + } + + override fun extendNavigation(navController: NavController) { + navController.graph.addAll(navController.navInflater.inflate(R.navigation.nav_nearby)) + } +} \ No newline at end of file diff --git a/play-services-nearby/core/src/main/AndroidManifest.xml b/play-services-nearby/core/src/main/AndroidManifest.xml index d1cbd73896..9f215f0125 100644 --- a/play-services-nearby/core/src/main/AndroidManifest.xml +++ b/play-services-nearby/core/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - - diff --git a/play-services-nearby/core/src/main/kotlin/org/microg/gms/nearby/exposurenotification/ExposureDatabase.kt b/play-services-nearby/core/src/main/kotlin/org/microg/gms/nearby/exposurenotification/ExposureDatabase.kt index 6c3407513a..567d92c64b 100644 --- a/play-services-nearby/core/src/main/kotlin/org/microg/gms/nearby/exposurenotification/ExposureDatabase.kt +++ b/play-services-nearby/core/src/main/kotlin/org/microg/gms/nearby/exposurenotification/ExposureDatabase.kt @@ -9,10 +9,12 @@ import android.annotation.TargetApi import android.content.ContentValues import android.content.Context import android.content.Intent +import android.database.DatabaseUtils import android.database.sqlite.SQLiteCursor import android.database.sqlite.SQLiteDatabase import android.database.sqlite.SQLiteDatabase.CONFLICT_IGNORE import android.database.sqlite.SQLiteOpenHelper +import android.database.sqlite.SQLiteQueryBuilder import android.net.Uri import android.os.Parcel import android.os.Parcelable @@ -154,6 +156,9 @@ class ExposureDatabase private constructor(private val context: Context) : SQLit val appLogEntries = delete(TABLE_APP_LOG, "timestamp < ?", longArrayOf(rollingStartTime)) Log.d(TAG, "Deleted on daily cleanup: $appLogEntries applogs") if (start + MAX_DELETE_TIME < System.currentTimeMillis()) return@run false + val tokens = delete(TABLE_TOKENS, "timestamp < ?", longArrayOf(rollingStartTime)) + Log.d(TAG, "Deleted on daily cleanup: $tokens tokens") + if (start + MAX_DELETE_TIME < System.currentTimeMillis()) return@run false val temporaryExposureKeys = delete(TABLE_TEK, "(rollingStartNumber + rollingPeriod) < ?", longArrayOf(rollingStartTime / ROLLING_WINDOW_LENGTH_MS)) Log.d(TAG, "Deleted on daily cleanup: $temporaryExposureKeys teks") if (start + MAX_DELETE_TIME < System.currentTimeMillis()) return@run false @@ -735,6 +740,15 @@ class ExposureDatabase private constructor(private val context: Context) : SQLit } } + val isEmpty: Boolean + get() = readableDatabase.run { + Log.d(TAG, "${DatabaseUtils.queryNumEntries(this, TABLE_ADVERTISEMENTS)}, ${DatabaseUtils.queryNumEntries(this, TABLE_APP_LOG)}, ${DatabaseUtils.queryNumEntries(this, TABLE_TEK)}, ${DatabaseUtils.queryNumEntries(this, TABLE_TOKENS)}") + DatabaseUtils.queryNumEntries(this, TABLE_ADVERTISEMENTS) == 0L && + DatabaseUtils.queryNumEntries(this, TABLE_APP_LOG) == 0L && + DatabaseUtils.queryNumEntries(this, TABLE_TEK) == 0L && + DatabaseUtils.queryNumEntries(this, TABLE_TOKENS) == 0L + } + fun countMethodCalls(packageName: String, method: String): Int = readableDatabase.run { query(TABLE_APP_LOG, arrayOf("COUNT(*)"), "package = ? AND method = ? AND timestamp > ?", arrayOf(packageName, method, (System.currentTimeMillis() - TimeUnit.DAYS.toMillis(KEEP_DAYS.toLong())).toString()), null, null, null, null).use { cursor -> if (cursor.moveToNext()) { diff --git a/settings.gradle b/settings.gradle index 2bd138391b..0e18cf05b5 100644 --- a/settings.gradle +++ b/settings.gradle @@ -75,10 +75,11 @@ sublude ':play-services-location:core' sublude ':play-services-location:core:base' sublude ':play-services-location:core:provider' sublude ':play-services-location:core:system-api' -include ':play-services-maps-core-mapbox' -include ':play-services-maps-core-vtm' -include ':play-services-maps-core-vtm:vtm-microg-theme' +sublude ':play-services-maps:core:mapbox' +sublude ':play-services-maps:core:vtm' +sublude ':play-services-maps:core:vtm:microg-theme' sublude ':play-services-nearby:core' +sublude ':play-services-nearby:core:package' sublude ':play-services-oss-licenses:core' sublude ':play-services-pay:core' sublude ':play-services-safetynet:core'