Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am b4c9a8f6: Merge "Fix imf tests." into froyo

Browse Source 
Merge commit 'b4c9a8f664f1dd57644e6d6cf2723eff9a505072' into froyo-plus-aosp

* commit 'b4c9a8f664f1dd57644e6d6cf2723eff9a505072':
  Fix imf tests.
This commit is contained in:
Brett Chabot
2010-05-12 07:50:44 -07:00
committed by Android Git Automerger
parent 21f18e9633 b4c9a8f664
commit c8e84e12be
1 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tests/ImfTest/tests/src/com/android/imftest/samples/ImfBaseTestCase.java
View File

@@ -19,6 +19,7 @@ package com.android.imftest.samples;
import android.app.Activity; import android.app.Activity;
import android.app.KeyguardManager; import android.app.KeyguardManager;
import android.content.Context; import android.content.Context;
import android.content.Intent;
import android.content.res.Configuration; import android.content.res.Configuration;
import android.os.SystemClock; import android.os.SystemClock;
import android.test.InstrumentationTestCase; import android.test.InstrumentationTestCase;
@@ -57,10 +58,13 @@ public abstract class ImfBaseTestCase<T extends Activity> extends Instrumentatio
public void setUp() throws Exception { public void setUp() throws Exception {
super.setUp(); super.setUp();
final String packageName = getInstrumentation().getTargetContext().getPackageName(); final String packageName = getInstrumentation().getTargetContext().getPackageName();
mTargetActivity = launchActivity(packageName, mTargetActivityClass, null); Intent intent = new Intent(Intent.ACTION_MAIN);
intent.addFlags(Intent.FLAG_ACTIVITY_MULTIPLE_TASK);
mTargetActivity = launchActivityWithIntent(packageName, mTargetActivityClass, intent);
// expect ime to auto pop up if device has no hard keyboard // expect ime to auto pop up if device has no hard keyboard
mExpectAutoPop = mTargetActivity.getResources().getConfiguration().hardKeyboardHidden == int keyboardType = mTargetActivity.getResources().getConfiguration().keyboard;
Configuration.HARDKEYBOARDHIDDEN_YES; mExpectAutoPop = (keyboardType == Configuration.KEYBOARD_NOKEYS ||
keyboardType == Configuration.KEYBOARD_UNDEFINED);
mImm = InputMethodManager.getInstance(mTargetActivity); mImm = InputMethodManager.getInstance(mTargetActivity);