summaryrefslogtreecommitdiffstats
path: root/policy
Commit message (Expand)AuthorAgeFilesLines
* resolved conflicts for merge of eebc944f to masterJeff Brown2011-01-241-8/+15
|\
| * am aaa55d3f: Merge "New orientation listener." into honeycombJeff Brown2011-01-241-8/+15
| |\
| | * New orientation listener.Jeff Brown2011-01-241-8/+15
* | | resolved conflicts for merge of faf083ef to masterJoe Onorato2011-01-241-2/+41
|\ \ \ | |/ /
| * | am 4c541b13: Merge "visibility ("lights out") API." into honeycombJoe Onorato2011-01-231-2/+41
| |\ \ | | |/
| | * Merge "visibility ("lights out") API." into honeycombJoe Onorato2011-01-231-2/+41
| | |\
| | | * visibility ("lights out") API.Joe Onorato2011-01-231-2/+41
* | | | am b2d7b02c: am 8ccea78c: Merge "Fix bug 3299208 - Some apps\' dialogs aren\'...Adam Powell2011-01-231-9/+4
|\ \ \ \ | |/ / /
| * | | am 8ccea78c: Merge "Fix bug 3299208 - Some apps\' dialogs aren\'t show()ing s...Adam Powell2011-01-231-9/+4
| |\ \ \ | | |/ /
| | * | Merge "Fix bug 3299208 - Some apps' dialogs aren't show()ing successfully" in...Adam Powell2011-01-231-9/+4
| | |\ \
| | | * | Fix bug 3299208 - Some apps' dialogs aren't show()ing successfullyAdam Powell2011-01-231-9/+4
| | | |/
* | | | am 5f1e37a7: am f4180679: Merge "Fix SENSOR_LANDSCAPE and SENSOR_PORTRAIT" in...Jeff Brown2011-01-231-2/+4
|\ \ \ \ | |/ / /
| * | | am f4180679: Merge "Fix SENSOR_LANDSCAPE and SENSOR_PORTRAIT" into honeycombJeff Brown2011-01-231-2/+4
| |\ \ \ | | |/ /
| | * | Fix SENSOR_LANDSCAPE and SENSOR_PORTRAITJeff Brown2011-01-231-2/+4
| | |/
* | | am e744a6b7: am e25c4d10: Merge "Fix 3339257: Update lockscreen keyboard to f...Jim Miller2011-01-191-9/+16
|\ \ \ | |/ /
| * | am e25c4d10: Merge "Fix 3339257: Update lockscreen keyboard to fit Holo theme...Jim Miller2011-01-191-9/+16
| |\ \ | | |/
| | * Merge "Fix 3339257: Update lockscreen keyboard to fit Holo theme" into honeycombJim Miller2011-01-191-9/+16
| | |\
| | | * Fix 3339257: Update lockscreen keyboard to fit Holo themeJim Miller2011-01-191-9/+16
* | | | am fe86e979: am 661b6cfb: Merge "Okay, new plan for dialogs." into honeycombDianne Hackborn2011-01-181-6/+4
|\ \ \ \ | |/ / /
| * | | am 661b6cfb: Merge "Okay, new plan for dialogs." into honeycombDianne Hackborn2011-01-181-6/+4
| |\ \ \ | | |/ /
| | * | Merge "Okay, new plan for dialogs." into honeycombDianne Hackborn2011-01-181-6/+4
| | |\ \
| | | * | Okay, new plan for dialogs.Dianne Hackborn2011-01-181-6/+4
* | | | | am eb7a7a04: am 6cfc7a0a: Merge "Fix bug 3365208 - Contextual Action Bar is n...Adam Powell2011-01-181-0/+1
|\ \ \ \ \ | |/ / / /
| * | | | am 6cfc7a0a: Merge "Fix bug 3365208 - Contextual Action Bar is not displayed ...Adam Powell2011-01-181-0/+1
| |\ \ \ \ | | |/ / /
| | * | | Merge "Fix bug 3365208 - Contextual Action Bar is not displayed when the cont...Adam Powell2011-01-181-0/+1
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Fix bug 3365208 - Contextual Action Bar is not displayed when the context ite...Adam Powell2011-01-181-0/+1
| | | |/
* | | | am 2ec5a716: am 36c84403: Merge "Fix issue #3362484: Can\'t dismiss activity ...Dianne Hackborn2011-01-181-0/+18
|\ \ \ \ | |/ / /
| * | | am 36c84403: Merge "Fix issue #3362484: Can\'t dismiss activity picker by tap...Dianne Hackborn2011-01-181-0/+18
| |\ \ \ | | |/ /
| | * | Merge "Fix issue #3362484: Can't dismiss activity picker by tapping outside d...Dianne Hackborn2011-01-181-0/+18
| | |\ \ | | | |/ | | |/|
| | | * Fix issue #3362484: Can't dismiss activity picker by tapping outside dialogDianne Hackborn2011-01-181-0/+18
* | | | am f6759102: am 3aa959b9: Merge "Fix issue #3362666 Activities launched from ...Dianne Hackborn2011-01-181-16/+22
|\ \ \ \ | |/ / /
| * | | am 3aa959b9: Merge "Fix issue #3362666 Activities launched from ongoing notif...Dianne Hackborn2011-01-181-16/+22
| |\ \ \ | | |/ /
| | * | Fix issue #3362666 Activities launched from ongoing notifications don't animateDianne Hackborn2011-01-181-16/+22
| | |/
* | | am b70d39fd: am 6e3212a3: Merge "Fix 3329600: Always enable screen rotation i...Jim Miller2011-01-171-8/+6
|\ \ \ | |/ /
| * | am 6e3212a3: Merge "Fix 3329600: Always enable screen rotation in lockscreen....Jim Miller2011-01-171-8/+6
| |\ \ | | |/
| | * Merge "Fix 3329600: Always enable screen rotation in lockscreen." into honeycombJim Miller2011-01-171-8/+6
| | |\
| | | * Fix 3329600: Always enable screen rotation in lockscreen.Jim Miller2011-01-171-8/+6
* | | | am d0861c89: am 3d7a9707: Merge "Fix 3210299: Extend lock screen wake timeout...Jim Miller2011-01-171-1/+1
|\ \ \ \ | |/ / /
| * | | am 3d7a9707: Merge "Fix 3210299: Extend lock screen wake timeout to 10s" into...Jim Miller2011-01-171-1/+1
| |\ \ \ | | |/ /
| | * | Merge "Fix 3210299: Extend lock screen wake timeout to 10s" into honeycombJim Miller2011-01-171-1/+1
| | |\ \
| | | * | Fix 3210299: Extend lock screen wake timeout to 10sJim Miller2011-01-171-1/+1
| | | |/
* | | | Merge "Add joystick support to framework."Jeff Brown2011-01-171-0/+16
|\ \ \ \
| * | | | Add joystick support to framework.Jeff Brown2011-01-171-0/+16
* | | | | am 4ba7f35e: am 92cd4d02: Merge "Fix bug 3360882 - Allow FEATURE_CUSTOM_TITLE...Adam Powell2011-01-161-1/+2
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | am 92cd4d02: Merge "Fix bug 3360882 - Allow FEATURE_CUSTOM_TITLE and FEATURE_...Adam Powell2011-01-161-1/+2
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Merge "Fix bug 3360882 - Allow FEATURE_CUSTOM_TITLE and FEATURE_ACTION_MODE_O...Adam Powell2011-01-161-1/+2
| | |\ \ \
| | | * | | Fix bug 3360882 - Allow FEATURE_CUSTOM_TITLE andAdam Powell2011-01-161-1/+2
* | | | | | am f0c53e66: am bdac9e0f: Merge "Fix 3005526: Properly update StatusView from...Jim Miller2011-01-162-11/+16
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am bdac9e0f: Merge "Fix 3005526: Properly update StatusView from Password/PIN...Jim Miller2011-01-162-11/+16
| |\ \ \ \ \ | | |/ / / /
| | * | | | Fix 3005526: Properly update StatusView from Password/PIN unlockJim Miller2011-01-162-11/+16
| | | |_|/ | | |/| |
generated by cgit v1.1 at 2024-10-29 08:36:31 +0000