User defined wifi/usb tether network. [2/2]

Enables users to select from a list of predefined networks
for use as the tether network, overriding the built-in networks.
This is useful, for example, where OpenVPN is in use with
routed setup.

Conflicts:
	res/values/custom_arrays.xml
	res/values/custom_strings.xml

Change-Id: I24749a28662e160c60ae7fa07b4c6542d82cdf7f
Merge "User defined wifi/usb tether network. [2/2]" into kitkat3
SlimPIE: Configurable sensitivity [2/2]

Signed-off-by: Lokesh Chamane <lokesh.c703@gmail.com>

Conflicts:

	res/values/pac_strings.xml

Change-Id: I7263f1bd9e627c91cbad5dfb8211514ec7059724
Settings : Make proximity opt-in

Conflicts:
	src/com/android/settings/DisplaySettings.java

Change-Id: I348de6b0254b5d1f95a9fc679cd8740e96c36be5
Revert "Settings: Slimrecents background color && transparency [1/2]"

This reverts commit d818bfad2332378da66e07e628ecf1ca6e351729.

Conflicts:
	src/com/android/settings/liquid/RecentPanelSettings.java

Change-Id: Ie98d41861e80c876a252ec782c4eb7f5c3452d5c
Merge "Revert "Settings: Slimrecents background color && transparency [1/2]"" into kitkat3
Merge "SlimPIE: Configurable sensitivity [2/2]" into kitkat3
Not sure how this string got lost...

Change-Id: I5bcdd77a13268d74cd6d085e1ee326c699763432
Lets use correct liquid black out icon

Change-Id: Id00d216031628a6bdc0f507ce44e175ff7327634
Merge "Lets use correct liquid black out icon" into kitkat3
Settings: Slimrecents background color && transparency [1/2]

Allow user to specify background color and transparency level
    for the slimrecents panel.

PS: now setting sticks through reboots and TRDS state
        changes. also, add reset to default color option.

PS: when resetting to default, use TRDS (png) resources
        instead of custom color

NOT USED FOR Liquid -> PS: properly set preference summary for default
        value ("TRDS default")

PS: remove LSN dependency

Conflicts:
	res/xml/recent_panel_settings.xml
	src/com/android/settings/liquid/RecentPanelSettings.java

Change-Id: I5c9fe11553bfce184e66b24ac76360e048bc7f0f
Move Dark UI into themes

Based on Alex Cruz's commit on DU

Change-Id: Ifeb8e407ff4dae377fa84691ee7f6affec14da77
Merge "Move Dark UI into themes" into kitkat3
Revert "Settings : Make proximity opt-in"

This reverts commit eedd9183ff2635804852579825f54bf8d7308b5d.

Change-Id: I5c16f80501b3b1a54c02b790df2f4d3a83675ba9
Merge "Revert "Settings : Make proximity opt-in"" into kitkat3
Fix missing backgroud color declaration

Change-Id: If6d22941af8f870e6f6242a458381cea85623a12
Merge "Fix missing backgroud color declaration" into kitkat3
Fix status bar network traffic default color

Change-Id: I60d2364a4e4603e95dd6b9a2e4db296809e74fef
Revert "Move Dark UI into themes"

This reverts commit 1f9fb5c22a32ef5da2074d875347573d650510e9.

Change-Id: I7526aad9b9c265d2b5242a080e926d4dab48ae45
Merge pull request #21 from LiquidSmooth/kitkat3

merge latest liquid changes