Merge "Fix failing TextActivityTest."

            </intent-filter>

        </activity>

        <activity android:name="android.widget.TextViewActivity" android:label="TextViewActivity">

        <activity android:name="android.widget.TextViewActivity"

                android:label="TextViewActivity"

                android:screenOrientation="portrait">

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />

import android.test.ActivityInstrumentationTestCase2;

import android.test.suitebuilder.annotation.SmallTest;

import android.util.OrientationUtil;

import android.view.KeyEvent;

/**

 */

public class TextViewActivityTest extends ActivityInstrumentationTestCase2<TextViewActivity>{

    private OrientationUtil mOrientationUtil;

    public TextViewActivityTest() {

        super(TextViewActivity.class);

    }

    @Override

    public void setUp() {

        mOrientationUtil = OrientationUtil.initializeAndStartActivityIfNotStarted(this);

        mOrientationUtil.setPortraitOrientation();

        getActivity();

    }

    @SmallTest