diff --git a/android/res/drawable-v21/menu_button_right.xml b/android/res/drawable-v21/menu_button_right.xml deleted file mode 100644 index 200c32466f..0000000000 --- a/android/res/drawable-v21/menu_button_right.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/android/res/drawable/bottom_sheet_handle.xml b/android/res/drawable/bottom_sheet_handle.xml new file mode 100644 index 0000000000..4018125665 --- /dev/null +++ b/android/res/drawable/bottom_sheet_handle.xml @@ -0,0 +1,6 @@ + + + + + diff --git a/android/res/drawable/ic_menu_close.xml b/android/res/drawable/ic_menu_close.xml deleted file mode 100644 index 56f97bd469..0000000000 --- a/android/res/drawable/ic_menu_close.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/android/res/drawable/menu_button_right.xml b/android/res/drawable/menu_button_right.xml deleted file mode 100644 index 7f6bd90201..0000000000 --- a/android/res/drawable/menu_button_right.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/android/res/layout-land/layout_nav.xml b/android/res/layout-land/layout_nav.xml new file mode 100644 index 0000000000..7f1c6fbb89 --- /dev/null +++ b/android/res/layout-land/layout_nav.xml @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + diff --git a/android/res/layout-land/layout_nav_bottom_numbers.xml b/android/res/layout-land/layout_nav_bottom_numbers.xml deleted file mode 100644 index 4865cf5f39..0000000000 --- a/android/res/layout-land/layout_nav_bottom_numbers.xml +++ /dev/null @@ -1,148 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/android/res/layout-land/layout_nav_search.xml b/android/res/layout-land/layout_nav_search.xml index a5971a6efa..f42a08c569 100644 --- a/android/res/layout-land/layout_nav_search.xml +++ b/android/res/layout-land/layout_nav_search.xml @@ -6,7 +6,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:theme="?navButtonsTheme" - android:layout_marginBottom="@dimen/nav_menu_height" + android:layout_marginBottom="@dimen/nav_numbers_height" android:padding="@dimen/nav_frame_padding" android:layoutDirection="ltr" tools:background="@color/bg_primary"> diff --git a/android/res/layout-land/map_navigation_buttons.xml b/android/res/layout-land/map_navigation_buttons.xml index 187b5bdaf4..f0d5ccdc10 100644 --- a/android/res/layout-land/map_navigation_buttons.xml +++ b/android/res/layout-land/map_navigation_buttons.xml @@ -4,7 +4,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - android:layout_marginBottom="@dimen/nav_menu_height" + android:layout_marginBottom="@dimen/menu_line_height" android:layoutDirection="ltr" android:padding="@dimen/nav_frame_padding" android:theme="?navButtonsTheme"> diff --git a/android/res/layout/activity_map.xml b/android/res/layout/activity_map.xml index e4bf79969f..249bab0cde 100644 --- a/android/res/layout/activity_map.xml +++ b/android/res/layout/activity_map.xml @@ -55,7 +55,6 @@ android:visibility="invisible"/> + + + + + \ No newline at end of file diff --git a/android/res/layout/layout_nav.xml b/android/res/layout/layout_nav.xml index 0e79aad621..5b28d2ec59 100644 --- a/android/res/layout/layout_nav.xml +++ b/android/res/layout/layout_nav.xml @@ -1,13 +1,38 @@ - + android:layout_height="match_parent"> - + + + + + + + + + + + + - diff --git a/android/res/layout/layout_nav_bottom.xml b/android/res/layout/layout_nav_bottom.xml index fd93930ebe..2e08ad8aa7 100644 --- a/android/res/layout/layout_nav_bottom.xml +++ b/android/res/layout/layout_nav_bottom.xml @@ -1,105 +1,77 @@ - - - - - - - - + android:clickable="true" + android:focusable="true"> + + + + + + - - - - + android:src="@drawable/ic_voice_on" />