diff options
author | Tobrun <tobrun@mapbox.com> | 2016-02-17 09:21:31 +0100 |
---|---|---|
committer | Tobrun <tobrun@mapbox.com> | 2016-02-17 09:57:57 +0100 |
commit | a331e94b1b8d7fcdffe7ef757f4f4c56c9307e8e (patch) | |
tree | 125de6ac893edfbd57d9ba703368cbeef11aeca6 /platform/android/MapboxGLAndroidSDK/src/main/res | |
parent | 94c5c2e203efb906e86b8d4d4f416647736b2d76 (diff) | |
download | qtlocation-mapboxgl-a331e94b1b8d7fcdffe7ef757f4f4c56c9307e8e.tar.gz |
[androd] #3119 - use resourcePrefix for library resources
Diffstat (limited to 'platform/android/MapboxGLAndroidSDK/src/main/res')
4 files changed, 21 insertions, 21 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/layout/attribution_telemetry_view.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/layout/attribution_telemetry_view.xml index b4d2326833..04c47af90d 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/layout/attribution_telemetry_view.xml +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/layout/attribution_telemetry_view.xml @@ -9,7 +9,7 @@ <TextView android:layout_width="fill_parent" android:layout_height="wrap_content" - android:text="@string/attributionTelemetryMessage" + android:text="@string/mapbox_attributionTelemetryMessage" android:gravity="center_horizontal"/> <ListView diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/layout/infowindow_content.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/layout/infowindow_content.xml index 3e36cbf91a..a4fcc80681 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/layout/infowindow_content.xml +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/layout/infowindow_content.xml @@ -18,7 +18,7 @@ android:layout_height="wrap_content" android:layout_marginBottom="2dp" android:maxEms="17" - android:text="@string/infoWindowTitle" + android:text="@string/mapbox_infoWindowTitle" android:textColor="@color/black" android:textSize="18sp" android:textStyle="bold" /> @@ -31,7 +31,7 @@ android:layout_marginTop="2dp" android:lineSpacingExtra="1dp" android:maxEms="17" - android:text="@string/infoWindowDescription" + android:text="@string/mapbox_infoWindowDescription" android:textColor="@color/gray" android:textSize="14sp" /> @@ -40,7 +40,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:maxEms="17" - android:text="@string/infoWindowAddress" + android:text="@string/mapbox_infoWindowAddress" android:textColor="@color/black" android:textSize="12sp" android:visibility="gone" /> diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/layout/mapview_internal.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/layout/mapview_internal.xml index d62fd9cfba..408a028d17 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/layout/mapview_internal.xml +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/layout/mapview_internal.xml @@ -15,7 +15,7 @@ android:id="@+id/logoView" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:contentDescription="@string/mapboxIconContentDescription" + android:contentDescription="@string/mapbox_mapboxIconContentDescription" android:src="@drawable/attribution_logo" /> <ImageView @@ -24,7 +24,7 @@ android:layout_height="wrap_content" android:adjustViewBounds="true" android:clickable="true" - android:contentDescription="@string/attributionsIconContentDescription" + android:contentDescription="@string/mapbox_attributionsIconContentDescription" android:padding="7dp" android:src="@drawable/ic_info_outline_24dp_selector" android:background="@drawable/bg_default_selector"/> diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/values/strings.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/values/strings.xml index 1f3cd8c4e3..f852c305b2 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/values/strings.xml +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/values/strings.xml @@ -1,20 +1,20 @@ <?xml version="1.0" encoding="utf-8"?> <resources> - <string name="compassContentDescription">Map compass. Click to reset the map rotation to North.</string> - <string name="attributionsIconContentDescription">Attribution icon. Click to show attribution dialog.</string> - <string name="attributionsDialogTitle">Mapbox Android SDK</string> - <string name="attributionTelemetryTitle">Make Mapbox Maps Better</string> - <string name="attributionTelemetryMessage">You are helping to make OpenStreetMap and Mapbox maps better by contributing anonymous usage data.</string> - <string name="mapboxIconContentDescription">The Mapbox logo.</string> - <string name="infoWindowTitle">Title</string> - <string name="infoWindowDescription">Description</string> - <string name="infoWindowAddress">Address</string> + <string name="mapbox_compassContentDescription">Map compass. Click to reset the map rotation to North.</string> + <string name="mapbox_attributionsIconContentDescription">Attribution icon. Click to show attribution dialog.</string> + <string name="mapbox_attributionsDialogTitle">Mapbox Android SDK</string> + <string name="mapbox_attributionTelemetryTitle">Make Mapbox Maps Better</string> + <string name="mapbox_attributionTelemetryMessage">You are helping to make OpenStreetMap and Mapbox maps better by contributing anonymous usage data.</string> + <string name="mapbox_mapboxIconContentDescription">The Mapbox logo.</string> + <string name="mapbox_infoWindowTitle">Title</string> + <string name="mapbox_infoWindowDescription">Description</string> + <string name="mapbox_infoWindowAddress">Address</string> <!-- these are public --> - <string name="style_mapbox_streets">mapbox://styles/mapbox/streets-v8</string> - <string name="style_emerald">mapbox://styles/mapbox/emerald-v8</string> - <string name="style_light">mapbox://styles/mapbox/light-v8</string> - <string name="style_dark">mapbox://styles/mapbox/dark-v8</string> - <string name="style_satellite">mapbox://styles/mapbox/satellite-v8</string> - <string name="style_satellite_streets">mapbox://styles/mapbox/satellite-hybrid-v8</string> + <string name="mapbox_style_mapbox_streets">mapbox://styles/mapbox/streets-v8</string> + <string name="mapbox_style_emerald">mapbox://styles/mapbox/emerald-v8</string> + <string name="mapbox_style_light">mapbox://styles/mapbox/light-v8</string> + <string name="mapbox_style_dark">mapbox://styles/mapbox/dark-v8</string> + <string name="mapbox_style_satellite">mapbox://styles/mapbox/satellite-v8</string> + <string name="mapbox_style_satellite_streets">mapbox://styles/mapbox/satellite-hybrid-v8</string> </resources> |