summaryrefslogtreecommitdiffstats
path: root/core/java/android/app
Commit message (Expand)AuthorAgeFilesLines
* am 617055d7: am 5d6dc425: Merge "Filter out dangerous CharSequences in Notifi...Daniel Sandler2013-05-081-17/+44
|\
| * am 5d6dc425: Merge "Filter out dangerous CharSequences in Notification." into...Daniel Sandler2013-05-081-17/+44
| |\
| | * Merge "Filter out dangerous CharSequences in Notification." into jb-mr2-devDaniel Sandler2013-05-091-17/+44
| | |\
| | | * Filter out dangerous CharSequences in Notification.Daniel Sandler2013-05-081-17/+44
* | | | am 0ba3d91f: am 05759d15: Merge "add notice to not use 0 in startForeground()...Scott Main2013-05-071-1/+1
|\ \ \ \ | |/ / /
| * | | am 05759d15: Merge "add notice to not use 0 in startForeground(). also delete...Scott Main2013-05-061-1/+1
| |\ \ \ | | |/ /
| | * | Merge "add notice to not use 0 in startForeground(). also delete some obsolet...Scott Main2013-05-061-1/+1
| | |\ \
| | | * | add notice to not use 0 in startForeground().Scott Main2013-04-301-1/+1
| | | |/
* | | | resolved conflicts for merge of a98b0ff8 to masterKenny Root2013-05-072-6/+30
|\ \ \ \ | |/ / /
| * | | am d43a71da: Merge "Help for the debugging help for issue #8734824." into jb-...Dianne Hackborn2013-05-062-0/+24
| |\ \ \ | | |/ /
| | * | Help for the debugging help for issue #8734824.Dianne Hackborn2013-05-062-0/+24
* | | | resolved conflicts for merge of 485d7a31 to masterKenny Root2013-05-071-0/+7
|\ \ \ \ | |/ / /
| * | | am 5b88a2fd: Debugging help for issue #8734824: WATCHDOG KILLING SYSTEM PROCESSDianne Hackborn2013-05-061-0/+7
| |\ \ \ | | |/ /
| | * | Debugging help for issue #8734824: WATCHDOG KILLING SYSTEM PROCESSDianne Hackborn2013-05-061-0/+7
| | |/
* | | Add new app ops for various interesting audio service things.Dianne Hackborn2013-05-061-1/+37
* | | am e9ae6822: resolved conflicts for merge of 1f6e789b to jb-mr2-dev-plus-aospKenny Root2013-04-301-2/+1
|\ \ \ | |/ /
| * | resolved conflicts for merge of 1f6e789b to jb-mr2-dev-plus-aospKenny Root2013-04-291-2/+1
| |\ \ | | |/ | |/|
| | * Track change to JSSE providerKenny Root2013-04-291-2/+1
* | | am 4064af9b: am a7b6cbf1: Merge "API cleanup: NotificationListener" into jb-m...Daniel Sandler2013-04-251-2/+2
|\ \ \ | |/ /
| * | API cleanup: NotificationListenerDaniel Sandler2013-04-251-2/+2
* | | am fa1c4430: am 5e97c317: Merge "New NotificationListener API: getActiveNotif...Daniel Sandler2013-04-251-0/+2
|\ \ \ | |/ /
| * | New NotificationListener API: getActiveNotifications()Daniel Sandler2013-04-241-0/+2
* | | am c91d4dfe: am e00b297c: Merge "The touch exploration capability is dynamica...Svetoslav2013-04-241-1/+5
|\ \ \ | |/ /
| * | The touch exploration capability is dynamically granted pre-JellyBeanMR2.Svetoslav2013-04-241-1/+5
* | | Merge "Add tap detector for switching stack focus."Craig Mautner2013-04-242-7/+37
|\ \ \
| * | | Add tap detector for switching stack focus.Craig Mautner2013-04-232-7/+37
* | | | am 939ff0ac: am 4c783066: Merge "Fixing bugs exposed when moving accessibilit...Svetoslav2013-04-232-7/+14
|\ \ \ \ | | |/ / | |/| |
| * | | Fixing bugs exposed when moving accessibility CTS tests to UiAutomation.Svetoslav2013-04-232-7/+14
* | | | am 2fd0ba8e: am f78ff07f: Merge "Fix concurrency issues when parceling Status...Daniel Sandler2013-04-231-8/+33
|\ \ \ \ | |/ / /
| * | | Merge "Fix concurrency issues when parceling StatusBarNotifications." into jb...Daniel Sandler2013-04-231-8/+33
| |\ \ \
| | * | | Fix concurrency issues when parceling StatusBarNotifications.Daniel Sandler2013-04-221-8/+33
* | | | | am 58500051: am 5fe6e4c4: Merge "Rewrite input handling for native applicatio...Michael Wright2013-04-231-40/+6
|\ \ \ \ \ | |/ / / /
| * | | | Rewrite input handling for native applicationsMichael Wright2013-04-221-40/+6
* | | | | am 353bd75b: am 18414c4d: Merge "Provide SharedPreferences coherence guarante...Christopher Tate2013-04-201-0/+48
|\ \ \ \ \ | |/ / / / | | | / / | |_|/ / |/| | |
| * | | Merge "Provide SharedPreferences coherence guarantees for BackupAgent" into j...Christopher Tate2013-04-191-0/+48
| |\ \ \
| | * | | Provide SharedPreferences coherence guarantees for BackupAgentChristopher Tate2013-04-191-0/+48
| | |/ /
* | | | am ba567014: am e37c8f78: Merge "Improve API and documentation" into jb-mr2-devAmith Yamasani2013-04-191-6/+21
|\ \ \ \ | |/ / /
| * | | Merge "Improve API and documentation" into jb-mr2-devAmith Yamasani2013-04-191-6/+21
| |\ \ \
| | * | | Improve API and documentationAmith Yamasani2013-04-191-6/+21
| | |/ /
* | | | am 9454a9b3: am 4e0eb22f: Fix doc build.Ying Wang2013-04-181-2/+2
|\ \ \ \ | |/ / /
| * | | Fix doc build.Ying Wang2013-04-181-2/+2
* | | | am a4430894: am f06396da: Merge "Fix issue #8656537: API review: styles, assi...Dianne Hackborn2013-04-181-11/+8
|\ \ \ \ | |/ / /
| * | | Fix issue #8656537: API review: styles, assistDianne Hackborn2013-04-181-11/+8
| |/ /
* | | am ac16c21d: am a0042742: Merge "Modify restrictions bundle per api council r...Amith Yamasani2013-04-171-5/+0
|\ \ \ | |/ /
| * | Modify restrictions bundle per api council recommendationsAmith Yamasani2013-04-171-5/+0
* | | Merge "Incremental repairs to side by side stacks."Craig Mautner2013-04-172-23/+26
|\ \ \
| * | | Incremental repairs to side by side stacks.Craig Mautner2013-04-162-23/+26
* | | | Merge "Implement stack splitting and task movement."Craig Mautner2013-04-173-4/+98
|\ \ \ \ | |/ / /
| * | | Implement stack splitting and task movement.Craig Mautner2013-04-153-4/+98
* | | | am 220fa85e: am f094d221: Merge "Finish annotating Notification.extras." into...Daniel Sandler2013-04-151-23/+104
|\ \ \ \ | |/ / / |/| / / | |/ /