This reverts commit 0263a679f2.
Reason for revert: Trying again to confirm if this was the actual cause of regression
Change-Id: I2a663015d7ecdcf315634d8a976bf8294b58981d
be easily modularized
> Moving the color configuration to xml
> Moving auto-hide logic to a subclass as it doesn't
need to be in the main library
Bug: 274011949
Test: Verified on device
Change-Id: Icf7bd5d1cbde3daa9441f2af51f98a931bcd6ee2