Revert "Split Stk into a client apk and a lib."
This reverts commit 7e1566067f791a8145d36e397cdd6b842cc89240.
Reason for revert: b/148821604
Change-Id: I9f5682f99c73c447a5af8d29ed662f1bd68a0bf6
diff --git a/src/com/android/stk/StkInputActivity.java b/src/com/android/stk/StkInputActivity.java
index fe16101..0af6767 100644
--- a/src/com/android/stk/StkInputActivity.java
+++ b/src/com/android/stk/StkInputActivity.java
@@ -105,18 +105,22 @@
return;
}
- if (v.getId() == R.id.button_ok) {
+ switch (v.getId()) {
+ case R.id.button_ok:
input = mTextIn.getText().toString();
- } else if (v.getId() == R.id.button_cancel) {
+ break;
+ case R.id.button_cancel:
sendResponse(StkAppService.RES_ID_END_SESSION);
finish();
return;
- // Yes/No layout buttons.
- } else if (v.getId() == R.id.button_yes) {
+ // Yes/No layout buttons.
+ case R.id.button_yes:
input = YES_STR_RESPONSE;
- } else if (v.getId() == R.id.button_no) {
+ break;
+ case R.id.button_no:
input = NO_STR_RESPONSE;
- } else if (v.getId() == R.id.more) {
+ break;
+ case R.id.more:
if (mPopupMenu == null) {
mPopupMenu = new PopupMenu(this, v);
Menu menu = mPopupMenu.getMenu();
@@ -136,6 +140,8 @@
mPopupMenu.show();
}
return;
+ default:
+ break;
}
CatLog.d(LOG_TAG, "handleClick, ready to response");
sendResponse(StkAppService.RES_ID_INPUT, input, false);