summaryrefslogtreecommitdiffstats
path: root/src/com/android
diff options
context:
space:
mode:
Diffstat (limited to 'src/com/android')
-rw-r--r--src/com/android/stk/StkAppService.java2
-rw-r--r--src/com/android/stk/StkDialogActivity.java4
-rw-r--r--src/com/android/stk/StkInputActivity.java8
-rw-r--r--src/com/android/stk/StkMenuActivity.java15
-rw-r--r--src/com/android/stk/TonePlayer.java1
5 files changed, 9 insertions, 21 deletions
diff --git a/src/com/android/stk/StkAppService.java b/src/com/android/stk/StkAppService.java
index cd6da78..c3dbfea 100644
--- a/src/com/android/stk/StkAppService.java
+++ b/src/com/android/stk/StkAppService.java
@@ -101,8 +101,6 @@ public class StkAppService extends Service implements Runnable {
static final int RES_ID_END_SESSION = 22;
static final int RES_ID_EXIT = 23;
- private static final String TAG = "StkAppService";
-
private static final String PACKAGE_NAME = "com.android.stk";
private static final String MENU_ACTIVITY_NAME =
PACKAGE_NAME + ".StkMenuActivity";
diff --git a/src/com/android/stk/StkDialogActivity.java b/src/com/android/stk/StkDialogActivity.java
index f20b41d..15eacec 100644
--- a/src/com/android/stk/StkDialogActivity.java
+++ b/src/com/android/stk/StkDialogActivity.java
@@ -39,6 +39,7 @@ public class StkDialogActivity extends Activity implements View.OnClickListener
TextMessage mTextMsg;
Handler mTimeoutHandler = new Handler() {
+ @Override
public void handleMessage(Message msg) {
switch(msg.what) {
case MSG_ID_TIMEOUT:
@@ -49,9 +50,6 @@ public class StkDialogActivity extends Activity implements View.OnClickListener
}
};
- // constants
- static final String TAG = "STK Dialog";
-
//keys) for saving the state of the dialog in the icicle
private static final String TEXT = "text";
diff --git a/src/com/android/stk/StkInputActivity.java b/src/com/android/stk/StkInputActivity.java
index 8a91563..f1627e8 100644
--- a/src/com/android/stk/StkInputActivity.java
+++ b/src/com/android/stk/StkInputActivity.java
@@ -36,10 +36,9 @@ import android.widget.TextView;
import android.widget.EditText;
import android.widget.TextView.BufferType;
-import com.android.internal.telephony.gsm.stk.AppInterface;
import com.android.internal.telephony.gsm.stk.FontSize;
import com.android.internal.telephony.gsm.stk.Input;
-import com.android.internal.telephony.gsm.stk.Service;
+import com.android.internal.telephony.gsm.stk.StkLog;
/**
* Display a request for a text input a long with a text edit form.
@@ -57,8 +56,6 @@ public class StkInputActivity extends Activity implements View.OnClickListener,
private Input mStkInput = null;
// Constants
- private static final String TAG = "STK Input";
-
private static final int STATE_TEXT = 1;
private static final int STATE_YES_NO = 2;
@@ -74,6 +71,7 @@ public class StkInputActivity extends Activity implements View.OnClickListener,
private static final int MSG_ID_TIMEOUT = 1;
Handler mTimeoutHandler = new Handler() {
+ @Override
public void handleMessage(Message msg) {
switch(msg.what) {
case MSG_ID_TIMEOUT:
@@ -220,8 +218,6 @@ public class StkInputActivity extends Activity implements View.OnClickListener,
@Override
public boolean onOptionsItemSelected(MenuItem item) {
- AppInterface stkService = Service.getInstance();
-
switch (item.getItemId()) {
case StkApp.MENU_ID_END_SESSION:
sendResponse(StkAppService.RES_ID_END_SESSION);
diff --git a/src/com/android/stk/StkMenuActivity.java b/src/com/android/stk/StkMenuActivity.java
index 16c8fe4..9b6d027 100644
--- a/src/com/android/stk/StkMenuActivity.java
+++ b/src/com/android/stk/StkMenuActivity.java
@@ -22,7 +22,6 @@ import android.content.Intent;
import android.os.Bundle;
import android.os.Handler;
import android.os.Message;
-import android.util.Log;
import android.view.KeyEvent;
import android.view.MenuItem;
import android.view.View;
@@ -34,6 +33,7 @@ import android.widget.TextView;
import com.android.internal.telephony.gsm.stk.Item;
import com.android.internal.telephony.gsm.stk.Menu;
+import com.android.internal.telephony.gsm.stk.StkLog;
/**
* ListActivity used for displaying STK menus. These can be SET UP MENU and
@@ -53,9 +53,6 @@ public class StkMenuActivity extends ListActivity {
StkAppService appService = StkAppService.getInstance();
- // Constants
- private static final String TAG = "STK Menu";
-
// Internal state values
static final int STATE_MAIN = 1;
static final int STATE_SECONDARY = 2;
@@ -79,7 +76,7 @@ public class StkMenuActivity extends ListActivity {
public void onCreate(Bundle icicle) {
super.onCreate(icicle);
- Log.d(TAG, "onCreate");
+ StkLog.d(this, "onCreate");
// Remove the default title, customized one is used.
requestWindowFeature(Window.FEATURE_NO_TITLE);
// Set the layout for this activity.
@@ -98,7 +95,7 @@ public class StkMenuActivity extends ListActivity {
protected void onNewIntent(Intent intent) {
super.onNewIntent(intent);
- Log.d(TAG, "onNewIntent");
+ StkLog.d(this, "onNewIntent");
initFromIntent(intent);
mAcceptUsersInput = true;
}
@@ -180,7 +177,7 @@ public class StkMenuActivity extends ListActivity {
public void onDestroy() {
super.onDestroy();
- Log.d(TAG, "onDestroy");
+ StkLog.d(this, "onDestroy");
}
@Override
@@ -309,11 +306,11 @@ public class StkMenuActivity extends ListActivity {
item = mStkMenu.items.get(position);
} catch (IndexOutOfBoundsException e) {
if (StkApp.DBG) {
- Log.d(TAG, "Invalid menu");
+ StkLog.d(this, "Invalid menu");
}
} catch (NullPointerException e) {
if (StkApp.DBG) {
- Log.d(TAG, "Invalid menu");
+ StkLog.d(this, "Invalid menu");
}
}
}
diff --git a/src/com/android/stk/TonePlayer.java b/src/com/android/stk/TonePlayer.java
index 1ba61ca..00e859d 100644
--- a/src/com/android/stk/TonePlayer.java
+++ b/src/com/android/stk/TonePlayer.java
@@ -27,7 +27,6 @@ import com.android.internal.telephony.gsm.stk.Tone;
*
*/
public class TonePlayer {
- private static final String TAG = "TonePlayer";
private static final HashMap<Tone, Integer> mToneMap = new HashMap<Tone, Integer>();
static {
generated by cgit v1.1 at 2024-09-20 19:32:26 +0000