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

merging

Browse Source
This commit is contained in:
Sergey Solovyev
2012-12-01 21:51:40 +04:00
parent c0e57175c8
commit 87254f5335
6 changed files with 45 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
android-app-core/src/main/java/org/solovyev/android/calculator/CalculatorButtons.java
View File

@@ -2,7 +2,6 @@ package org.solovyev.android.calculator;
import android.app.Activity;
import android.content.Context;
import android.content.Intent;
import android.content.SharedPreferences;
import android.content.res.Configuration;
import android.preference.PreferenceManager;
@@ -18,7 +17,6 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.solovyev.android.AndroidUtils;
import org.solovyev.android.calculator.core.R;
import org.solovyev.android.calculator.matrix.CalculatorMatrixActivity;
import org.solovyev.android.calculator.model.AndroidCalculatorEngine;
import org.solovyev.android.calculator.view.AngleUnitsButton;
import org.solovyev.android.calculator.view.NumeralBasesButton;
@@ -138,7 +136,7 @@ public final class CalculatorButtons {
Locator.getInstance().getCalculator().fireCalculatorEvent(CalculatorEventType.show_create_var_dialog, null);
result = true;
} else if ( dragDirection == DragDirection.down ) {
context.startActivity(new Intent(context, CalculatorMatrixActivity.class));
Locator.getInstance().getCalculator().fireCalculatorEvent(CalculatorEventType.show_create_matrix_dialog, null);
result = true;
}