Support loading keyboard layout overlays from resources.
Added the concept of a keyboard layout overlay, which is a key character map file that has "type OVERLAY". Added support for loading keyboard layout overlays from resources dynamically. The layouts are reloaded whenever they are changed in the Settings application or an application is installed. This is somewhat more aggressive than necessary so we might want to optimize it later. Before system-ready, the input system uses just the generic keyboard layouts that are included on the device system image. After system-ready, it considers the user's selected keyboard layout overlay and attempts to load it as necessary. We need to wait until system-ready before doing this because we need to be in a state where it is safe to start applications or access their resources. Bug: 6110399 Change-Id: Iae0886d3356649b0d2440aa00910a888cedd8323
This commit is contained in:
@@ -51,6 +51,7 @@ import com.android.internal.os.SamplingProfilerIntegration;
|
||||
import com.android.internal.widget.LockSettingsService;
|
||||
import com.android.server.accessibility.AccessibilityManagerService;
|
||||
import com.android.server.am.ActivityManagerService;
|
||||
import com.android.server.input.InputManagerService;
|
||||
import com.android.server.net.NetworkPolicyManagerService;
|
||||
import com.android.server.net.NetworkStatsService;
|
||||
import com.android.server.pm.PackageManagerService;
|
||||
@@ -137,6 +138,7 @@ class ServerThread extends Thread {
|
||||
ThrottleService throttle = null;
|
||||
NetworkTimeUpdateService networkTimeUpdater = null;
|
||||
CommonTimeManagementService commonTimeMgmtService = null;
|
||||
InputManagerService inputManager = null;
|
||||
|
||||
// Critical services...
|
||||
try {
|
||||
@@ -224,7 +226,8 @@ class ServerThread extends Thread {
|
||||
factoryTest != SystemServer.FACTORY_TEST_LOW_LEVEL,
|
||||
!firstBoot);
|
||||
ServiceManager.addService(Context.WINDOW_SERVICE, wm);
|
||||
ServiceManager.addService(Context.INPUT_SERVICE, wm.getInputManagerService());
|
||||
inputManager = wm.getInputManagerService();
|
||||
ServiceManager.addService(Context.INPUT_SERVICE, inputManager);
|
||||
|
||||
ActivityManagerService.self().setWindowManager(wm);
|
||||
|
||||
@@ -722,6 +725,7 @@ class ServerThread extends Thread {
|
||||
final TextServicesManagerService textServiceManagerServiceF = tsms;
|
||||
final StatusBarManagerService statusBarF = statusBar;
|
||||
final DreamManagerService dreamyF = dreamy;
|
||||
final InputManagerService inputManagerF = inputManager;
|
||||
|
||||
// We now tell the activity manager it is okay to run third party
|
||||
// code. It will call back into us once it has gotten to the state
|
||||
@@ -833,6 +837,11 @@ class ServerThread extends Thread {
|
||||
} catch (Throwable e) {
|
||||
reportWtf("making DreamManagerService ready", e);
|
||||
}
|
||||
try {
|
||||
if (inputManagerF != null) inputManagerF.systemReady();
|
||||
} catch (Throwable e) {
|
||||
reportWtf("making InputManagerService ready", e);
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
Reference in New Issue
Block a user