Merge branch 'master' into drawer

2014-10-27 15:39:08 +02:00 · 2014-10-27 15:39:08 +02:00 · a919fd77b2
commit a919fd77b2
parent 9d62458459 8841865bd0
19 changed files with 1 additions and 1 deletions
--- a/OsmAnd/res/drawable-hdpi/ic_Flat_list_dark.png
+++ b/OsmAnd/res/drawable-hdpi/ic_Flat_list_dark.png
--- a/OsmAnd/res/drawable-hdpi/ic_Flat_list_white.png
+++ b/OsmAnd/res/drawable-hdpi/ic_Flat_list_white.png
--- a/OsmAnd/res/drawable-hdpi/ic_Tree_list_dark.png
+++ b/OsmAnd/res/drawable-hdpi/ic_Tree_list_dark.png
--- a/OsmAnd/res/drawable-hdpi/ic_Tree_list_white.png
+++ b/OsmAnd/res/drawable-hdpi/ic_Tree_list_white.png
--- a/OsmAnd/res/drawable-hdpi/ic_sort_waypoint_dark.png
+++ b/OsmAnd/res/drawable-hdpi/ic_sort_waypoint_dark.png
--- a/OsmAnd/res/drawable-hdpi/ic_sort_waypoint_white.png
+++ b/OsmAnd/res/drawable-hdpi/ic_sort_waypoint_white.png
--- a/OsmAnd/res/drawable-xhdpi/ic_Flat_list_dark.png
+++ b/OsmAnd/res/drawable-xhdpi/ic_Flat_list_dark.png
--- a/OsmAnd/res/drawable-xhdpi/ic_Flat_list_white.png
+++ b/OsmAnd/res/drawable-xhdpi/ic_Flat_list_white.png
--- a/OsmAnd/res/drawable-xhdpi/ic_Tree_list_dark.png
+++ b/OsmAnd/res/drawable-xhdpi/ic_Tree_list_dark.png
--- a/OsmAnd/res/drawable-xhdpi/ic_Tree_list_white.png
+++ b/OsmAnd/res/drawable-xhdpi/ic_Tree_list_white.png
--- a/OsmAnd/res/drawable-xhdpi/ic_sort_waypoint_dark.png
+++ b/OsmAnd/res/drawable-xhdpi/ic_sort_waypoint_dark.png
--- a/OsmAnd/res/drawable-xhdpi/ic_sort_waypoint_white.png
+++ b/OsmAnd/res/drawable-xhdpi/ic_sort_waypoint_white.png
--- a/OsmAnd/res/drawable-xxhdpi/ic_Flat_list_dark.png
+++ b/OsmAnd/res/drawable-xxhdpi/ic_Flat_list_dark.png
--- a/OsmAnd/res/drawable-xxhdpi/ic_Flat_list_white.png
+++ b/OsmAnd/res/drawable-xxhdpi/ic_Flat_list_white.png
--- a/OsmAnd/res/drawable-xxhdpi/ic_Tree_list_dark.png
+++ b/OsmAnd/res/drawable-xxhdpi/ic_Tree_list_dark.png
--- a/OsmAnd/res/drawable-xxhdpi/ic_Tree_list_white.png
+++ b/OsmAnd/res/drawable-xxhdpi/ic_Tree_list_white.png
--- a/OsmAnd/res/drawable-xxhdpi/ic_sort_waypoint_dark.png
+++ b/OsmAnd/res/drawable-xxhdpi/ic_sort_waypoint_dark.png
--- a/OsmAnd/res/drawable-xxhdpi/ic_sort_waypoint_white.png
+++ b/OsmAnd/res/drawable-xxhdpi/ic_sort_waypoint_white.png
--- a/OsmAnd/res/layout/main.xml
+++ b/OsmAnd/res/layout/main.xml
@ -42,7 +42,7 @@

    <ListView
        android:id="@+id/left_drawer"
-        android:layout_width="fill_parent"
+        android:layout_width="320dp"
        android:layout_height="match_parent"
        android:layout_gravity="start"
        android:choiceMode="singleChoice"