Revert "Fix build with java 7"

This reverts commit c430247fc2ab4a17ceee929b2b3502a3460e418e.
Revert "showAlways..."

This reverts commit c41d7779012d7c42fe734772439778f1ded0a273.
HALO: show halo button in pie

Change-Id: I858ec08837559f4b2806df0ac68b8a703189b1db