diff options
author | Dmitri Plotnikov <dplotnikov@google.com> | 2011-01-16 15:27:03 -0800 |
---|---|---|
committer | Dmitri Plotnikov <dplotnikov@google.com> | 2011-01-16 15:27:03 -0800 |
commit | e2092454e13850c551550db9879fa4fa93218c75 (patch) | |
tree | 0b6944c8b73f89b18fd924c78b036ed09ff4132c /src/com/android/calculator2/Calculator.java | |
parent | 4585efa7c1d05d96278e20fdc8129342475fe7e7 (diff) | |
download | android_packages_apps_ExactCalculator-e2092454e13850c551550db9879fa4fa93218c75.tar.gz android_packages_apps_ExactCalculator-e2092454e13850c551550db9879fa4fa93218c75.tar.bz2 android_packages_apps_ExactCalculator-e2092454e13850c551550db9879fa4fa93218c75.zip |
New calculator button styles and initial xlarge layouts.
Bug: 3235798
Change-Id: Iad1f46cec8d073d4b01f90f5e5b0b230c0af3f24
Diffstat (limited to 'src/com/android/calculator2/Calculator.java')
-rw-r--r-- | src/com/android/calculator2/Calculator.java | 48 |
1 files changed, 43 insertions, 5 deletions
diff --git a/src/com/android/calculator2/Calculator.java b/src/com/android/calculator2/Calculator.java index f1c17cd..697e469 100644 --- a/src/com/android/calculator2/Calculator.java +++ b/src/com/android/calculator2/Calculator.java @@ -67,13 +67,45 @@ public class Calculator extends Activity implements PanelSwitcher.Listener { mHistory.setObserver(historyAdapter); mPanelSwitcher = (PanelSwitcher) findViewById(R.id.panelswitch); - mPanelSwitcher.setCurrentIndex(state==null ? 0 : state.getInt(STATE_CURRENT_VIEW, 0)); - mPanelSwitcher.setListener(this); + if (mPanelSwitcher != null) { + mPanelSwitcher.setCurrentIndex(state==null ? 0 : state.getInt(STATE_CURRENT_VIEW, 0)); + mPanelSwitcher.setListener(this); + } mListener.setHandler(mLogic, mPanelSwitcher); - mDisplay.setOnKeyListener(mListener); + setOnClickListener(R.id.digit0); + setOnClickListener(R.id.digit1); + setOnClickListener(R.id.digit2); + setOnClickListener(R.id.digit3); + setOnClickListener(R.id.digit4); + setOnClickListener(R.id.digit5); + setOnClickListener(R.id.digit6); + setOnClickListener(R.id.digit7); + setOnClickListener(R.id.digit8); + setOnClickListener(R.id.digit9); + setOnClickListener(R.id.dot); + + setOnClickListener(R.id.plus); + setOnClickListener(R.id.minus); + setOnClickListener(R.id.div); + setOnClickListener(R.id.mul); + setOnClickListener(R.id.leftParen); + setOnClickListener(R.id.rightParen); + setOnClickListener(R.id.equal); + + setOnClickListener(R.id.sin); + setOnClickListener(R.id.ln); + setOnClickListener(R.id.cos); + setOnClickListener(R.id.lg); + setOnClickListener(R.id.tan); + setOnClickListener(R.id.e); + setOnClickListener(R.id.pi); + setOnClickListener(R.id.power); + setOnClickListener(R.id.factorial); + setOnClickListener(R.id.sqrt); + View view; if ((view = findViewById(R.id.del)) != null) { // view.setOnClickListener(mListener); @@ -86,6 +118,10 @@ public class Calculator extends Activity implements PanelSwitcher.Listener { */ } + private void setOnClickListener(int id) { + findViewById(id).setOnClickListener(mListener); + } + @Override public boolean onCreateOptionsMenu(Menu menu) { super.onCreateOptionsMenu(menu); @@ -145,7 +181,9 @@ public class Calculator extends Activity implements PanelSwitcher.Listener { @Override protected void onSaveInstanceState(Bundle state) { super.onSaveInstanceState(state); - state.putInt(STATE_CURRENT_VIEW, mPanelSwitcher.getCurrentIndex()); + if (mPanelSwitcher != null) { + state.putInt(STATE_CURRENT_VIEW, mPanelSwitcher.getCurrentIndex()); + } } @Override @@ -158,7 +196,7 @@ public class Calculator extends Activity implements PanelSwitcher.Listener { @Override public boolean onKeyDown(int keyCode, KeyEvent keyEvent) { if (keyCode == KeyEvent.KEYCODE_BACK - && mPanelSwitcher.getCurrentIndex() == ADVANCED_PANEL) { + && mPanelSwitcher != null && mPanelSwitcher.getCurrentIndex() == ADVANCED_PANEL) { mPanelSwitcher.moveRight(); return true; } else { |