Merge "Refactored code so fab side button scaling makes more sense." into ub-deskclock-fantasy
am: 430ad6063c

* commit '430ad6063c853f264e901a715df0329e9aee06e0':
  Refactored code so fab side button scaling makes more sense.

Change-Id: If30fe7ff476e49d783dea6d08d9555d7656cf15c