Settings: Add proximity wake-up toggle

Change-Id: I2f2449eb324f61b2f7a93acd91b99f144930e66e
Merge pull request #10 from vedantgp/kitkat

Settings: Add proximity wake-up toggle
Add Device Maintainer to Settings > About

Also change a couple pa_* strings to venture_*

Change-Id: I7d0dfb765b0572d9b50ab9c305dbd0863768315d
updated KEY_VENTUREOTA in place of KEY_PARANOIDOTA
Update DeviceInfoSettings.java
Merge pull request #11 from atomicspaceindian/kitkat

OTA fix to Venture
Implement Dynamic System Bars [2/2]

This commit implements DSB. Simple as that.

All the changes:
- frameworks/base (I3bc7102b2139fd1fa3de22aac096bd2a75bde878)
- packages/apps/Settings (Id2b105dfb3faf3cad74d0fa0dc33d01f6b71a853)

Change-Id: Id2b105dfb3faf3cad74d0fa0dc33d01f6b71a853
Merge pull request #12 from atomicspaceindian/kitkat

Implement Dynamic System Bars [2/2]
Fix "About Phone" crash

Change-Id: I25293372b9b8f92be3e95639a6f2a9512d00143a
Fix "System Update" opening wrong activity

Change-Id: I76ac39b47eb607845d70eff34d7b43a78cb4848a
Wifi notifications: notify when wifi connects [2/2]

Parent:     2b789ae1 (Revert "remove disable navkeys option")
Author:     PrimeDirective <activethrasher00@gmail.com>
AuthorDate: 2014-10-10 12:15:25 -0400
Commit:     PrimeDirective <activethrasher00@gmail.com>
CommitDate: 2014-10-16 19:01:04 -0400

Wifi notifications: notify when wifi connects [2/2]

Options:
  off (default)
  a dry white toast
  a notification
  a notification with a sound

For those of us that survive on wifi islands in small college towns this is
a nice addition

The first notification will be canceled if it happens within 30 seconds of
ACTION_BOOT_COMPLETED to help prevent startup notification spamming. 5 of the
previous connections are stored and it will update the content description
accordingly if you've reconnected to one
Replace mContext with getActivity()
Merge pull request #1 from p0isonra1n/kitkat

Replace mContext with getActivity()
Allow settings to open straight to updates [2/2]

Change-Id: I534ed2cc5a9dc0c41d9a83f5c08c528a7d7298ad
Merge pull request #13 from atomicspaceindian/kitkat

Wifi notifications: notify when wifi connects [2/2]
Update legacy with latest commits

Conflicts:
	res/values/venture_strings.xml
	res/xml/display_settings.xml
	src/com/android/settings/DeviceInfoSettings.java
	src/com/android/settings/DisplaySettings.java
	src/com/android/settings/wifi/AdvancedWifiSettings.java

Change-Id: I8405b912bb29f76c4c843d5ac5a33033a5d51ffa
Catch up

Conflicts:
	res/values/venture_strings.xml
	res/xml/display_settings.xml

Change-Id: I87425c6cfd534a2f8e3798c82e72e06aa0e6a8b5