diff options
Diffstat (limited to 'platform/android/MapboxGLAndroidSDK/src/main/res')
9 files changed, 13 insertions, 22 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/color/mapbox_material_bg_selector.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/color/mapbox_material_bg_selector.xml deleted file mode 100644 index 4c733ed112..0000000000 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/color/mapbox_material_bg_selector.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<selector xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:color="?attr/colorPrimaryDark" android:state_pressed="true" /> - <item android:color="?attr/colorPrimary" /> -</selector> diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/mapbox_infowindow_icon_bg.9.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/mapbox_infowindow_icon_bg.9.png Binary files differdeleted file mode 100644 index 584b320299..0000000000 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/mapbox_infowindow_icon_bg.9.png +++ /dev/null diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/layout/mapbox_attribution_list_item.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/layout/mapbox_attribution_list_item.xml index 763bb118e0..f275860d59 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/layout/mapbox_attribution_list_item.xml +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/layout/mapbox_attribution_list_item.xml @@ -9,5 +9,6 @@ android:paddingLeft="24dp" android:paddingRight="24dp" android:textAllCaps="true" + android:textIsSelectable="false" android:textAppearance="?android:attr/textAppearanceButton" android:textColor="@color/mapbox_blue"/> diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/layout/mapbox_infowindow_content.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/layout/mapbox_infowindow_content.xml index 26c974dc0d..3a35396257 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/layout/mapbox_infowindow_content.xml +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/layout/mapbox_infowindow_content.xml @@ -23,6 +23,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="2dp" + android:textIsSelectable="false" android:maxEms="17" android:textColor="@android:color/black" android:textSize="18sp" @@ -34,13 +35,13 @@ android:layout_height="wrap_content" android:layout_marginBottom="2dp" android:layout_marginTop="2dp" + android:textIsSelectable="false" android:lineSpacingExtra="1dp" android:maxEms="17" android:textColor="@color/mapbox_gray" android:textSize="14sp"/> <TextView - android:id="@+id/infowindow_subdescription" android:layout_width="wrap_content" android:layout_height="wrap_content" android:maxEms="17" diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/layout/mapbox_mapview_internal.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/layout/mapbox_mapview_internal.xml index 6d07de7baa..df7ccaaca9 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/layout/mapbox_mapview_internal.xml +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/layout/mapbox_mapview_internal.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <merge xmlns:android="http://schemas.android.com/apk/res/android"> - <SurfaceView + <android.opengl.GLSurfaceView android:id="@+id/surfaceView" android:layout_width="match_parent" android:layout_height="match_parent" @@ -28,6 +28,7 @@ android:contentDescription="@string/mapbox_compassContentDescription"/> <ImageView + android:visibility="gone" android:id="@+id/logoView" android:layout_width="wrap_content" android:layout_height="wrap_content" @@ -35,6 +36,7 @@ android:src="@drawable/mapbox_logo_icon"/> <ImageView + android:visibility="gone" android:id="@+id/attributionView" android:layout_width="wrap_content" android:layout_height="wrap_content" diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/layout/mapbox_view_image_marker.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/layout/mapbox_view_image_marker.xml index 7e4a079063..51eb46e1d5 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/layout/mapbox_view_image_marker.xml +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/layout/mapbox_view_image_marker.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <ImageView xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/image" - android:layout_width="wrap_content" - android:layout_height="wrap_content" /> + android:id="@+id/image" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:contentDescription="@null"/> diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/values/attrs.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/values/attrs.xml index e17f01d075..b673224094 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/values/attrs.xml +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/values/attrs.xml @@ -40,6 +40,7 @@ <attr name="mapbox_myLocationBackgroundMarginBottom" format="dimension"/> <attr name="mapbox_myLocationAccuracyTintColor" format="color"/> <attr name="mapbox_myLocationAccuracyAlpha" format="integer"/> + <attr name="mapbox_myLocationAccuracyThreshold" format="float"/> <!--Compass--> <attr name="mapbox_uiCompass" format="boolean"/> @@ -113,8 +114,8 @@ <attr name="mapbox_uiAttributionMarginBottom" format="dimension"/> <attr name="mapbox_uiAttributionTintColor" format="color"/> - <!-- Deprecated to use TextureView--> - <attr name="mapbox_renderTextureMode" format="boolean"/> + <attr name="mapbox_enableTilePrefetch" format="boolean"/> + <attr name="mapbox_enableZMediaOverlay" format="boolean"/> </declare-styleable> diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/values/colors.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/values/colors.xml index 69ab7568bb..b51c890e5c 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/values/colors.xml +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/values/colors.xml @@ -2,5 +2,4 @@ <resources> <color name="mapbox_gray">#7D7F80</color> <color name="mapbox_blue">#1E8CAB</color> - <color name="mapbox_my_location_ring">@color/mapbox_blue</color> </resources> diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/values/dimens.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/values/dimens.xml index 8edbd47c29..1c6a265587 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/values/dimens.xml +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/values/dimens.xml @@ -2,17 +2,8 @@ <resources> <dimen name="mapbox_infowindow_tipview_width">8dp</dimen> <dimen name="mapbox_infowindow_margin">8dp</dimen> - <dimen name="mapbox_infowindow_offset">-2dp</dimen> - <dimen name="mapbox_infowindow_line_width">1.5dp</dimen> - <dimen name="mapbox_attribution_icon_left_padding">@dimen/mapbox_two_dp</dimen> - <dimen name="mapbox_attribution_icon_top_padding">@dimen/mapbox_two_dp</dimen> - <dimen name="mapbox_attribution_icon_right_padding">@dimen/mapbox_two_dp</dimen> - <dimen name="mapbox_attribution_icon_bottom_padding">@dimen/mapbox_two_dp</dimen> - <dimen name="mapbox_two_dp">2dp</dimen> <dimen name="mapbox_four_dp">4dp</dimen> <dimen name="mapbox_eight_dp">8dp</dimen> - <dimen name="mapbox_ten_dp">10dp</dimen> - <dimen name="mapbox_sixteen_dp">16dp</dimen> <dimen name="mapbox_ninety_two_dp">92dp</dimen> <dimen name="mapbox_my_locationview_outer_circle">18dp</dimen> </resources> |
