diff options
| author | Tobrun <tobrun.van.nuland@gmail.com> | 2015-10-25 10:22:12 +0100 |
|---|---|---|
| committer | Tobrun <tobrun.van.nuland@gmail.com> | 2015-10-25 10:22:12 +0100 |
| commit | 8ca818f1ced7f5ad13aeb184974c9f0875d6ac1a (patch) | |
| tree | ec51e3f8a504bd2073f1cab7578aabff4dd57b1d /android | |
| parent | a48a5ee16130457b90a823b36604c2d3c8d8483b (diff) | |
| download | qtlocation-mapboxgl-8ca818f1ced7f5ad13aeb184974c9f0875d6ac1a.tar.gz | |
[android] #2523 - fix toolbar alignment issue
Diffstat (limited to 'android')
7 files changed, 7 insertions, 14 deletions
diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_infowindow.xml b/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_infowindow.xml index b84f05143d..c2c3210589 100644 --- a/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_infowindow.xml +++ b/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_infowindow.xml @@ -8,9 +8,8 @@ <android.support.v7.widget.Toolbar android:id="@+id/toolbar" android:layout_width="match_parent" - android:layout_height="wrap_content" + android:layout_height="?attr/actionBarSize" android:background="@color/primary" - android:minHeight="?attr/actionBarSize" android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" /> <com.mapbox.mapboxsdk.views.MapView diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_infowindow_adapter.xml b/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_infowindow_adapter.xml index 371219cb5d..aee7834aaa 100644 --- a/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_infowindow_adapter.xml +++ b/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_infowindow_adapter.xml @@ -8,9 +8,8 @@ <android.support.v7.widget.Toolbar android:id="@+id/toolbar" android:layout_width="match_parent" - android:layout_height="wrap_content" + android:layout_height="?attr/actionBarSize" android:background="@color/primary" - android:minHeight="?attr/actionBarSize" android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" /> <com.mapbox.mapboxsdk.views.MapView diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_main.xml b/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_main.xml index b97fb4fcae..d788a2fc63 100644 --- a/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_main.xml +++ b/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_main.xml @@ -15,9 +15,8 @@ <android.support.v7.widget.Toolbar android:id="@+id/toolbar" android:layout_width="match_parent" - android:layout_height="wrap_content" + android:layout_height="?attr/actionBarSize" android:background="@color/primary" - android:minHeight="?attr/actionBarSize" android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"/> <FrameLayout diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_map_fragment.xml b/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_map_fragment.xml index 77afd256a2..ce516f6a1b 100644 --- a/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_map_fragment.xml +++ b/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_map_fragment.xml @@ -9,9 +9,8 @@ <android.support.v7.widget.Toolbar android:id="@+id/toolbar" android:layout_width="match_parent" - android:layout_height="wrap_content" + android:layout_height="?attr/actionBarSize" android:background="@color/primary" - android:minHeight="?attr/actionBarSize" android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" /> <FrameLayout diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_marker_bulk.xml b/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_marker_bulk.xml index 40216524e0..24dfe110af 100644 --- a/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_marker_bulk.xml +++ b/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_marker_bulk.xml @@ -8,9 +8,8 @@ <android.support.v7.widget.Toolbar android:id="@+id/toolbar" android:layout_width="match_parent" - android:layout_height="wrap_content" + android:layout_height="?attr/actionBarSize" android:background="@color/primary" - android:minHeight="?attr/actionBarSize" android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" /> <com.mapbox.mapboxsdk.views.MapView diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_press_for_marker.xml b/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_press_for_marker.xml index 8dfa1943c9..39ff128c69 100644 --- a/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_press_for_marker.xml +++ b/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_press_for_marker.xml @@ -8,9 +8,8 @@ <android.support.v7.widget.Toolbar android:id="@+id/secondToolBar" android:layout_width="match_parent" - android:layout_height="wrap_content" + android:layout_height="?attr/actionBarSize" android:background="@color/primary" - android:minHeight="?attr/actionBarSize" android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" /> </LinearLayout> diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_visible_bounds.xml b/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_visible_bounds.xml index 5b5d5d2fa0..15796bac40 100644 --- a/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_visible_bounds.xml +++ b/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_visible_bounds.xml @@ -7,9 +7,8 @@ <android.support.v7.widget.Toolbar android:id="@+id/toolbar" android:layout_width="match_parent" - android:layout_height="wrap_content" + android:layout_height="?attr/actionBarSize" android:background="@color/primary" - android:minHeight="?attr/actionBarSize" android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" /> <com.mapbox.mapboxsdk.views.MapView |