code frozen of weekend.

Change-Id: Ic5afb081a7eb7f786e0325ef87ce33fdb1b7af8f
Signed-off-by: Sharl <amoiz.shine@gmail.com>
fix a bit of NullPointerException.

Change-Id: I949de6d58edc61a2f30c0c4276ac07b6ca8a7c85
Signed-off-by: Sharl <amoiz.shine@gmail.com>
UI improvements.

Change-Id: I1dbd64738d6e7dcc5a3cdda69c287379dc87ce9f
Signed-off-by: Sharl <amoiz.shine@gmail.com>