diff options
author | Pablo Guardiola <guardiola31337@gmail.com> | 2017-08-07 16:24:29 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-08-07 16:24:29 +0200 |
commit | 7f3523a9df9a15aaaf6d69de10476249889467c3 (patch) | |
tree | b5e717661d9526776dd086a26146c4a964517ed5 /platform | |
parent | d7b5a298d49dea1616f0d2deedd80d34356140b4 (diff) | |
download | qtlocation-mapboxgl-7f3523a9df9a15aaaf6d69de10476249889467c3.tar.gz |
[android] make text not selectable to fix infowindow issues caused because selectable text consumes the click event (#9717)
Diffstat (limited to 'platform')
8 files changed, 10 insertions, 10 deletions
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 648946e8ce..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,6 +9,6 @@ android:paddingLeft="24dp" android:paddingRight="24dp" android:textAllCaps="true" - android:textIsSelectable="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 027f3690d5..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,7 +23,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="2dp" - android:textIsSelectable="true" + android:textIsSelectable="false" android:maxEms="17" android:textColor="@android:color/black" android:textSize="18sp" @@ -35,7 +35,7 @@ android:layout_height="wrap_content" android:layout_marginBottom="2dp" android:layout_marginTop="2dp" - android:textIsSelectable="true" + android:textIsSelectable="false" android:lineSpacingExtra="1dp" android:maxEms="17" android:textColor="@color/mapbox_gray" diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_debug_mode.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_debug_mode.xml index 56fe909c45..0a98f7727f 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_debug_mode.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_debug_mode.xml @@ -21,7 +21,7 @@ android:layout_height="wrap_content" android:layout_gravity="bottom|start" android:layout_margin="8dp" - android:textIsSelectable="true" + android:textIsSelectable="false" android:textSize="14sp"/> <android.support.design.widget.FloatingActionButton diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_marker_bulk.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_marker_bulk.xml index 357d50132b..52691a26fe 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_marker_bulk.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_marker_bulk.xml @@ -17,7 +17,7 @@ <TextView android:id="@+id/countView" - android:textIsSelectable="true" + android:textIsSelectable="false" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_below="@id/toolbar" diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_marker_view.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_marker_view.xml index abc51698aa..dae3a1d9b7 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_marker_view.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_marker_view.xml @@ -10,7 +10,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:layout_below="@id/toolbar" - android:textIsSelectable="true" + android:textIsSelectable="false" app:mapbox_cameraTargetLat="38.907192" app:mapbox_cameraTargetLng="-77.036871" app:mapbox_cameraZoom="12" @@ -18,7 +18,7 @@ <TextView android:id="@+id/countView" - android:textIsSelectable="true" + android:textIsSelectable="false" android:layout_width="wrap_content" android:layout_height="wrap_content" android:padding="16dp" diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/section_main_layout.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/section_main_layout.xml index 54ae113840..afec1f3bea 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/section_main_layout.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/section_main_layout.xml @@ -18,7 +18,7 @@ android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginStart="16dp" - android:textIsSelectable="true" + android:textIsSelectable="false" android:layout_marginTop="16dp" android:alpha="0.54" android:background="@android:color/transparent" diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/view_custom_marker.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/view_custom_marker.xml index 3b941d5603..cafa7d9746 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/view_custom_marker.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/view_custom_marker.xml @@ -15,7 +15,7 @@ android:layout_height="wrap_content" android:layout_centerInParent="true" android:padding="2dp" - android:textIsSelectable="true" + android:textIsSelectable="false" android:textColor="@android:color/white" android:textStyle="bold"/> diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/view_text_marker.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/view_text_marker.xml index a8d93f51be..1ef2c69012 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/view_text_marker.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/view_text_marker.xml @@ -11,7 +11,7 @@ android:layout_height="wrap_content" android:textStyle="bold" android:padding="4dp" - android:textIsSelectable="true" + android:textIsSelectable="false" android:layout_centerInParent="true" /> </RelativeLayout> |