Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
8ca692af42
3 changed files with 4 additions and 3 deletions
|
@ -71,10 +71,10 @@
|
||||||
android:layout_gravity="center"
|
android:layout_gravity="center"
|
||||||
android:layout_marginLeft="12dp"
|
android:layout_marginLeft="12dp"
|
||||||
android:background="@null"
|
android:background="@null"
|
||||||
android:drawableLeft="@drawable/ic_action_search_dark"
|
tools:drawableLeft="@drawable/ic_action_search_dark"
|
||||||
android:drawablePadding="12dp"
|
android:drawablePadding="12dp"
|
||||||
android:gravity="center_vertical"
|
android:gravity="center_vertical"
|
||||||
android:hint="Enter country name"
|
android:hint="@string/enter_country_name"
|
||||||
android:textSize="@dimen/default_list_text_size"/>
|
android:textSize="@dimen/default_list_text_size"/>
|
||||||
|
|
||||||
</android.support.v7.widget.CardView>
|
</android.support.v7.widget.CardView>
|
||||||
|
|
|
@ -75,7 +75,7 @@
|
||||||
tools:drawableLeft="@drawable/ic_action_search_dark"
|
tools:drawableLeft="@drawable/ic_action_search_dark"
|
||||||
android:drawablePadding="12dp"
|
android:drawablePadding="12dp"
|
||||||
android:gravity="center_vertical"
|
android:gravity="center_vertical"
|
||||||
android:hint="Enter country name"
|
android:hint="@string/enter_country_name"
|
||||||
android:textSize="@dimen/default_list_text_size"/>
|
android:textSize="@dimen/default_list_text_size"/>
|
||||||
|
|
||||||
</android.support.v7.widget.CardView>
|
</android.support.v7.widget.CardView>
|
||||||
|
|
|
@ -2031,4 +2031,5 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
|
||||||
<string name="hello_blank_fragment">Hello blank fragment</string>
|
<string name="hello_blank_fragment">Hello blank fragment</string>
|
||||||
<string name="application_dir_description">Choose where you want to save map files.</string>
|
<string name="application_dir_description">Choose where you want to save map files.</string>
|
||||||
<string name="show_on_start_description">\'Off\' directly launches map screen</string>
|
<string name="show_on_start_description">\'Off\' directly launches map screen</string>
|
||||||
|
<string name="enter_country_name">Enter country name</string>
|
||||||
</resources>
|
</resources>
|
||||||
|
|
Loading…
Reference in a new issue