Release: Re-enable spline for the release

arthurbenemann · arthurbenemann · commit a1d851e9c160 · 2014-09-15T11:10:00.000-07:00
diff --git a/Android/src/org/droidplanner/android/activities/EditorActivity.java b/Android/src/org/droidplanner/android/activities/EditorActivity.java
@@ -102,7 +102,7 @@ public void onCreate(Bundle savedInstanceState) {
 				.findFragmentById(R.id.missionFragment1);
 
 		mSplineToggleContainer = findViewById(R.id.editorSplineToggleContainer);
-		mSplineToggleContainer.setVisibility(View.GONE);
+		mSplineToggleContainer.setVisibility(View.VISIBLE);
 
 		mLocationButtonsContainer = findViewById(R.id.location_button_container);
 		ImageButton mGoToMyLocation = (ImageButton) findViewById(R.id.my_location_button);
@@ -363,7 +363,6 @@ public void editorToolLongClicked(EditorTools tools) {
 
 	private void enableSplineToggle(boolean isEnabled) {
 		if (mSplineToggleContainer != null) {
-			isEnabled=false;
 			mSplineToggleContainer.setVisibility(isEnabled ? View.VISIBLE : View.INVISIBLE);
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,7 @@ public void onCreate(Bundle savedInstanceState) {`
`102`	`102`	`.findFragmentById(R.id.missionFragment1);`
`103`	`103`
`104`	`104`	`mSplineToggleContainer = findViewById(R.id.editorSplineToggleContainer);`
`105`		`- mSplineToggleContainer.setVisibility(View.GONE);`
	`105`	`+ mSplineToggleContainer.setVisibility(View.VISIBLE);`
`106`	`106`
`107`	`107`	`mLocationButtonsContainer = findViewById(R.id.location_button_container);`
`108`	`108`	`ImageButton mGoToMyLocation = (ImageButton) findViewById(R.id.my_location_button);`
`@@ -363,7 +363,6 @@ public void editorToolLongClicked(EditorTools tools) {`
`363`	`363`
`364`	`364`	`private void enableSplineToggle(boolean isEnabled) {`
`365`	`365`	`if (mSplineToggleContainer != null) {`
`366`		`- isEnabled=false;`
`367`	`366`	`mSplineToggleContainer.setVisibility(isEnabled ? View.VISIBLE : View.INVISIBLE);`
`368`	`367`	`}`
`369`	`368`	`}`