Using the new contract for some systemUI constants

Change-Id: I1a0351bc9b1ac5b8fe866a92c1bda93126189543
3 files changed