Merge commit 'b2dd90383bae9f3ca0a99b59d3f5992e7fd5ad48' into HEAD

* commit 'b2dd90383bae9f3ca0a99b59d3f5992e7fd5ad48':
  Settings: Add a hook for operator or vendor specific settings.

Conflicts:
	tests/res/values/strings.xml
Implemented a modified AppWidgetPicker dialogue.

Change-Id: I8f0a0956ab473392ff36ed88abf4bafa8771dc92
Add Modver to Settings.

Change-Id: Iac0efaba3de5629e093bd22717eb38f30f3dd99b
Allow moving any application to external storage
Settings: Port internal memory info from CM-froyo

This is a simple port of two prior patches:

    commit e92eededd226b43e8384aed5f257bb0532e6178b
    Settings: Display information about an additional volume

    commit 345ef9e44863a80110b0f5e14c3ba0e78b27b2ee
    Settings: Build internal memory info dynamically

Change-Id: Id74ae734a8debe88ee3207b19e316dee4956587c
Signed-off-by: Josh Stone <cuviper@gmail.com>
Add mount/unmount/format options for removable mounts to Settings -> Storage.

Change-Id: Ic3a5e236b65de1ccc3c797b36b1b539e6cf9c0d4
Hide system update entry in settings

Change-Id: Ic059a54971d4b067fd37aedcece5bdfe9466533a
Merge OxySettings
Kill foreground process by long-pressing BACK

This patch allows the user to force the running foreground application to be
killed. One example use case for this is applications which trap buttons,
leaving the user stuck. Another would be a memory-heavy application that
traps the BACK button (so the user wouldn't want to leave it in memory by
pressing HOME). Browser is a good example of this second use case.

Change-Id: Idd916a670c0c9051195c6fee5b5779c825e8a71f
Use new icons by iiro
Allow user to choose internal storage

Limited to devices that allow it (by presence of the ro.vold.switchablepair property).
settings: allow device specific settings menu
OxygenSettings updates
Added option to turn off volume button music controls
Hide indic. by default