Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Revert animation in activity transitions

Browse source
This commit is contained in:
PavelRatushny 2017-08-29 12:17:03 +03:00
parent 49b04de5b3
commit d0c1acd685
2 changed files with 2 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
OsmAnd/res/values/styles.xml
View file

@ -86,14 +86,6 @@
<item name="android:windowBackground">@drawable/first_splash_screen_free_dev</item>
</style>
<style name="OsmandLightTheme.NoAnimation" parent="OsmandLightTheme">
<item name="android:windowAnimationStyle">@null</item>
</style>
<style name="OsmandDarkTheme.NoAnimation" parent="OsmandDarkTheme">
<item name="android:windowAnimationStyle">@null</item>
</style>
<!-- Osmand themes styles -->
<style name="OsmandLightTheme" parent="Theme.AppCompat.Light">
<item name="mapBackground">@color/map_background_color_light</item>

13
OsmAnd/src/net/osmand/plus/OsmandApplication.java
View file

@ -694,19 +694,10 @@ public class OsmandApplication extends MultiDexApplication {
public void applyTheme(Context c) {
int t = R.style.OsmandDarkTheme;
boolean doNotUseAnimations = osmandSettings.DO_NOT_USE_ANIMATIONS.get();
if (osmandSettings.OSMAND_THEME.get() == OsmandSettings.OSMAND_DARK_THEME) {
if (doNotUseAnimations) {
t = R.style.OsmandDarkTheme_NoAnimation;
} else {
t = R.style.OsmandDarkTheme;
}
t = R.style.OsmandDarkTheme;
} else if (osmandSettings.OSMAND_THEME.get() == OsmandSettings.OSMAND_LIGHT_THEME) {
if (doNotUseAnimations) {
t = R.style.OsmandLightTheme_NoAnimation;
} else {
t = R.style.OsmandLightTheme;
}
t = R.style.OsmandLightTheme;
}
setLanguage(c);
c.setTheme(t);