summaryrefslogtreecommitdiffstats
path: root/policy
Commit message (Expand)AuthorAgeFilesLines
* resolved conflicts for merge of 27b0373f to masterJean-Baptiste Queru2010-01-281-6/+22
|\
| * am 36a6ec17: Merge "Update carrier display in lockscreen." into eclairJohn Wang2010-01-221-6/+22
| |\
| | * Merge "Update carrier display in lockscreen." into eclairJohn Wang2010-01-221-6/+22
| | |\
| | | * Update carrier display in lockscreen.John Wang2010-01-211-6/+22
* | | | resolved conflicts for merge of f05f7ab1 to masterJean-Baptiste Queru2010-01-281-2/+2
|\ \ \ \ | |/ / /
| * | | am ccd5aeef: Workaround for a keyguard problem that appeared in the in call s...Mike Lockwood2010-01-211-2/+2
| |\ \ \ | | |/ /
| | * | Workaround for a keyguard problem that appeared in the in call screen.Mike Lockwood2010-01-211-2/+2
| | |/
* | | resolved conflicts for merge of 73f1d8e4 to masterJean-Baptiste Queru2010-01-281-0/+34
|\ \ \ | |/ /
| * | am a3b4a811: Merge "Fix for 2292713: Remove workaround that hides SlidingTab ...Jim Miller2010-01-211-2/+36
| |\ \ | | |/
| | * Merge "Fix for 2292713: Remove workaround that hides SlidingTab widget while ...Jim Miller2010-01-151-2/+36
| | |\
| | | * Fix for 2292713: Remove workaround that hides SlidingTab widget while interna...Jim Miller2010-01-151-2/+36
* | | | Merge "Fix 2385283,2379269: report unlock attempt success/fail to DevicePolic...Jim Miller2010-01-275-17/+48
|\ \ \ \
| * | | | Fix 2385283,2379269: report unlock attempt success/fail to DevicePolicyManagerJim Miller2010-01-275-17/+48
* | | | | am 44f9f23e: merge from open-source masterThe Android Open Source Project2010-01-271-1/+1
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | merge from open-source masterThe Android Open Source Project2010-01-211-1/+1
| |\ \ \ | | |/ / | |/| |
| | * | Added missing media keycode (KEYCODE_MEDIA_REWIND), removed duplicate keycode...Johan Redestig2010-01-051-1/+1
| | * | eclair snapshotJean-Baptiste Queru2009-11-1214-834/+1715
* | | | am 5fdf6a91: am 5b2151ae: Do not turn off screen immediately after undocking.Mike Lockwood2010-01-211-1/+1
|\ \ \ \ | |/ / /
| * | | Do not turn off screen immediately after undocking.Mike Lockwood2010-01-141-1/+1
| | |/ | |/|
* | | Fix 2385283: Add DevicePolicyManager calls to LockScreen.Jim Miller2010-01-201-28/+26
* | | Fix 2332563: Add password-lock support to lockscreenJim Miller2010-01-115-24/+316
* | | Deprecate fill_parent and introduce match_parent.Romain Guy2010-01-083-13/+10
* | | am a6946bde: am 27517b21: Still use ro.monkeyYing Wang2010-01-061-1/+1
|\ \ \ | |/ /
| * | Still use ro.monkeyYing Wang2010-01-061-1/+1
* | | Merge "Fix 2338170: Fix a bug where adding a SAML account would cause the fal...Jim Miller2010-01-041-12/+17
|\ \ \
| * | | Fix 2338170: Fix a bug where adding a SAML account would cause the fallback u...Jim Miller2009-12-221-12/+17
* | | | am 596a4233: am 4d3a9728: Rename ro.monkey to monkey.runningYing Wang2010-01-041-1/+1
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Rename ro.monkey to monkey.runningYing Wang2010-01-041-1/+1
* | | Don't perform app transition if app is not currently visible.Dianne Hackborn2009-12-211-3/+43
* | | Add replace flag to a few more broadcasts.Dianne Hackborn2009-12-112-0/+2
* | | Prevent NPE in recent apps dialog.Daniel Sandler2009-12-081-2/+5
* | | Move emergency call button to top-right when no SIM.Daniel Sandler2009-12-071-21/+41
* | | am 4dbf514c: Fix issue #2302336: System dialogs are not being given a layerDianne Hackborn2009-12-031-11/+14
|\ \ \ | |/ /
| * | Fix issue #2302336: System dialogs are not being given a layerDianne Hackborn2009-12-031-11/+14
* | | am db0ec648: Merge change I85572973 into eclairMike Lockwood2009-12-031-2/+5
|\ \ \ | |/ /
| * | Merge change I85572973 into eclairAndroid (Google) Code Review2009-12-031-2/+5
| |\ \
| | * | Do not show keyguard if screen is turned off by proximity sensor.Mike Lockwood2009-12-031-2/+5
* | | | am 30429ac6: Tiny code fix required for http://b/2260798 .Daniel Sandler2009-12-031-1/+1
|\ \ \ \ | |/ / /
| * | | Tiny code fix required for http://b/2260798 .Daniel Sandler2009-12-031-1/+1
| |/ /
* | | am 15ee33d4: Revert "Fix problems with KeyguardManager.exitKeyguardSecurely()...Mike Lockwood2009-12-021-23/+7
|\ \ \ | |/ /
| * | Revert "Fix problems with KeyguardManager.exitKeyguardSecurely() and the FLAG...Mike Lockwood2009-12-021-23/+7
* | | am e7ef4241: Fix volume keys when in-call and screen is off due to proximity ...Mike Lockwood2009-12-021-6/+3
|\ \ \ | |/ /
| * | Fix volume keys when in-call and screen is off due to proximity sensor.Mike Lockwood2009-12-021-6/+3
* | | am b684251e: Fix problems with KeyguardManager.exitKeyguardSecurely() and the...Mike Lockwood2009-12-021-7/+23
|\ \ \ | |/ /
| * | Fix problems with KeyguardManager.exitKeyguardSecurely() and the FLAG_SHOW_WH...Mike Lockwood2009-12-021-7/+23
* | | resolved conflicts for merge of b64c72df to eclair-mr2Mike Lockwood2009-12-011-4/+10
|\ \ \ | |/ /
| * | Fix bug 2290852: Screen wakes up in my pocket while listening to musicMike Lockwood2009-11-281-4/+10
* | | Remove some unused window manager methods.Mike Lockwood2009-11-281-2/+1
* | | am 760d266a: Merge change I9987ba41 into eclairJim Miller2009-11-243-24/+60
|\ \ \ | |/ /
| * | Merge change I9987ba41 into eclairAndroid (Google) Code Review2009-11-243-24/+60
| |\ \
generated by cgit v1.1 at 2024-09-10 15:32:02 +0000