Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2015-12-16 18:33:21 +01:00
commit 29522abb2d

View file

@ -7,26 +7,8 @@
android:layout_height="wrap_content"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<net.osmand.plus.widgets.TextViewEx
android:id="@+id/onOffTextView"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
tools:text="@string/shared_string_on"
app:textAllCapsCompat="true"/>
<android.support.v7.widget.SwitchCompat
android:id="@+id/liveUpdatesSwitch"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
/>
</LinearLayout>
<!--
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -138,11 +120,26 @@
</LinearLayout>
</LinearLayout>
<TextView
</LinearLayout> -->
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Available maps"/>
android:layout_margin="15dp"
android:orientation="horizontal">
<net.osmand.plus.widgets.TextViewEx
android:id="@+id/onOffTextView"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
tools:text="@string/shared_string_on"
app:textAllCapsCompat="true"/>
<android.support.v7.widget.SwitchCompat
android:id="@+id/liveUpdatesSwitch"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
/>
</LinearLayout>
</LinearLayout>