Moves layout code from java files to layout xml

Test: manual ui verification
Change-Id: I7d15dc1a25845741c3d165f3f1d33cee2c2d4514
3 files changed