Merge "Reenable pre-N style hard keyboard layout settings" into pi-dev am: e1703e867a

am: 3013858ec0

Change-Id: Ia0047941e8162ba940f0ee2b9b903bafbaea35af
This commit is contained in:
Yohei Yukawa
2018-03-12 02:40:29 +00:00
committed by android-build-merger
5 changed files with 167 additions and 363 deletions

View File

@@ -55,7 +55,7 @@ public class PhysicalKeyboardPreferenceControllerTest {
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
when(mContext.getSystemService(Context.INPUT_SERVICE)).thenReturn(mIm);
when(mContext.getSystemService(InputManager.class)).thenReturn(mIm);
mController = new PhysicalKeyboardPreferenceController(mContext, null /* lifecycle */);
}