diff options
| author | Tobrun <tobrun@mapbox.com> | 2017-12-19 08:55:48 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-19 08:55:48 +0100 |
| commit | 757cc0f2be1c0972f9b74a91ed873fe8a892f27f (patch) | |
| tree | 1e7bcbdebc6a3d24fbcef56f32eca2323be4fc12 /platform/android/MapboxGLAndroidSDKTestApp/src/main/res | |
| parent | 9759ba78367cea366ad28057d47725a37170c9f3 (diff) | |
| download | qtlocation-mapboxgl-757cc0f2be1c0972f9b74a91ed873fe8a892f27f.tar.gz | |
[android] - add binding integration for expressions (#10654)
Diffstat (limited to 'platform/android/MapboxGLAndroidSDKTestApp/src/main/res')
3 files changed, 17 insertions, 0 deletions
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_data_driven_style.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_data_driven_style.xml index 7454ce5860..2cbe20b47f 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_data_driven_style.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_data_driven_style.xml @@ -9,4 +9,16 @@ android:layout_width="match_parent" android:layout_height="match_parent"/> + <TextView + android:id="@+id/textZoom" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentBottom="true" + android:layout_alignParentEnd="true" + android:layout_alignParentRight="true" + android:layout_gravity="bottom|start" + android:layout_margin="8dp" + android:textIsSelectable="true" + android:textSize="14sp"/> + </RelativeLayout> diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_generator_symbol.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_generator_symbol.xml index 168361a263..613bdd21ef 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_generator_symbol.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_generator_symbol.xml @@ -5,4 +5,8 @@ android:id="@+id/menu_action_icon_overlap" android:title="@string/menuitem_change_icon_overlap" app:showAsAction="never"/> + <item + android:id="@+id/menu_action_filter" + android:title="@string/menuitem_filter" + app:showAsAction="never"/> </menu> diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/actions.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/actions.xml index 5c0828ab74..e7d140d7d4 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/actions.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/actions.xml @@ -11,6 +11,7 @@ <string name="menuitem_title_change_location_source_mock">Change to mock location source</string> <string name="menuitem_title_change_location_source_null">Reset location source to null</string> <string name="menuitem_change_icon_overlap">Toggle icon overlap</string> + <string name="menuitem_filter">Filter layer</string> <string name="menuitem_change_location">Change location</string> <string name="menuitem_title_accelerate_decelerate">Accelerate/Decelerate interpolator</string> <string name="menuitem_title_bounce">Bounce interpolator</string> |