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-17 09:35:47 +02:00
commit 1b31eaf2e2
2 changed files with 1 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -624,11 +624,11 @@ public class MapActivity extends OsmandActionBarActivity implements DownloadEven
if (((app.getAppInitializer().isFirstTime() && Version.isDeveloperVersion(app)) if (((app.getAppInitializer().isFirstTime() && Version.isDeveloperVersion(app))
|| !app.getResourceManager().isAnyMapIstalled()) && FirstUsageWelcomeFragment.SHOW) { || !app.getResourceManager().isAnyMapIstalled()) && FirstUsageWelcomeFragment.SHOW) {
FirstUsageWelcomeFragment.SHOW = false;
getSupportFragmentManager().beginTransaction() getSupportFragmentManager().beginTransaction()
.add(R.id.fragmentContainer, new FirstUsageWelcomeFragment(), .add(R.id.fragmentContainer, new FirstUsageWelcomeFragment(),
FirstUsageWelcomeFragment.TAG).commitAllowingStateLoss(); FirstUsageWelcomeFragment.TAG).commitAllowingStateLoss();
} }
FirstUsageWelcomeFragment.SHOW = false;
} }
@Override @Override

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

@ -34,30 +34,15 @@ public class FirstUsageWelcomeFragment extends Fragment {
skipButton.setOnClickListener(new View.OnClickListener() { skipButton.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
/*
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
Window w = getActivity().getWindow();
w.clearFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
}
*/
FirstUsageWizardFragment.startWizard(getActivity()); FirstUsageWizardFragment.startWizard(getActivity());
} }
}); });
return view; return view;
} }
@TargetApi(Build.VERSION_CODES.HONEYCOMB)
@Override @Override
public void onResume() { public void onResume() {
super.onResume(); super.onResume();
/*
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
Window w = getActivity().getWindow(); // in Activity's onCreate() for instance
w.setFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS,
WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
}
*/
((MapActivity)getActivity()).disableDrawer(); ((MapActivity)getActivity()).disableDrawer();
} }