From fd1427cf7d5da6329f526badc670c8d0b20ca1a4 Mon Sep 17 00:00:00 2001
From: langsmith <langstonlmcs@gmail.com>
Date: Fri, 7 Jun 2019 13:12:03 -0700
Subject: [PATCH] adjusted ExpressionIntegrationActivity strings and layout
 file name

---
 .../examples/dds/ExpressionIntegrationActivity.java             | 2 +-
 ...nge.xml => activity_dds_multiple_expression_integration.xml} | 0
 MapboxAndroidDemo/src/main/res/values/descriptions_strings.xml  | 2 +-
 MapboxAndroidDemo/src/main/res/values/titles_strings.xml        | 2 +-
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename MapboxAndroidDemo/src/main/res/layout/{activity_dds_temperature_change.xml => activity_dds_multiple_expression_integration.xml} (100%)

diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/dds/ExpressionIntegrationActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/dds/ExpressionIntegrationActivity.java
index cadffa7ac..50d898bf5 100644
--- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/dds/ExpressionIntegrationActivity.java
+++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/dds/ExpressionIntegrationActivity.java
@@ -113,7 +113,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
     Mapbox.getInstance(this, getString(R.string.access_token));
 
     // This contains the MapView in XML and needs to be called after the access token is configured.
-    setContentView(R.layout.activity_dds_temperature_change);
+    setContentView(R.layout.activity_dds_multiple_expression_integration);
 
     unitsFab = findViewById(R.id.change_units_fab);
 
diff --git a/MapboxAndroidDemo/src/main/res/layout/activity_dds_temperature_change.xml b/MapboxAndroidDemo/src/main/res/layout/activity_dds_multiple_expression_integration.xml
similarity index 100%
rename from MapboxAndroidDemo/src/main/res/layout/activity_dds_temperature_change.xml
rename to MapboxAndroidDemo/src/main/res/layout/activity_dds_multiple_expression_integration.xml
diff --git a/MapboxAndroidDemo/src/main/res/values/descriptions_strings.xml b/MapboxAndroidDemo/src/main/res/values/descriptions_strings.xml
index 0e71365f5..e264d7b51 100644
--- a/MapboxAndroidDemo/src/main/res/values/descriptions_strings.xml
+++ b/MapboxAndroidDemo/src/main/res/values/descriptions_strings.xml
@@ -53,7 +53,7 @@
     <string name="activity_dds_multiple_geometries_description">Filter and draw multiple geometries from a single GeoJSON file.</string>
     <string name="activity_dds_bathymetry_description">Use data-driven styling to show bathymetry (water depth) data</string>
     <string name="activity_dds_info_window_symbol_layer_description">Use SymbolLayer and icons to show data in a BubbleLayout "info window".</string>
-    <string name="activity_dds_expression_integration_description">Use multiple expressions to visualize unit change in data.</string>
+    <string name="activity_dds_expression_integration_description">Use multiple expressions to convert and visualize data.</string>
     <string name="activity_dds_satellite_land_select_description">View satellite photos and click to outline an area of land.</string>
     <string name="activity_dds_symbol_zoom_switch_description">Change SymbolLayer icons based on the camera\'s zoom level.</string>
     <string name="activity_annotation_marker_description">Create a default marker with an InfoWindow.</string>
diff --git a/MapboxAndroidDemo/src/main/res/values/titles_strings.xml b/MapboxAndroidDemo/src/main/res/values/titles_strings.xml
index f05d22232..50998e243 100644
--- a/MapboxAndroidDemo/src/main/res/values/titles_strings.xml
+++ b/MapboxAndroidDemo/src/main/res/values/titles_strings.xml
@@ -52,7 +52,7 @@
     <string name="activity_dds_bathymetry_title">Display water depth</string>
     <string name="activity_dds_info_window_symbol_layer_title">Symbol layer info window</string>
     <string name="activity_dds_image_clustering_title">SymbolLayer clustering</string>
-    <string name="activity_dds_expression_integration_title">Temperature change</string>
+    <string name="activity_dds_expression_integration_title">Multiple expressions</string>
     <string name="activity_dds_satellite_land_select_title">Satellite land select</string>
     <string name="activity_dds_line_gradient_title">Line gradient</string>
     <string name="activity_dds_symbol_zoom_switch_title">Zoom-based icon switch</string>