diff options
author | Cameron Mace <cameron@mapbox.com> | 2016-10-21 10:29:12 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-10-21 10:29:12 -0400 |
commit | da9864f25d03cc8cda4df0cb7e675f3abca2a67b (patch) | |
tree | 4a75b934d742d57a41f78111ba1f4d40b6efc3ff /platform/android/MapboxGLAndroidSDK/src/main/res | |
parent | 7bbd49c72c0daa7036a575a49f6cf13bf8a7020e (diff) | |
download | qtlocation-mapboxgl-da9864f25d03cc8cda4df0cb7e675f3abca2a67b.tar.gz |
Made telemetry dialog material (#6726)
* Made telemetry dialog material
* cleaned up attribution_main_menu
Diffstat (limited to 'platform/android/MapboxGLAndroidSDK/src/main/res')
5 files changed, 12 insertions, 36 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/layout/attribution_list_item.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/layout/attribution_list_item.xml index 1252fb194f..763bb118e0 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/layout/attribution_list_item.xml +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/layout/attribution_list_item.xml @@ -1,11 +1,13 @@ <?xml version="1.0" encoding="utf-8"?> -<TextView xmlns:android="http://schemas.android.com/apk/res/android" +<TextView + xmlns:android="http://schemas.android.com/apk/res/android" android:id="@android:id/text1" android:layout_width="match_parent" android:layout_height="wrap_content" android:gravity="center_vertical" android:minHeight="?android:attr/listPreferredItemHeightSmall" - android:paddingLeft="16dp" - android:paddingRight="16dp" - android:textAppearance="?android:attr/textAppearanceListItemSmall" - android:textColor="@android:color/white" /> + android:paddingLeft="24dp" + android:paddingRight="24dp" + android:textAllCaps="true" + android:textAppearance="?android:attr/textAppearanceButton" + android:textColor="@color/mapbox_blue"/> 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 deleted file mode 100644 index b4d2326833..0000000000 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/layout/attribution_telemetry_view.xml +++ /dev/null @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<LinearLayout - xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:orientation="vertical" - > - - <TextView - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:text="@string/attributionTelemetryMessage" - android:gravity="center_horizontal"/> - - <ListView - android:id="@+id/telemetryOptionsList" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - /> - -</LinearLayout> diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/values/arrays.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/values/arrays.xml index d5d26d09d2..bb466880aa 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/values/arrays.xml +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/values/arrays.xml @@ -6,16 +6,6 @@ <item>Improve this map</item> <item>Telemetry Settings</item> </array> - <array name="attribution_telemetry_options"> - <item>Tell Me More</item> - <item>Don\'t Participate</item> - <item>Participate</item> - </array> - <array name="attribution_telemetry_options_already_participating"> - <item>Tell Me More</item> - <item>Stop Participating</item> - <item>Keep Participating</item> - </array> <!-- If editing this array update MapView.ATTRIBUTION_INDEX_IMPROVE_THIS_MAP --> <array name="attribution_links" formatted="false" translatable="false"> <item>https://www.mapbox.com/about/maps/</item> diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/values/strings.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/values/strings.xml index 687b85b2d8..c8bb9d65ba 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/values/strings.xml +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/values/strings.xml @@ -5,6 +5,9 @@ <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="attributionTelemetryPositive">Agree</string> + <string name="attributionTelemetryNegative">Disagree</string> + <string name="attributionTelemetryNeutral">More info</string> <string name="mapboxIconContentDescription">The Mapbox logo.</string> <string name="infoWindowTitle">Title</string> <string name="infoWindowDescription">Description</string> diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/values/styles.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/values/styles.xml index a46f58ae80..708cfc72e9 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/values/styles.xml +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/values/styles.xml @@ -6,4 +6,6 @@ <item name="android:textColorPrimary">@android:color/white</item> </style> + <style name="TelemAlertDialogStyle" parent="Theme.AppCompat.Light.Dialog.Alert"/> + </resources>
\ No newline at end of file |