diff --git a/android/res/drawable-hdpi/img_news_3d_buildings.png b/android/res/drawable-hdpi/img_news_3d_buildings.png new file mode 100644 index 0000000000..010fd4aaf5 Binary files /dev/null and b/android/res/drawable-hdpi/img_news_3d_buildings.png differ diff --git a/android/res/drawable-hdpi/img_news_p2p.png b/android/res/drawable-hdpi/img_news_p2p.png deleted file mode 100644 index 017882c29c..0000000000 Binary files a/android/res/drawable-hdpi/img_news_p2p.png and /dev/null differ diff --git a/android/res/drawable-hdpi/img_news_tts.png b/android/res/drawable-hdpi/img_news_tts.png deleted file mode 100644 index 7134362647..0000000000 Binary files a/android/res/drawable-hdpi/img_news_tts.png and /dev/null differ diff --git a/android/res/drawable-mdpi/img_news_3d_buildings.png b/android/res/drawable-mdpi/img_news_3d_buildings.png new file mode 100644 index 0000000000..7a8bae8d7e Binary files /dev/null and b/android/res/drawable-mdpi/img_news_3d_buildings.png differ diff --git a/android/res/drawable-mdpi/img_news_p2p.png b/android/res/drawable-mdpi/img_news_p2p.png deleted file mode 100644 index 9425c94b86..0000000000 Binary files a/android/res/drawable-mdpi/img_news_p2p.png and /dev/null differ diff --git a/android/res/drawable-mdpi/img_news_tts.png b/android/res/drawable-mdpi/img_news_tts.png deleted file mode 100644 index 2a05920080..0000000000 Binary files a/android/res/drawable-mdpi/img_news_tts.png and /dev/null differ diff --git a/android/res/drawable-xhdpi/img_news_3d_buildings.png b/android/res/drawable-xhdpi/img_news_3d_buildings.png new file mode 100644 index 0000000000..ccc3a244a3 Binary files /dev/null and b/android/res/drawable-xhdpi/img_news_3d_buildings.png differ diff --git a/android/res/drawable-xhdpi/img_news_p2p.png b/android/res/drawable-xhdpi/img_news_p2p.png deleted file mode 100644 index 7122f9876c..0000000000 Binary files a/android/res/drawable-xhdpi/img_news_p2p.png and /dev/null differ diff --git a/android/res/drawable-xhdpi/img_news_tts.png b/android/res/drawable-xhdpi/img_news_tts.png deleted file mode 100644 index 284e0c2502..0000000000 Binary files a/android/res/drawable-xhdpi/img_news_tts.png and /dev/null differ diff --git a/android/res/drawable-xxhdpi/img_news_3d_buildings.png b/android/res/drawable-xxhdpi/img_news_3d_buildings.png new file mode 100644 index 0000000000..55e27462f1 Binary files /dev/null and b/android/res/drawable-xxhdpi/img_news_3d_buildings.png differ diff --git a/android/res/drawable-xxhdpi/img_news_p2p.png b/android/res/drawable-xxhdpi/img_news_p2p.png deleted file mode 100644 index 054dcd5dc8..0000000000 Binary files a/android/res/drawable-xxhdpi/img_news_p2p.png and /dev/null differ diff --git a/android/res/drawable-xxhdpi/img_news_tts.png b/android/res/drawable-xxhdpi/img_news_tts.png deleted file mode 100644 index 45769d79dd..0000000000 Binary files a/android/res/drawable-xxhdpi/img_news_tts.png and /dev/null differ diff --git a/android/res/drawable-xxxhdpi/img_news_3d_buildings.png b/android/res/drawable-xxxhdpi/img_news_3d_buildings.png new file mode 100644 index 0000000000..739ea5bf21 Binary files /dev/null and b/android/res/drawable-xxxhdpi/img_news_3d_buildings.png differ diff --git a/android/res/drawable-xxxhdpi/img_news_p2p.png b/android/res/drawable-xxxhdpi/img_news_p2p.png deleted file mode 100644 index 6e520298f0..0000000000 Binary files a/android/res/drawable-xxxhdpi/img_news_p2p.png and /dev/null differ diff --git a/android/res/drawable-xxxhdpi/img_news_tts.png b/android/res/drawable-xxxhdpi/img_news_tts.png deleted file mode 100644 index f1c69226e1..0000000000 Binary files a/android/res/drawable-xxxhdpi/img_news_tts.png and /dev/null differ diff --git a/android/res/layout/news_page.xml b/android/res/layout/news_page.xml index 31a1b2c116..ce47a1e404 100644 --- a/android/res/layout/news_page.xml +++ b/android/res/layout/news_page.xml @@ -43,10 +43,9 @@ android:id="@+id/subtitle" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="@dimen/margin_base_plus" android:layout_marginLeft="@dimen/margin_base" android:layout_marginRight="@dimen/margin_base" - android:textAppearance="@style/MwmTextAppearance.Body2" + android:textAppearance="@style/MwmTextAppearance.Body1" android:layout_gravity="center_horizontal" android:gravity="center_horizontal" tools:text="@string/whats_new_3d_subtitle"/> @@ -79,7 +78,7 @@ android:id="@+id/switch_subtitle" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textAppearance="@style/MwmTextAppearance.Body2" + android:textAppearance="@style/MwmTextAppearance.Body3" android:singleLine="true" tools:text="Switch block subtitle"/> diff --git a/android/res/values/arrays.xml b/android/res/values/arrays.xml index 95667fe955..2250e17788 100644 --- a/android/res/values/arrays.xml +++ b/android/res/values/arrays.xml @@ -42,8 +42,9 @@ - @drawable/img_news_tts - @drawable/img_news_p2p + @drawable/img_news_3d_buildings + + @drawable/img_news_3d_buildings @@ -57,12 +58,12 @@ - @string/whats_new_3d_switch_title - @string/whats_new_3d_buildings_switch_title + @string/pref_map_3d_title + @string/pref_map_3d_buildings_title - @string/whats_new_3d_switch_subtitle - @string/whats_new_3d_buildings_switch_subtitle + + @string/pref_map_3d_buildings_subtitle \ No newline at end of file diff --git a/android/res/xml-v21/prefs_map.xml b/android/res/xml-v21/prefs_map.xml index 2169ab7e4e..b7581a8a89 100644 --- a/android/res/xml-v21/prefs_map.xml +++ b/android/res/xml-v21/prefs_map.xml @@ -33,14 +33,15 @@ diff --git a/android/res/xml/prefs_map.xml b/android/res/xml/prefs_map.xml index 2d4a162dfc..b8dae0d081 100644 --- a/android/res/xml/prefs_map.xml +++ b/android/res/xml/prefs_map.xml @@ -31,12 +31,13 @@