Fix mismerge of implement 1% battery on select devices

Change-Id: I2dcafba2c39f50cf435b90ca261b325c10fd5b6b
Fix fetching icons from packages.

Change-Id: I857d35bb601425be56b5eb730d63344e1173e4a2
SystemUI: Add ethernet network icon

Add an ethernet network icon to the statusbar network area.

Change-Id: I019740f360b5f9cc85f404f75d38e38896182a81
Signed-off-by: scott <scott@ubuntu.com>

Conflicts:
	packages/SystemUI/src/com/android/systemui/statusbar/SignalClusterView.java
SystemUI: Fix missing context var

Change-Id: I083f85fdfec2bde88e6d8e0366d94e86eaea20cd
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>
Missed something in android.mk
Signed-off-by: scott <scott@ubuntu.com>

Change-Id: I74e28316f9b133ff409d95b1e4f448cb72d11fcf
optional encryption password sync (1/2)

Option to use 2 different tokens for encryption and locking.
Allows convenient usage and strong encryption at the same time.

Inspired by reading next:
https://santoku-linux.com/howto/mobile-forensics/how-to-brute-force-android-encryption

Related discussion:
http://code.google.com/p/android/issues/detail?id=29468

Change-Id: I87f12bb1644f3abcbbd6b23813bbbf2cd58855df
Signed-off-by: Dan Trifan <jimsth@gmail.com>
Signed-off-by: scott <scott@ubuntu.com>

Conflicts:
	core/java/android/provider/Settings.java
	core/java/com/android/internal/widget/LockPatternUtils.java