TnSb/android-calculatorpp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
Sergey Solovyev
2013-06-23 21:46:25 +04:00
parent 03965333c2
commit 0e9d791a6a
5 changed files with 109 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
android-app/src/main/java/org/solovyev/android/calculator/matrix/CalculatorMatrixActivity.java
View File

@@ -1,11 +1,12 @@
package org.solovyev.android.calculator.matrix;
import android.app.ActionBar;
import android.os.Bundle;
import org.solovyev.android.calculator.CalculatorFragmentActivity;
import org.solovyev.android.calculator.CalculatorFragmentType;
import org.solovyev.android.calculator.R;
import static com.actionbarsherlock.app.ActionBar.NAVIGATION_MODE_STANDARD;
/**
* User: Solovyev_S
* Date: 12.10.12
@@ -17,7 +18,7 @@ public class CalculatorMatrixActivity extends CalculatorFragmentActivity {
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
getSupportActionBar().setNavigationMode(ActionBar.NAVIGATION_MODE_STANDARD);
getSupportActionBar().setNavigationMode(NAVIGATION_MODE_STANDARD);
getActivityHelper().setFragment(this, CalculatorFragmentType.matrix_edit, null, R.id.main_layout);
}
}

10
android-app/src/main/java/org/solovyev/android/calculator/plot/CalculatorPlotActivity.java
View File

@@ -1,14 +1,16 @@
package org.solovyev.android.calculator.plot;
import android.app.ActionBar;
import android.content.Intent;
import android.os.Bundle;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import org.solovyev.android.calculator.CalculatorFragmentActivity;
import org.solovyev.android.calculator.CalculatorFragmentType;
import org.solovyev.android.calculator.R;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import static com.actionbarsherlock.app.ActionBar.NAVIGATION_MODE_STANDARD;
/**
* User: serso
* Date: 9/30/12
@@ -29,7 +31,7 @@ public class CalculatorPlotActivity extends CalculatorFragmentActivity {
arguments = null;
}
getSupportActionBar().setNavigationMode(ActionBar.NAVIGATION_MODE_STANDARD);
getSupportActionBar().setNavigationMode(NAVIGATION_MODE_STANDARD);
getActivityHelper().setFragment(this, getPlotterFragmentType(), arguments, R.id.main_layout);
}