Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2015-10-27 17:32:10 +01:00
commit c355fd6984
3 changed files with 8 additions and 6 deletions

View file

@ -5,8 +5,7 @@
</item> </item>
<item> <item>
<shape> <shape>
<solid <solid android:color="@color/bg_color_dark" />
android:color="@color/bg_color_dark" />
</shape> </shape>
</item> </item>
</layer-list> </layer-list>

View file

@ -3,6 +3,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="bottom" android:layout_gravity="bottom"
android:background="?attr/bottom_menu_view_bg"
tools:context="net.osmand.plus.download.ui.DataStoragePlaceDialogFragment"> tools:context="net.osmand.plus.download.ui.DataStoragePlaceDialogFragment">
<ImageView <ImageView

View file

@ -144,12 +144,16 @@
<style name="OsmandLightTheme.BottomSheet"> <style name="OsmandLightTheme.BottomSheet">
<item name="android:dialogTheme">@style/BottomSheet.Dialog</item> <item name="android:dialogTheme">@style/BottomSheet.Dialog</item>
<item name="android:windowBackground">?attr/bottom_menu_view_bg</item> <item name="android:windowBackground">@color/color_transparent</item>
<item name="android:backgroundDimAmount">0.3</item>
<item name="android:backgroundDimEnabled">true</item>
</style> </style>
<style name="OsmandDarkTheme.BottomSheet"> <style name="OsmandDarkTheme.BottomSheet">
<item name="android:dialogTheme">@style/BottomSheet.Dialog</item> <item name="android:dialogTheme">@style/BottomSheet.Dialog</item>
<item name="android:windowBackground">?attr/bottom_menu_view_bg</item> <item name="android:windowBackground">@color/color_transparent</item>
<item name="android:backgroundDimAmount">0.3</item>
<item name="android:backgroundDimEnabled">true</item>
</style> </style>
<style name="OsmandDarkTheme" parent="Theme.AppCompat"> <style name="OsmandDarkTheme" parent="Theme.AppCompat">
@ -313,7 +317,5 @@
<item name="android:windowIsFloating">true</item> <item name="android:windowIsFloating">true</item>
<item name="android:windowContentOverlay">@null</item> <item name="android:windowContentOverlay">@null</item>
<item name="android:windowIsTranslucent">true</item> <item name="android:windowIsTranslucent">true</item>
<item name="android:backgroundDimAmount">0.3</item>
<item name="android:backgroundDimEnabled">true</item>
</style> </style>
</resources> </resources>