Merge "Refactoring for better extendability"

author Xiyuan Xia <xiyuan@google.com>

Fri, 15 Jan 2016 17:31:32 +0000 (17:31 +0000)

committer Android (Google) Code Review <android-gerrit@google.com>

Fri, 15 Jan 2016 17:31:32 +0000 (17:31 +0000)
author Xiyuan Xia <xiyuan@google.com>
Fri, 15 Jan 2016 17:31:32 +0000 (17:31 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Fri, 15 Jan 2016 17:31:32 +0000 (17:31 +0000)
diff --cc packages/SystemUI/res/values/config.xml
Simple merge
diff --cc packages/SystemUI/res/values/dimens.xml
Simple merge
diff --cc packages/SystemUI/res/values/strings.xml
Simple merge
diff --cc packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
Simple merge
diff --cc packages/SystemUI/src/com/android/systemui/statusbar/policy/UserSwitcherController.java
Simple merge
author	Xiyuan Xia <xiyuan@google.com>
	Fri, 15 Jan 2016 17:31:32 +0000 (17:31 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Fri, 15 Jan 2016 17:31:32 +0000 (17:31 +0000)
		1	2
packages/SystemUI/res/values/config.xml	patch \|	diff1 \|	diff2 \|	blob \| history
packages/SystemUI/res/values/dimens.xml	patch \|	diff1 \|	diff2 \|	blob \| history
packages/SystemUI/res/values/strings.xml	patch \|	diff1 \|	diff2 \|	blob \| history
packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java	patch \|	diff1 \|	diff2 \|	blob \| history
packages/SystemUI/src/com/android/systemui/statusbar/policy/UserSwitcherController.java	patch \|	diff1 \|	diff2 \|	blob \| history