Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
77553484be
1 changed files with 2 additions and 5 deletions
|
@ -22,6 +22,7 @@ import android.widget.ProgressBar;
|
||||||
import android.widget.TextView;
|
import android.widget.TextView;
|
||||||
|
|
||||||
import net.osmand.AndroidNetworkUtils;
|
import net.osmand.AndroidNetworkUtils;
|
||||||
|
import net.osmand.AndroidUtils;
|
||||||
import net.osmand.Location;
|
import net.osmand.Location;
|
||||||
import net.osmand.ValueHolder;
|
import net.osmand.ValueHolder;
|
||||||
import net.osmand.binary.BinaryMapDataObject;
|
import net.osmand.binary.BinaryMapDataObject;
|
||||||
|
@ -119,6 +120,7 @@ public class FirstUsageWizardFragment extends BaseOsmAndFragment implements OsmA
|
||||||
@Override
|
@Override
|
||||||
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
|
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
|
||||||
view = inflater.inflate(R.layout.first_usage_wizard_fragment, container, false);
|
view = inflater.inflate(R.layout.first_usage_wizard_fragment, container, false);
|
||||||
|
AndroidUtils.addStatusBarPadding21v(getActivity(), view);
|
||||||
|
|
||||||
if (!AndroidUiHelper.isOrientationPortrait(getActivity()) && !AndroidUiHelper.isXLargeDevice(getActivity())) {
|
if (!AndroidUiHelper.isOrientationPortrait(getActivity()) && !AndroidUiHelper.isXLargeDevice(getActivity())) {
|
||||||
TextView wizardDescription = (TextView) view.findViewById(R.id.wizard_description);
|
TextView wizardDescription = (TextView) view.findViewById(R.id.wizard_description);
|
||||||
|
@ -450,11 +452,6 @@ public class FirstUsageWizardFragment extends BaseOsmAndFragment implements OsmA
|
||||||
((MapActivity)getActivity()).enableDrawer();
|
((MapActivity)getActivity()).enableDrawer();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
protected boolean isFullScreenAllowed() {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void updateLocation(final Location loc) {
|
public void updateLocation(final Location loc) {
|
||||||
final OsmandApplication app = getMyApplication();
|
final OsmandApplication app = getMyApplication();
|
||||||
|
|
Loading…
Reference in a new issue