Merge "Framework: Use the proper context when creating Bug report dialog" into mr1-staging
migrate vibrator to silent mode settings (1/2)

Change profiles:
* remove deprecated vibrator settings
* add silent mode settings

Available modes:
* off
* vibrate
* silent

Patch Set 1:
Initial patch with plain ListPreference

Patch Set 2:
Use Checkbox + Dialog like ConnectionSettings

Patch Set 3:
Fix code style

Change-Id: Ic5ec3486070866b7358f843a0843ccd0753e8c72
Merge "Samsung STK support" into mr1-staging
Merge "migrate vibrator to silent mode settings (1/2)" into mr1-staging
Framework : Lockscreen - Customizable shortcuts

Patchset 1 : Initial port
Patchset 2 : Disable magneticTargets
Patchset 3 : Disable firstOffset
Patchset 4-5 : Cherry pick 10.0 commits

---------------- Squashed Commits ------------------

Allow users to choose lockscreen shortcuts / icons :
	Phone - 1-5 targets
	Tablets - 1-8 targets

CM10 port
---------
Patchset 1-8: Initial port
Patchset 9  : Revert to CM9 drawables
Patchset 10 : Rebase

Change-Id: I9b163efeef8f47b1d21f7f61552ebe424049cfeb

Fix all upscaled lockscreen drawables and add a few

Several of the original CM9 drawables were upscaled
from a lower quality source. I rescaled some from the
originals and recreated the missing ones in vector
format plus added some new ones.

Change-Id: I112c35cf087daf0679a12bdad89258121dedeb0c

Lockscreen : Update camera availability check
Make the default availability of the target dependant on the
availability of a camera rather than the presense of a predefined resource.

Also update .Camera to .CameraLauncher since that is what we default too.

Change-Id: Ib3f06cc76fb7f7df20ec632051d5dbe754a9c69e

LockscreenShortcuts : Fix minor bugs

Fixes :

      - Inability to have contacts/direct dials..etc on lockscreen (http://goo.gl/BKEJs)
      - Multiple activities of same type on stack.

Change-Id: I6c2c3e1c87239267601d78eb38778d0388f4a41c

Lockscreen : Fix blank target highlight

Mismatched file/image.

Change-Id: I7cd898646124114a855d0fc1589251cbc6fc72fa

----------------------------------------------------

Change-Id: I9b163efeef8f47b1d21f7f61552ebe424049cfeb
Framework: Remove orphaned Theme related code

Change-Id: I930d4cc75e655c5bc37532e6a1425d27bd1ee661
Forward port CM Screen Security settings (Part 2 of 2)

Patch Set 1:	Quick Unlock
Patch Set 2:	Lockscreen Vibrate
Patch Set 3:	Slide Lock Delay
Patch Set 4:	Menu Unlock
Patch Set 5:    Rebase
Patch Set 6:    Home Unlock

Change-Id: Ie1ccaec43ca75474e92f96c60e15d7b75796ac5f
docs: Merged commits for final release of IABv3 docs.

Change-Id: Ib7c26052bb1b4de9a44d78817d7012839eaa953a
keyguard: fix layout for 320dp devices

800x480px dpi devices have less screen space than the xhdpi devices
Google designed the layout for and the layout needs adjustment.

- Reduce the lockscreen security container size such that the clock
  widget has enough space to display its content.
- In the SIM PIN/PUK view, Google put an empty widget on top, but
  we don't have space for that, increase its size such that the
  widget practically disappears.

This should not have any effect on devices with larger screens.

Change-Id: I9e811cfd312abae24a9cad189d19e73848f6c4c1
am 768dba6d: docs: Merged commits for final release of IABv3 docs.

* commit '768dba6d8cd6ad56fb6d4e7e30b3260e0d5e0ffd':
  docs: Merged commits for final release of IABv3 docs.
CidBean : Changes to toggle between CID and Jellybean

Based on Robert Burns commit from 10.0

Patchset 2 : Remove unused imports
Patchset 3 : Format cleanup

Change-Id: I2827425681463d4ca077607cb6a043c28bf6f633
WebSettings: Add ro.cm.version to default user agent.

Change-Id: Ic14a1626ab7bec26297e2041bdcfb26ca7b3a440
SystemUI: HSPA+ Support

Add the ability to recognize HSPA+ by creating a separate case for HSPAP and
include new H+ icons.

Signed-off-by: Bajee11 <bajee11@gmail.com>
Change-Id: I889a28e4b4cb49862b291641df5a00388db87551
core and telephony: Additional HSPAP support

Change-Id: I5e921d2308d873678d6ef67a91cff50d383a176b
Import translations. DO NOT MERGE

Change-Id: I7bae78f78c7b112e6084791607023cc6154efa27
Auto-generated-cl: translation import
Profiles: Airplanmode Settings with Checkbox (1/2)

Change Airplanemode Settings to look like Connection/SilentMode etc.

Change-Id: Ic340c4eac22b1c94dd5f7a94a9608e98c76a0e98
docs: Edit fixes for IABv3 docs.

Change-Id: I20228491c90d05a39ce44f80aa1a065ce60c31e3
am 9d7578c7: docs: Edit fixes for IABv3 docs.

* commit '9d7578c73afa69272dcf9476ae3eefc2b59d6778':
  docs: Edit fixes for IABv3 docs.
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
Fallback to default dream if the current dream is removed.

To minimize fix size, return only valid dreams from the service api.

Settings will "just work" with no changes.

Bug:7699398
Change-Id: I3eb88237a8ccc421fdb68d1de19820614b13d7b8