diff options
author | Tobrun <tobrun@mapbox.com> | 2017-08-01 15:25:07 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-08-01 15:25:07 +0200 |
commit | de46df21a7c630e5b4d658adee2288bb8f3882aa (patch) | |
tree | 104304207115394cd50b11e9686fa69e1a566b88 | |
parent | 11b8f2dcb23bc076a8e6f939de458d001f79eeeb (diff) | |
download | qtlocation-mapboxgl-de46df21a7c630e5b4d658adee2288bb8f3882aa.tar.gz |
[android] - remove preview image integration (#9657)
6 files changed, 1 insertions, 70 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java index 766e2a051d..5745717324 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java @@ -108,8 +108,7 @@ public class MapView extends FrameLayout { private void initialise(@NonNull final Context context, @NonNull final MapboxMapOptions options) { if (isInEditMode()) { - // in IDE, show preview map - LayoutInflater.from(context).inflate(R.layout.mapbox_mapview_preview, this); + // in IDE layout editor, just return return; } mapboxMapOptions = options; diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-nodpi/mapbox_mapview_preview.jpg b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-nodpi/mapbox_mapview_preview.jpg Binary files differdeleted file mode 100644 index 3a21fc08bc..0000000000 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-nodpi/mapbox_mapview_preview.jpg +++ /dev/null diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-v21/mapbox_default_bg_selector.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-v21/mapbox_default_bg_selector.xml deleted file mode 100644 index 2fd6815c23..0000000000 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-v21/mapbox_default_bg_selector.xml +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<ripple xmlns:android="http://schemas.android.com/apk/res/android" - android:color="?android:colorControlHighlight"> - <item android:id="@android:id/mask"> - <shape android:shape="oval"> - <solid android:color="@android:color/white" /> - </shape> - </item> -</ripple> diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_default_bg_selector.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_default_bg_selector.xml deleted file mode 100644 index 3efe48615b..0000000000 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_default_bg_selector.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<selector xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:drawable="@color/mapbox_gray_light" android:state_pressed="true" /> - <item android:drawable="@color/mapbox_gray_light" android:state_focused="true" /> - <item android:drawable="@android:color/transparent" /> -</selector> diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/layout/mapbox_mapview_preview.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/layout/mapbox_mapview_preview.xml deleted file mode 100644 index 1c1ab0e71b..0000000000 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/layout/mapbox_mapview_preview.xml +++ /dev/null @@ -1,52 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical"> - - <ImageView - android:layout_width="match_parent" - android:layout_height="match_parent" - android:scaleType="centerCrop" - android:contentDescription="@null" - android:src="@drawable/mapbox_mapview_preview" - android:layout_alignParentTop="true" - android:layout_alignParentLeft="true" - android:layout_alignParentStart="true"/> - - <ImageView - android:id="@id/logoView" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentBottom="true" - android:layout_alignParentLeft="true" - android:layout_alignParentStart="true" - android:layout_marginBottom="@dimen/mapbox_four_dp" - android:layout_marginLeft="@dimen/mapbox_four_dp" - android:layout_marginStart="@dimen/mapbox_four_dp" - android:contentDescription="@null" - android:src="@drawable/mapbox_logo_icon"/> - - <ImageView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentBottom="true" - android:layout_toEndOf="@+id/logoView" - android:contentDescription="@null" - android:layout_marginBottom="@dimen/mapbox_four_dp" - android:background="@drawable/mapbox_default_bg_selector" - android:src="@drawable/mapbox_info_bg_selector" - android:layout_marginLeft="@dimen/mapbox_four_dp" - android:layout_marginStart="@dimen/mapbox_four_dp" - android:layout_toRightOf="@+id/logoView"/> - - <ImageView - android:layout_width="48dp" - android:layout_height="48dp" - android:layout_alignParentEnd="true" - android:layout_alignParentRight="true" - android:layout_margin="10dp" - android:contentDescription="@null" - android:src="@drawable/mapbox_compass_icon"/> - -</RelativeLayout> diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/values/colors.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/values/colors.xml index 68e70e948e..b51c890e5c 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/values/colors.xml +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/values/colors.xml @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <resources> <color name="mapbox_gray">#7D7F80</color> - <color name="mapbox_gray_light">#EEEEEE</color> <color name="mapbox_blue">#1E8CAB</color> </resources> |