TextView refactoring to ease future merges in HC.

Change-Id: I979324b28fa4ca787e5836271c9014bca590c595
1 file changed