Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e9d0b296 authored by Brett Chabot's avatar Brett Chabot
Browse files

Fix imf tests. 

- fix hard keyboard detection logic
- use FLAG_ACTIVITY_MULTIPLE_TASK to force test activities to start with IME

Bugs 2677320, 2677355

Change-Id: I1b943ee17fddcae5087faefa9fa5603dd3f18ec1
parent be65399b

tests/ImfTest/tests/src/com/android/imftest/samples/ImfBaseTestCase.java

+17 −13
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package com.android.imftest.samples; 
import android.app.Activity;

import android.app.KeyguardManager;

import android.content.Context;

import android.content.Intent;

import android.content.res.Configuration;

import android.os.SystemClock;

import android.test.InstrumentationTestCase;
@@ -57,10 +58,13 @@ public abstract class ImfBaseTestCase<T extends Activity> extends Instrumentatio 
    public void setUp() throws Exception {

        super.setUp();

        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

        mExpectAutoPop = mTargetActivity.getResources().getConfiguration().hardKeyboardHidden == 

            Configuration.HARDKEYBOARDHIDDEN_YES;

        int keyboardType = mTargetActivity.getResources().getConfiguration().keyboard;

        mExpectAutoPop = (keyboardType  == Configuration.KEYBOARD_NOKEYS ||

                keyboardType == Configuration.KEYBOARD_UNDEFINED);



        mImm = InputMethodManager.getInstance(mTargetActivity);