diff options
author | Joe Onorato <joeo@android.com> | 2010-02-13 11:23:10 -0500 |
---|---|---|
committer | Joe Onorato <joeo@android.com> | 2010-02-13 11:23:10 -0500 |
commit | 52fbb3cd46406cd97401b0bcd3ca2a7b11104240 (patch) | |
tree | 6acd1c421b478aac89ec300429d97855426164d3 /src | |
parent | eaf77d6c3dafb1a9032c98de53e0de335f59af30 (diff) | |
download | android_packages_apps_Trebuchet-52fbb3cd46406cd97401b0bcd3ca2a7b11104240.tar.gz android_packages_apps_Trebuchet-52fbb3cd46406cd97401b0bcd3ca2a7b11104240.tar.bz2 android_packages_apps_Trebuchet-52fbb3cd46406cd97401b0bcd3ca2a7b11104240.zip |
Revert "Merge "Launcher changes to handle UTS test mode." into eclair"
This reverts commit b8fc9e7df69db4b1647ef780f5620836c86f70ea, reversing
changes made to 52ba5b08f25e031a6f717551c75abf630b92ed8b.
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/launcher2/Launcher.java | 56 |
1 files changed, 0 insertions, 56 deletions
diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java index 3e21d1e33..089e5512b 100644 --- a/src/com/android/launcher2/Launcher.java +++ b/src/com/android/launcher2/Launcher.java @@ -44,14 +44,11 @@ import android.graphics.Rect; import android.graphics.Canvas; import android.graphics.drawable.Drawable; import android.graphics.drawable.ColorDrawable; -import android.net.Uri; import android.os.Bundle; import android.os.Handler; import android.os.Parcelable; import android.os.SystemProperties; -import android.provider.ContactsContract; import android.provider.LiveFolders; -import android.telephony.PhoneNumberUtils; import android.text.Selection; import android.text.SpannableStringBuilder; import android.text.TextUtils; @@ -202,8 +199,6 @@ public final class Launcher extends Activity private ImageView mPreviousView; private ImageView mNextView; - private boolean mUtsTestMode; - @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -411,7 +406,6 @@ public final class Launcher extends Activity super.onResume(); mPaused = false; - mUtsTestMode = SystemProperties.getInt("persist.sys.uts-test-mode", 0) == 1; if (mRestoring) { mWorkspaceLoading = true; @@ -468,10 +462,6 @@ public final class Launcher extends Activity @Override public boolean onKeyDown(int keyCode, KeyEvent event) { - if (mUtsTestMode) { - return handleUtsTestModeKeyDown(keyCode, event); - } - boolean handled = super.onKeyDown(keyCode, event); if (!handled && acceptFilter() && keyCode != KeyEvent.KEYCODE_ENTER) { boolean gotKey = TextKeyListener.getInstance().onKeyDown(mWorkspace, mDefaultKeySsb, @@ -495,52 +485,6 @@ public final class Launcher extends Activity return handled; } - public boolean handleUtsTestModeKeyDown(int keyCode, KeyEvent event) { - Log.d(TAG, "UTS-TEST-MODE"); - boolean handled = super.onKeyDown(keyCode, event); - if (!handled && acceptFilter() && keyCode != KeyEvent.KEYCODE_ENTER) { - boolean gotKey = TextKeyListener.getInstance().onKeyDown(mWorkspace, mDefaultKeySsb, - keyCode, event); - if (gotKey && mDefaultKeySsb != null && mDefaultKeySsb.length() > 0) { - // something usable has been typed - dispatch it now. - final String str = mDefaultKeySsb.toString(); - - boolean isDialable = true; - final int count = str.length(); - for (int i = 0; i < count; i++) { - if (!PhoneNumberUtils.isReallyDialable(str.charAt(i))) { - isDialable = false; - break; - } - } - Intent intent; - if (isDialable) { - intent = new Intent(Intent.ACTION_DIAL, Uri.fromParts("tel", str, null)); - } else { - intent = new Intent(ContactsContract.Intents.UI.FILTER_CONTACTS_ACTION); - intent.putExtra(ContactsContract.Intents.UI.FILTER_TEXT_EXTRA_KEY, str); - } - - intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK - | Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED); - - try { - startActivity(intent); - } catch (android.content.ActivityNotFoundException ex) { - // Oh well... no one knows how to filter/dial. Life goes on. - } - - mDefaultKeySsb.clear(); - mDefaultKeySsb.clearSpans(); - Selection.setSelection(mDefaultKeySsb, 0); - - return true; - } - } - - return handled; - } - private String getTypedText() { return mDefaultKeySsb.toString(); } |