summaryrefslogtreecommitdiffstats
path: root/policy
Commit message (Expand)AuthorAgeFilesLines
* Merge "Making KeyguardView slippery fixes 5501105"Steven Ross2011-11-141-0/+1
|\
| * Making KeyguardView slippery fixes 5501105Steven Ross2011-11-141-0/+1
* | am 3dd55677: am ff95f657: Merge "Fix 5579440: Add transport control view to t...Jim Miller2011-11-141-2/+8
|\ \ | |/ |/|
| * Fix 5579440: Add transport control view to tablet unlock screensJim Miller2011-11-141-2/+8
* | am 8f45e3e2: am be425cce: Merge "Fix issue #5522658: Menu button shown on loc...Dianne Hackborn2011-11-111-39/+12
|\ \ | |/
| * Merge "Fix issue #5522658: Menu button shown on lock screen if app underneath...Dianne Hackborn2011-11-111-39/+12
| |\
| | * Fix issue #5522658: Menu button shown on lock screen if app underneath reques...Dianne Hackborn2011-11-101-39/+12
* | | am 71ed608e: am 88089ccc: Merge "Wake on volume key when in dock. Bug: 558037...Jeff Brown2011-11-102-5/+18
|\ \ \ | |/ /
| * | Merge "Wake on volume key when in dock. Bug: 5580373" into ics-mr1Jeff Brown2011-11-102-5/+18
| |\ \ | | |/ | |/|
| | * Wake on volume key when in dock.Jeff Brown2011-11-102-5/+18
* | | am 8eac3b2f: am 0f70e482: Merge "Fix issue #5470311: Activity with android:co...Dianne Hackborn2011-11-101-1/+7
|\ \ \ | |/ /
| * | Merge "Fix issue #5470311: Activity with android:configChanges defined..." in...Dianne Hackborn2011-11-101-1/+7
| |\ \
| | * | Fix issue #5470311: Activity with android:configChanges defined...Dianne Hackborn2011-11-101-1/+7
| | |/
* | | am 5943c1dc: am 270826a8: Merge "Fix 5555408: allow emergency button to be di...Jim Miller2011-11-103-15/+31
|\ \ \ | |/ /
| * | Merge "Fix 5555408: allow emergency button to be disabled on SIM/PUK unlock s...Jim Miller2011-11-093-15/+31
| |\ \ | | |/ | |/|
| | * Fix 5555408: allow emergency button to be disabled on SIM/PUK unlock screenJim Miller2011-11-073-15/+31
| * | am 04217efb: Merge "Fix 5514230: preventing null window token from occurring"...Brian Colonna2011-11-091-27/+27
| |\ \
* | \ \ am 0816b0c8: am bc0b010e: Merge "Handle EXTRA_DOCK_STATE_LE_DESK and HE_DESK....Jeff Brown2011-11-091-2/+6
|\ \ \ \
| * \ \ \ am bc0b010e: Merge "Handle EXTRA_DOCK_STATE_LE_DESK and HE_DESK. Bug: 5569662...Jeff Brown2011-11-091-2/+6
| |\ \ \ \ | | |/ / /
| | * | | Handle EXTRA_DOCK_STATE_LE_DESK and HE_DESK.Jeff Brown2011-11-081-2/+6
* | | | | am e64022ca: am ea50748b: Merge "Change slide-to-camera intent to INTENT_ACTI...Wei Huang2011-11-091-3/+5
|\ \ \ \ \ | |/ / / /
| * | | | am ea50748b: Merge "Change slide-to-camera intent to INTENT_ACTION_STILL_IMAG...Wei Huang2011-11-091-3/+5
| |\ \ \ \ | | |/ / /
| | * | | Merge "Change slide-to-camera intent to INTENT_ACTION_STILL_IMAGE_CAMERA." in...Wei Huang2011-11-081-3/+5
| | |\ \ \ | | | |_|/ | | |/| |
| | | * | Change slide-to-camera intent to INTENT_ACTION_STILL_IMAGE_CAMERA.Wu-cheng Li2011-11-081-3/+5
* | | | | resolved conflicts for merge of 7cf1eeb9 to masterBrian Colonna2011-11-091-28/+28
|\ \ \ \ \ | |/ / / /
| * | | | am 04217efb: Merge "Fix 5514230: preventing null window token from occurring"...Brian Colonna2011-11-081-27/+27
| |\ \ \ \ | | |/ / / | |/| | / | | | |/ | | |/|
| | * | Fix 5514230: preventing null window token from occurringBrian Colonna2011-11-071-27/+27
* | | | am 4d8ecc65: Merge "Fix 5231823: PIN/Password polish on lock screen" into ics...Jim Miller2011-11-071-0/+16
|\ \ \ \ | |/ / /
| * | | Merge "Fix 5231823: PIN/Password polish on lock screen" into ics-mr1Jim Miller2011-11-071-0/+16
| |\ \ \ | | |_|/ | |/| |
| | * | Fix 5231823: PIN/Password polish on lock screenJim Miller2011-11-041-0/+16
* | | | am 1f42a3db: Merge "Bring back Android Dreams." into ics-mr1Daniel Sandler2011-11-031-55/+43
|\ \ \ \ | |/ / /
| * | | Bring back Android Dreams.Daniel Sandler2011-11-021-55/+43
| |/ /
* | | am 22726020: am 1dce37bd: Merge "Fix 5497305: Make sure we show SIM unlock wh...Jim Miller2011-11-021-3/+3
|\ \ \ | |/ /
| * | am 1dce37bd: Merge "Fix 5497305: Make sure we show SIM unlock when "None" is ...Jim Miller2011-11-011-3/+3
| |\ \ | | |/
| | * Fix 5497305: Make sure we show SIM unlock when "None" is selectedJim Miller2011-10-311-3/+3
* | | am 18936d7d: am 69e640ee: Merge "Bring back the old-style Ring/Vibrate/Silent...Amith Yamasani2011-10-311-2/+1
|\ \ \ | |/ /
| * | am 69e640ee: Merge "Bring back the old-style Ring/Vibrate/Silent states when ...Amith Yamasani2011-10-301-2/+1
| |\ \ | | |/
| | * Bring back the old-style Ring/Vibrate/Silent states when using volume keys.Amith Yamasani2011-10-281-2/+1
* | | am c1a1cca8: Merge "Fix 5487180: Check for empty plmn/spn strings instead of ...Jim Miller2011-10-281-4/+6
|\ \ \ | |/ /
| * | Merge "Fix 5487180: Check for empty plmn/spn strings instead of just null" in...Jim Miller2011-10-281-4/+6
| |\ \
| | * | Fix 5487180: Check for empty plmn/spn strings instead of just nullJim Miller2011-10-271-4/+6
| | |/
* | | am 11bfc0c4: Merge "Fix 5369428: Use full battery state information when dete...Jim Miller2011-10-271-44/+59
|\ \ \ | |/ /
| * | Merge "Fix 5369428: Use full battery state information when determining charg...Jim Miller2011-10-261-44/+59
| |\ \ | | |/ | |/|
| | * Fix 5369428: Use full battery state information when determining charge statusJim Miller2011-10-261-44/+59
* | | am 6e03b220: am d887377a: Merge "Fix power key handling after volume change. ...Bart Sears2011-10-261-1/+3
|\ \ \ | |/ /
| * | Merge "Fix power key handling after volume change. Bug: 5497716" into ics-mr0Bart Sears2011-10-261-1/+3
| |\ \ | | |/ | |/|
| | * Fix power key handling after volume change.Jeff Brown2011-10-251-1/+3
| |/ |/|
| * Fix 5479823: black patch was showing before resuming callBrian Colonna2011-10-241-4/+5
|/
* Merge "Added callback to allow Face Unlock to hide black area" into ics-mr0Brian Colonna2011-10-241-0/+7
|\
| * Added callback to allow Face Unlock to hide black areaBrian Colonna2011-10-241-0/+7