Correct padding for status bar icons

4dp is used in AOSP.

Change-Id: I7f97cb9feabe267c67722d600d0891ab2ce1a907
Merge "Correct padding for status bar icons" into cm-10.2
PieInputFilter: Fix the check for the input device type

input sources are composites with all the supported capabilities,
not direct representations of the hardware.
A touchscreen with gesture or stylus capabilities will be a
TOUCHSCREEN|GESTURE, for example, and fail this check. Fix it.

Change-Id: Ib3a5b27be9f461245c6d010e1a7f454e9284437f
Merge "PieInputFilter: Fix the check for the input device type" into cm-10.2
Merge remote-tracking branch 'cm/cm-10.2' into cm-10.2

Conflicts:
	services/java/com/android/server/pie/PieInputFilter.java

Change-Id: I67c81cc01bb57eaf601f9256efbbca17bb8b684f
Merge remote-tracking branch 'sgt7/cm-10.2' into cm-10.2-sgt7