am ba9ec0a3: am 84bea2dd: Merge "Fix dependency on internal API." into jb-mr2-dev
* commit 'ba9ec0a3c824e252b7a72385cacfeb33bc842fc2':
Fix dependency on internal API.
diff --git a/tests/tests/view/src/android/view/cts/ViewTest.java b/tests/tests/view/src/android/view/cts/ViewTest.java
index 0af3f21..6313f7c 100644
--- a/tests/tests/view/src/android/view/cts/ViewTest.java
+++ b/tests/tests/view/src/android/view/cts/ViewTest.java
@@ -2768,7 +2768,8 @@
final MockView scrollView = (MockView) mActivity.findViewById(R.id.scroll_view);
Bitmap bitmap = Bitmap.createBitmap(200, 300, Bitmap.Config.RGB_565);
final BitmapDrawable d = new BitmapDrawable(bitmap);
- final InputMethodManager imm = InputMethodManager.getInstance(getActivity());
+ final InputMethodManager imm = (InputMethodManager)getActivity().getSystemService(
+ Context.INPUT_METHOD_SERVICE);
final LinearLayout.LayoutParams layoutParams = new LinearLayout.LayoutParams(300, 500);
runTestOnUiThread(new Runnable() {
public void run() {
@@ -3110,7 +3111,8 @@
}
public void testInputConnection() throws Throwable {
- final InputMethodManager imm = InputMethodManager.getInstance(getActivity());
+ final InputMethodManager imm = (InputMethodManager)getActivity().getSystemService(
+ Context.INPUT_METHOD_SERVICE);
final MockView view = (MockView) mActivity.findViewById(R.id.mock_view);
final ViewGroup viewGroup = (ViewGroup) mActivity.findViewById(R.id.viewlayout_root);
final MockEditText editText = new MockEditText(mActivity);