diff --git a/android/res/drawable-hdpi/bg_place_page_back.9.png b/android/res/drawable-hdpi/bg_place_page_back.9.png deleted file mode 100644 index e99daf49fb..0000000000 Binary files a/android/res/drawable-hdpi/bg_place_page_back.9.png and /dev/null differ diff --git a/android/res/drawable-hdpi/bg_place_page_back_night.9.png b/android/res/drawable-hdpi/bg_place_page_back_night.9.png deleted file mode 100644 index f262103a3b..0000000000 Binary files a/android/res/drawable-hdpi/bg_place_page_back_night.9.png and /dev/null differ diff --git a/android/res/drawable-hdpi/bg_place_page_head_closed.9.png b/android/res/drawable-hdpi/bg_place_page_head_closed.9.png new file mode 100644 index 0000000000..d2a960d292 Binary files /dev/null and b/android/res/drawable-hdpi/bg_place_page_head_closed.9.png differ diff --git a/android/res/drawable-hdpi/bg_place_page_head_closed_night.9.png b/android/res/drawable-hdpi/bg_place_page_head_closed_night.9.png new file mode 100644 index 0000000000..e70f57d379 Binary files /dev/null and b/android/res/drawable-hdpi/bg_place_page_head_closed_night.9.png differ diff --git a/android/res/drawable-hdpi/bg_place_page_head_open.9.png b/android/res/drawable-hdpi/bg_place_page_head_open.9.png new file mode 100644 index 0000000000..7938785da2 Binary files /dev/null and b/android/res/drawable-hdpi/bg_place_page_head_open.9.png differ diff --git a/android/res/drawable-hdpi/bg_place_page_head_open_night.9.png b/android/res/drawable-hdpi/bg_place_page_head_open_night.9.png new file mode 100644 index 0000000000..5271d29370 Binary files /dev/null and b/android/res/drawable-hdpi/bg_place_page_head_open_night.9.png differ diff --git a/android/res/drawable-mdpi/bg_place_page_back.9.png b/android/res/drawable-mdpi/bg_place_page_back.9.png deleted file mode 100644 index 1aa10b62d3..0000000000 Binary files a/android/res/drawable-mdpi/bg_place_page_back.9.png and /dev/null differ diff --git a/android/res/drawable-mdpi/bg_place_page_back_night.9.png b/android/res/drawable-mdpi/bg_place_page_back_night.9.png deleted file mode 100644 index f7b7e5b129..0000000000 Binary files a/android/res/drawable-mdpi/bg_place_page_back_night.9.png and /dev/null differ diff --git a/android/res/drawable-mdpi/bg_place_page_head_closed.9.png b/android/res/drawable-mdpi/bg_place_page_head_closed.9.png new file mode 100644 index 0000000000..01b77d1025 Binary files /dev/null and b/android/res/drawable-mdpi/bg_place_page_head_closed.9.png differ diff --git a/android/res/drawable-mdpi/bg_place_page_head_closed_night.9.png b/android/res/drawable-mdpi/bg_place_page_head_closed_night.9.png new file mode 100644 index 0000000000..28c21ab203 Binary files /dev/null and b/android/res/drawable-mdpi/bg_place_page_head_closed_night.9.png differ diff --git a/android/res/drawable-mdpi/bg_place_page_head_open.9.png b/android/res/drawable-mdpi/bg_place_page_head_open.9.png new file mode 100644 index 0000000000..f7aa91eac8 Binary files /dev/null and b/android/res/drawable-mdpi/bg_place_page_head_open.9.png differ diff --git a/android/res/drawable-mdpi/bg_place_page_head_open_night.9.png b/android/res/drawable-mdpi/bg_place_page_head_open_night.9.png new file mode 100644 index 0000000000..68e3d9f213 Binary files /dev/null and b/android/res/drawable-mdpi/bg_place_page_head_open_night.9.png differ diff --git a/android/res/drawable-xhdpi/bg_place_page_back.9.png b/android/res/drawable-xhdpi/bg_place_page_back.9.png deleted file mode 100644 index f5cce8ea99..0000000000 Binary files a/android/res/drawable-xhdpi/bg_place_page_back.9.png and /dev/null differ diff --git a/android/res/drawable-xhdpi/bg_place_page_back_night.9.png b/android/res/drawable-xhdpi/bg_place_page_back_night.9.png deleted file mode 100644 index dd758168db..0000000000 Binary files a/android/res/drawable-xhdpi/bg_place_page_back_night.9.png and /dev/null differ diff --git a/android/res/drawable-xhdpi/bg_place_page_head_closed.9.png b/android/res/drawable-xhdpi/bg_place_page_head_closed.9.png new file mode 100644 index 0000000000..2f3c0edf62 Binary files /dev/null and b/android/res/drawable-xhdpi/bg_place_page_head_closed.9.png differ diff --git a/android/res/drawable-xhdpi/bg_place_page_head_closed_night.9.png b/android/res/drawable-xhdpi/bg_place_page_head_closed_night.9.png new file mode 100644 index 0000000000..402c483e2e Binary files /dev/null and b/android/res/drawable-xhdpi/bg_place_page_head_closed_night.9.png differ diff --git a/android/res/drawable-xhdpi/bg_place_page_head_open.9.png b/android/res/drawable-xhdpi/bg_place_page_head_open.9.png new file mode 100644 index 0000000000..4b7d38c9f8 Binary files /dev/null and b/android/res/drawable-xhdpi/bg_place_page_head_open.9.png differ diff --git a/android/res/drawable-xhdpi/bg_place_page_head_open_night.9.png b/android/res/drawable-xhdpi/bg_place_page_head_open_night.9.png new file mode 100644 index 0000000000..b70589bb05 Binary files /dev/null and b/android/res/drawable-xhdpi/bg_place_page_head_open_night.9.png differ diff --git a/android/res/drawable-xxhdpi/bg_place_page_back.9.png b/android/res/drawable-xxhdpi/bg_place_page_back.9.png deleted file mode 100644 index 086fbbefeb..0000000000 Binary files a/android/res/drawable-xxhdpi/bg_place_page_back.9.png and /dev/null differ diff --git a/android/res/drawable-xxhdpi/bg_place_page_back_night.9.png b/android/res/drawable-xxhdpi/bg_place_page_back_night.9.png deleted file mode 100644 index ff84285fea..0000000000 Binary files a/android/res/drawable-xxhdpi/bg_place_page_back_night.9.png and /dev/null differ diff --git a/android/res/drawable-xxhdpi/bg_place_page_head_closed.9.png b/android/res/drawable-xxhdpi/bg_place_page_head_closed.9.png new file mode 100644 index 0000000000..c8b8a9c443 Binary files /dev/null and b/android/res/drawable-xxhdpi/bg_place_page_head_closed.9.png differ diff --git a/android/res/drawable-xxhdpi/bg_place_page_head_closed_night.9.png b/android/res/drawable-xxhdpi/bg_place_page_head_closed_night.9.png new file mode 100644 index 0000000000..f65d6b8bdc Binary files /dev/null and b/android/res/drawable-xxhdpi/bg_place_page_head_closed_night.9.png differ diff --git a/android/res/drawable-xxhdpi/bg_place_page_head_open.9.png b/android/res/drawable-xxhdpi/bg_place_page_head_open.9.png new file mode 100644 index 0000000000..eb3495b912 Binary files /dev/null and b/android/res/drawable-xxhdpi/bg_place_page_head_open.9.png differ diff --git a/android/res/drawable-xxhdpi/bg_place_page_head_open_night.9.png b/android/res/drawable-xxhdpi/bg_place_page_head_open_night.9.png new file mode 100644 index 0000000000..b170968a1d Binary files /dev/null and b/android/res/drawable-xxhdpi/bg_place_page_head_open_night.9.png differ diff --git a/android/res/drawable-xxxhdpi/bg_place_page_back.9.png b/android/res/drawable-xxxhdpi/bg_place_page_back.9.png deleted file mode 100644 index 9359a2fea2..0000000000 Binary files a/android/res/drawable-xxxhdpi/bg_place_page_back.9.png and /dev/null differ diff --git a/android/res/drawable-xxxhdpi/bg_place_page_back_night.9.png b/android/res/drawable-xxxhdpi/bg_place_page_back_night.9.png deleted file mode 100644 index 3a889f8ade..0000000000 Binary files a/android/res/drawable-xxxhdpi/bg_place_page_back_night.9.png and /dev/null differ diff --git a/android/res/drawable-xxxhdpi/bg_place_page_head_closed.9.png b/android/res/drawable-xxxhdpi/bg_place_page_head_closed.9.png new file mode 100644 index 0000000000..c8c1f040cd Binary files /dev/null and b/android/res/drawable-xxxhdpi/bg_place_page_head_closed.9.png differ diff --git a/android/res/drawable-xxxhdpi/bg_place_page_head_closed_night.9.png b/android/res/drawable-xxxhdpi/bg_place_page_head_closed_night.9.png new file mode 100644 index 0000000000..048fcbc4fe Binary files /dev/null and b/android/res/drawable-xxxhdpi/bg_place_page_head_closed_night.9.png differ diff --git a/android/res/drawable-xxxhdpi/bg_place_page_head_open.9.png b/android/res/drawable-xxxhdpi/bg_place_page_head_open.9.png new file mode 100644 index 0000000000..0009e69b78 Binary files /dev/null and b/android/res/drawable-xxxhdpi/bg_place_page_head_open.9.png differ diff --git a/android/res/drawable-xxxhdpi/bg_place_page_head_open_night.9.png b/android/res/drawable-xxxhdpi/bg_place_page_head_open_night.9.png new file mode 100644 index 0000000000..23c12b2af5 Binary files /dev/null and b/android/res/drawable-xxxhdpi/bg_place_page_head_open_night.9.png differ diff --git a/android/res/layout-land/place_page_preview.xml b/android/res/layout-land/place_page_preview.xml deleted file mode 100644 index 8fab5134a4..0000000000 --- a/android/res/layout-land/place_page_preview.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/android/res/layout/place_page_preview.xml b/android/res/layout/place_page_preview.xml index 4b72218b49..115f887a5e 100644 --- a/android/res/layout/place_page_preview.xml +++ b/android/res/layout/place_page_preview.xml @@ -1,9 +1,5 @@ - - + diff --git a/android/res/values/themes-attrs.xml b/android/res/values/themes-attrs.xml index 745920beb7..0d2658c039 100644 --- a/android/res/values/themes-attrs.xml +++ b/android/res/values/themes-attrs.xml @@ -21,7 +21,8 @@ - + + diff --git a/android/res/values/themes-base.xml b/android/res/values/themes-base.xml index 172f777404..f63e0931bb 100644 --- a/android/res/values/themes-base.xml +++ b/android/res/values/themes-base.xml @@ -37,7 +37,8 @@ @color/bg_cards ?panel - @drawable/bg_place_page_back + @drawable/bg_place_page_head_open + @drawable/bg_place_page_head_closed @drawable/direction @drawable/routing_slot_background @@ -101,7 +102,8 @@ @color/bg_cards_night @color/bg_window_night - @drawable/bg_place_page_back_night + @drawable/bg_place_page_head_open_night + @drawable/bg_place_page_head_closed_night @drawable/direction_night @drawable/routing_slot_background_night diff --git a/android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java b/android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java index 72905aaae2..18d3a878db 100644 --- a/android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java +++ b/android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java @@ -339,6 +339,10 @@ public class PlacePageView extends RelativeLayout implements View.OnClickListene if (mMapObject != null) mAnimationController.setState(state, mMapObject.getMapObjectType()); + + if (!mIsDocked && !mIsFloating) + mPreview.setBackgroundResource(ThemeUtils.getResource(getContext(), state == State.PREVIEW ? R.attr.ppPreviewHeadClosed + : R.attr.ppPreviewHeadOpen)); } public MapObject getMapObject()