summaryrefslogtreecommitdiffstats
path: root/policy
Commit message (Expand)AuthorAgeFilesLines
* am 834c2870: am fed7a99a: Merge "Quick fix for bug 5646217 blocking automatio...Daniel Sandler2011-11-291-0/+9
|\
| * Quick fix for bug 5646217 blocking automation testsDaniel Sandler2011-11-231-0/+9
* | am 70f1279e: am 63188574: Merge "Dismiss system windows when screen savers st...Daniel Sandler2011-11-221-0/+5
|\ \ | |/
| * Dismiss system windows when screen savers start.Daniel Sandler2011-11-181-0/+5
* | am 25a43ada: am 9b5d7a59: Merge "Dreams (now Screen Candy) development." into...Daniel Sandler2011-11-191-9/+15
|\ \ | |/
| * Dreams (now Screen Candy) development.Daniel Sandler2011-11-181-9/+15
* | am 2e56995e: am da0e7b0c: Merge "Tie screen saver to the screen off timeout."...Daniel Sandler2011-11-181-4/+44
|\ \ | |/
| * Merge "Tie screen saver to the screen off timeout." into ics-mr1Daniel Sandler2011-11-171-4/+44
| |\
| | * Tie screen saver to the screen off timeout.Daniel Sandler2011-11-171-4/+44
* | | resolved conflicts for merge of 1a783be3 to masterJim Miller2011-11-183-4/+13
|\ \ \ | |/ /
| * | Merge "Fix 5636798: clear PIN/PUK fields when device sleeps or user cancels" ...Jim Miller2011-11-173-4/+13
| |\ \
| | * | Fix 5636798: clear PIN/PUK fields when device sleeps or user cancelsJim Miller2011-11-173-4/+13
* | | | am a8606cf6: am 398f80ea: Merge "Fix 5620754: don\'t show pattern screen afte...Jim Miller2011-11-183-42/+58
|\ \ \ \ | |/ / /
| * | | Merge "Fix 5620754: don't show pattern screen after SIM PUK unlock" into ics-mr1Jim Miller2011-11-173-42/+58
| |\ \ \ | | |_|/ | |/| |
| | * | Fix 5620754: don't show pattern screen after SIM PUK unlockJim Miller2011-11-173-42/+58
| | |/
* | | am 7fd3ba91: am d5decdcc: Merge "Disable desk dock apps." into ics-mr1Daniel Sandler2011-11-171-6/+25
|\ \ \ | |/ /
| * | Merge "Disable desk dock apps." into ics-mr1Daniel Sandler2011-11-161-6/+25
| |\ \
| | * | Disable desk dock apps.Daniel Sandler2011-11-161-6/+25
* | | | am 8b9ba6fa: am f52a4482: Merge "Add a default Dreams component." into ics-mr1Daniel Sandler2011-11-171-0/+3
|\ \ \ \ | |/ / /
| * | | Merge "Add a default Dreams component." into ics-mr1Daniel Sandler2011-11-161-0/+3
| |\ \ \ | | |/ / | | | / | | |/ | |/|
| | * Add a default Dreams component.Daniel Sandler2011-11-151-0/+3
* | | Not showing facelock when plugging/unplugging fixes 5438524Steven Ross2011-11-161-3/+15
* | | am 8622fb34: am 34a62348: Merge "Fix 5581164: Use abbreviated day in lockscre...Jim Miller2011-11-151-1/+1
|\ \ \ | |/ /
| * | Merge "Fix 5581164: Use abbreviated day in lockscreen" into ics-mr1Jim Miller2011-11-151-1/+1
| |\ \
| | * | Fix 5581164: Use abbreviated day in lockscreenJim Miller2011-11-141-1/+1
* | | | Merge "No blackscreen when dialog is showing fixes 5511992"Steven Ross2011-11-151-3/+9
|\ \ \ \
| * | | | No blackscreen when dialog is showing fixes 5511992Steven Ross2011-11-151-3/+9
* | | | | am 390811b8: am b35a21f9: Merge "Fix 5602985: Show "Emergency calls only" whe...Jim Miller2011-11-151-0/+7
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge "Fix 5602985: Show "Emergency calls only" when device has no SIM." into...Jim Miller2011-11-151-0/+7
| |\ \ \ \
| | * | | | Fix 5602985: Show "Emergency calls only" when device has no SIM.Jim Miller2011-11-141-0/+7
| | | |/ / | | |/| |
* | | | | am d3b98329: am d5713179: Merge "Override app requested orientation when dock...Jeff Brown2011-11-151-10/+21
|\ \ \ \ \ | |/ / / /
| * | | | Override app requested orientation when docked.Jeff Brown2011-11-151-10/+21
| | |_|/ | |/| |
* | | | POWER key is always a wake key.Jeff Brown2011-11-151-4/+7
| |_|/ |/| |
* | | 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
| |\ \