Merge "Register statusbar actions only if CentralSurfaces is available" into tm-qpr-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
c0db1ff3d1
@@ -291,8 +291,11 @@ public class SystemActions implements CoreStartable {
|
|||||||
mA11yManager.registerSystemAction(actionBack, SYSTEM_ACTION_ID_BACK);
|
mA11yManager.registerSystemAction(actionBack, SYSTEM_ACTION_ID_BACK);
|
||||||
mA11yManager.registerSystemAction(actionHome, SYSTEM_ACTION_ID_HOME);
|
mA11yManager.registerSystemAction(actionHome, SYSTEM_ACTION_ID_HOME);
|
||||||
mA11yManager.registerSystemAction(actionRecents, SYSTEM_ACTION_ID_RECENTS);
|
mA11yManager.registerSystemAction(actionRecents, SYSTEM_ACTION_ID_RECENTS);
|
||||||
|
if (mCentralSurfacesOptionalLazy.get().isPresent()) {
|
||||||
|
// These two actions require the CentralSurfaces instance.
|
||||||
mA11yManager.registerSystemAction(actionNotifications, SYSTEM_ACTION_ID_NOTIFICATIONS);
|
mA11yManager.registerSystemAction(actionNotifications, SYSTEM_ACTION_ID_NOTIFICATIONS);
|
||||||
mA11yManager.registerSystemAction(actionQuickSettings, SYSTEM_ACTION_ID_QUICK_SETTINGS);
|
mA11yManager.registerSystemAction(actionQuickSettings, SYSTEM_ACTION_ID_QUICK_SETTINGS);
|
||||||
|
}
|
||||||
mA11yManager.registerSystemAction(actionPowerDialog, SYSTEM_ACTION_ID_POWER_DIALOG);
|
mA11yManager.registerSystemAction(actionPowerDialog, SYSTEM_ACTION_ID_POWER_DIALOG);
|
||||||
mA11yManager.registerSystemAction(actionLockScreen, SYSTEM_ACTION_ID_LOCK_SCREEN);
|
mA11yManager.registerSystemAction(actionLockScreen, SYSTEM_ACTION_ID_LOCK_SCREEN);
|
||||||
mA11yManager.registerSystemAction(actionTakeScreenshot, SYSTEM_ACTION_ID_TAKE_SCREENSHOT);
|
mA11yManager.registerSystemAction(actionTakeScreenshot, SYSTEM_ACTION_ID_TAKE_SCREENSHOT);
|
||||||
|
|||||||
Reference in New Issue
Block a user