Merge branch 'design' of https://github.com/osmandapp/Osmand into design

This commit is contained in:
Denis 2014-11-13 13:27:05 +02:00
commit 135e0a10f4
25 changed files with 6 additions and 6 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.5 KiB

View file

@ -27,17 +27,17 @@
android:layout_height="90dp"> android:layout_height="90dp">
<Button android:id="@+id/poi" <Button android:id="@+id/poi"
android:text="@string/poi" android:text="@string/poi"
android:drawableTop="@drawable/ic_action_info_light" android:drawableTop="@drawable/ic_action_info2"
style="@style/DashboardSearchButton"/> style="@style/DashboardSearchButton"/>
<Button android:id="@+id/address" <Button android:id="@+id/address"
android:text="@string/address" android:text="@string/address"
android:layout_marginRight="1dp" android:layout_marginRight="1dp"
android:layout_marginLeft="1dp" android:layout_marginLeft="1dp"
android:drawableTop="@drawable/ic_action_home_light" android:drawableTop="@drawable/ic_action_home2"
style="@style/DashboardSearchButton"/> style="@style/DashboardSearchButton"/>
<Button android:id="@+id/coord" <Button android:id="@+id/coord"
android:text="@string/coordinates" android:text="@string/coordinates"
android:drawableTop="@drawable/ic_action_marker_light" android:drawableTop="@drawable/ic_action_marker2"
style="@style/DashboardSearchButton"/> style="@style/DashboardSearchButton"/>
</LinearLayout> </LinearLayout>
<LinearLayout android:orientation="horizontal" <LinearLayout android:orientation="horizontal"
@ -46,17 +46,17 @@
android:layout_height="90dp"> android:layout_height="90dp">
<Button android:id="@+id/fav_btn" <Button android:id="@+id/fav_btn"
android:text="@string/my_favorites" android:text="@string/my_favorites"
android:drawableTop="@drawable/ic_action_fav_light" android:drawableTop="@drawable/ic_action_fav2"
style="@style/DashboardSearchButton"/> style="@style/DashboardSearchButton"/>
<Button android:id="@+id/history" <Button android:id="@+id/history"
android:text="@string/history" android:text="@string/history"
android:drawableTop="@drawable/ic_action_fav_light" android:drawableTop="@drawable/ic_action_history2"
android:layout_marginRight="1dp" android:layout_marginRight="1dp"
android:layout_marginLeft="1dp" android:layout_marginLeft="1dp"
style="@style/DashboardSearchButton"/> style="@style/DashboardSearchButton"/>
<Button android:id="@+id/transport" <Button android:id="@+id/transport"
android:text="@string/rendering_category_transport" android:text="@string/rendering_category_transport"
android:drawableTop="@drawable/ic_action_bus_light" android:drawableTop="@drawable/ic_action_bus2"
style="@style/DashboardSearchButton"/> style="@style/DashboardSearchButton"/>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>