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

This commit is contained in:
TreeHugger Robot
2018-03-12 01:58:06 +00:00
committed by Android (Google) Code Review
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 */);
}