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

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Weblate 2016-09-16 14:48:42 +02:00
commit 1c537d2543
3 changed files with 28 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
OsmAnd/src/net/osmand/plus/activities/MapActivity.java
View file

@ -279,13 +279,6 @@ public class MapActivity extends OsmandActionBarActivity implements DownloadEven
}
mapView.refreshMap(true);
if (((app.getAppInitializer().isFirstTime() && Version.isDeveloperVersion(app))
|| !app.getResourceManager().isAnyMapIstalled()) && FirstUsageWelcomeFragment.SHOW) {
FirstUsageWelcomeFragment.SHOW = false;
getSupportFragmentManager().beginTransaction()
.add(R.id.fragmentContainer, new FirstUsageWelcomeFragment(),
FirstUsageWelcomeFragment.TAG).commitAllowingStateLoss();
}
mapActions.updateDrawerMenu();
drawerLayout = (DrawerLayout) findViewById(R.id.drawer_layout);
@ -628,6 +621,14 @@ public class MapActivity extends OsmandActionBarActivity implements DownloadEven
}
}
enableDrawer();
if (((app.getAppInitializer().isFirstTime() && Version.isDeveloperVersion(app))
|| !app.getResourceManager().isAnyMapIstalled()) && FirstUsageWelcomeFragment.SHOW) {
FirstUsageWelcomeFragment.SHOW = false;
getSupportFragmentManager().beginTransaction()
.add(R.id.fragmentContainer, new FirstUsageWelcomeFragment(),
FirstUsageWelcomeFragment.TAG).commitAllowingStateLoss();
}
}
@Override

8
OsmAnd/src/net/osmand/plus/firstusage/FirstUsageWelcomeFragment.java
View file

@ -14,6 +14,7 @@ import android.view.WindowManager;
import android.widget.ImageView;
import net.osmand.plus.R;
import net.osmand.plus.activities.MapActivity;
public class FirstUsageWelcomeFragment extends Fragment {
public static final String TAG = "FirstUsageWelcomeFragment";
@ -54,5 +55,12 @@ public class FirstUsageWelcomeFragment extends Fragment {
w.setFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS,
WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
}
((MapActivity)getActivity()).disableDrawer();
}
@Override
public void onPause() {
super.onPause();
((MapActivity)getActivity()).enableDrawer();
}
}

12
OsmAnd/src/net/osmand/plus/firstusage/FirstUsageWizardFragment.java
View file

@ -434,6 +434,18 @@ public class FirstUsageWizardFragment extends Fragment implements OsmAndLocation
app.getAppInitializer().removeListener(this);
}
@Override
public void onResume() {
super.onResume();
((MapActivity)getActivity()).disableDrawer();
}
@Override
public void onPause() {
super.onPause();
((MapActivity)getActivity()).enableDrawer();
}
@Override
public void updateLocation(final Location loc) {
final OsmandApplication app = getMyApplication();