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

Menu moved

Browse Source
This commit is contained in:
Sergey Solovyev 2012-04-30 11:39:49 +04:00
parent a6a29f3e77
commit 6c54cf8af0
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
calculatorpp/res/menu/main_menu.xml
View File

@ -17,7 +17,6 @@
<item a:id="@+id/main_menu_item_about" <item a:id="@+id/main_menu_item_about"
a:title="@string/c_about"/> a:title="@string/c_about"/>
<item a:id="@+id/main_menu_item_exit" <item a:id="@+id/main_menu_item_exit"
a:title="@string/c_exit"/> a:title="@string/c_exit"/>
</menu> </menu>

14
calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorActivity.java
View File

@ -28,15 +28,21 @@ import net.robotmedia.billing.BillingController;
import net.robotmedia.billing.IBillingObserver; import net.robotmedia.billing.IBillingObserver;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import org.solovyev.android.*; import org.solovyev.android.AndroidUtils;
import org.solovyev.android.FontSizeAdjuster;
import org.solovyev.android.LocalBinder;
import org.solovyev.android.ResourceCache;
import org.solovyev.android.calculator.about.CalculatorReleaseNotesActivity; import org.solovyev.android.calculator.about.CalculatorReleaseNotesActivity;
import org.solovyev.android.calculator.history.CalculatorHistory; import org.solovyev.android.calculator.history.CalculatorHistory;
import org.solovyev.android.calculator.history.CalculatorHistoryState; import org.solovyev.android.calculator.history.CalculatorHistoryState;
import org.solovyev.android.calculator.model.CalculatorEngine; import org.solovyev.android.calculator.model.CalculatorEngine;
import org.solovyev.android.calculator.view.*; import org.solovyev.android.calculator.view.AngleUnitsButton;
import org.solovyev.android.calculator.view.CalculatorAdditionalTitle;
import org.solovyev.android.calculator.view.NumeralBasesButton;
import org.solovyev.android.calculator.view.OnDragListenerVibrator;
import org.solovyev.android.history.HistoryDragProcessor; import org.solovyev.android.history.HistoryDragProcessor;
import org.solovyev.android.menu.ActivityMenu; import org.solovyev.android.menu.ActivityMenu;
import org.solovyev.android.menu.ListActivityMenu; import org.solovyev.android.menu.LayoutActivityMenu;
import org.solovyev.android.view.ColorButton; import org.solovyev.android.view.ColorButton;
import org.solovyev.android.view.drag.*; import org.solovyev.android.view.drag.*;
import org.solovyev.common.utils.Announcer; import org.solovyev.common.utils.Announcer;
@ -81,7 +87,7 @@ public class CalculatorActivity extends Activity implements FontSizeAdjuster, Sh
private NumeralBaseButtons numeralBaseButtons = new NumeralBaseButtons(); private NumeralBaseButtons numeralBaseButtons = new NumeralBaseButtons();
@NotNull @NotNull
private ActivityMenu menu = ListActivityMenu.newInstance(R.menu.main_menu, CalculatorMenu.class); private ActivityMenu menu = LayoutActivityMenu.newInstance(R.menu.main_menu, CalculatorMenu.class);
/** /**
* Called when the activity is first created. * Called when the activity is first created.