summaryrefslogtreecommitdiffstats
path: root/core/java/android/app
Commit message (Expand)AuthorAgeFilesLines
* Merge "Use DisplayAdjustments when creating display in ResourceManager" into ...Wale Ogunwale2015-06-083-25/+32
|\
| * Use DisplayAdjustments when creating display in ResourceManagerWale Ogunwale2015-06-063-25/+32
* | Merge "Fix issue #21572679: API Review: ActivityOptions, usage time report" i...Dianne Hackborn2015-06-081-4/+4
|\ \
| * | Fix issue #21572679: API Review: ActivityOptions, usage time reportDianne Hackborn2015-06-051-4/+4
* | | Merge "MidiManager: proxy all requests to open devices through MidiService" i...Mike Lockwood2015-06-081-1/+1
|\ \ \
| * | | MidiManager: proxy all requests to open devices through MidiServiceMike Lockwood2015-06-041-1/+1
* | | | Merge "Pass an args bundle to launchAssistAction." into mnc-devTim Kilbourn2015-06-084-8/+10
|\ \ \ \
| * | | | Pass an args bundle to launchAssistAction.Tim Kilbourn2015-06-054-8/+10
* | | | | Merge "Zen: New user flow for requesting DND access." into mnc-devJohn Spurlock2015-06-083-76/+27
|\ \ \ \ \
| * | | | | Zen: New user flow for requesting DND access.John Spurlock2015-06-083-76/+27
* | | | | | Merge "Change stylus button press to context click in View - API review feedb...Mady Mellor2015-06-081-6/+6
|\ \ \ \ \ \
| * | | | | | Change stylus button press to context click in View - API review feedbackMady Mellor2015-06-051-6/+6
* | | | | | | Don't forget to parcel mIsAppProvidedIntentAdam Skory2015-06-051-0/+2
* | | | | | | Merge "Record provision of custom Intents in AssistContent" into mnc-devAdam Skory2015-06-062-11/+33
|\ \ \ \ \ \ \
| * | | | | | | Record provision of custom Intents in AssistContentAdam Skory2015-06-052-11/+33
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge "Allow different visual and voice assist prompts" into mnc-devJames Cook2015-06-052-12/+160
|\ \ \ \ \ \ \
| * | | | | | | Allow different visual and voice assist promptsJames Cook2015-06-052-12/+160
| |/ / / / / /
* | | | | | | Merge "Adding am send-trim-memory command" into mnc-devStefan Kuhne2015-06-053-93/+142
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Adding am send-trim-memory commandStefan Kuhne2015-06-053-93/+142
| | |/ / / / | |/| | | |
* | | | | | Merge "Replace renamed reference to NetworkStats in javadoc" into mnc-devZoltan Szatmary-Ban2015-06-051-2/+2
|\ \ \ \ \ \
| * | | | | | Replace renamed reference to NetworkStats in javadocZoltan Szatmary-Ban2015-06-041-2/+2
| |/ / / / /
* | | | | | am 93634166: am d88e4d50: Merge "ActivityView: set surface on a background th...Filip Gruszczynski2015-06-051-14/+31
|\ \ \ \ \ \
| * \ \ \ \ \ am d88e4d50: Merge "ActivityView: set surface on a background thread." into c...Filip Gruszczynski2015-06-021-14/+31
| |\ \ \ \ \ \
| | * | | | | | ActivityView: set surface on a background thread.Filip Gruszczynski2015-06-011-14/+31
| * | | | | | | DO NOT MERGE resolved conflicts for merge of 951f2347 to lmp-mr1-ub-devJohn Reck2015-05-141-1/+1
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | am d955dceb: am 862540cd: Merge "Revert "DO NOT MERGE Backport of limited jan...John Reck2015-05-141-1/+1
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ Merge "Revert "DO NOT MERGE Backport of limited jank-tracking metrics"" into ...John Reck2015-05-141-1/+1
| | | |\ \ \ \ \ \
| | | | * | | | | | Revert "DO NOT MERGE Backport of limited jank-tracking metrics"John Reck2015-05-131-1/+1
| * | | | | | | | | resolved conflicts for merge of e869835d to lmp-mr1-ub-devJohn Reck2015-05-131-1/+1
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | am a5b28b92: am 69355eaa: Merge "DO NOT MERGE Backport of limited jank-tracki...John Reck2015-05-131-1/+1
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / /
| | | * | | | | | | Merge "DO NOT MERGE Backport of limited jank-tracking metrics" into lmp-mr1-devJohn Reck2015-05-131-1/+1
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / /
| | | | * | | | | | DO NOT MERGE Backport of limited jank-tracking metricsJohn Reck2015-03-181-1/+1
* | | | | | | | | | Merge "Always have a handler for PendingIntents sent in the system process" i...Wale Ogunwale2015-06-052-1/+17
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | | | |
| * | | | | | | | | Always have a handler for PendingIntents sent in the system processWale Ogunwale2015-06-042-1/+17
* | | | | | | | | | Merge "Clean up the enter transition even if there is not entering fragment."...George Mount2015-06-041-4/+4
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | |
| * | | | | | | | | Clean up the enter transition even if there is not entering fragment.George Mount2015-06-041-4/+4
* | | | | | | | | | Merge "More API changes." into mnc-devDianne Hackborn2015-06-0410-69/+141
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
| * | | | | | | | | More API changes.Dianne Hackborn2015-06-0210-69/+141
* | | | | | | | | | Adding missing permission API to fragmentSvetoslav2015-06-031-0/+27
| |_|_|_|_|_|_|/ / |/| | | | | | | |
* | | | | | | | | Merge "Add annotations to a new API" into mnc-devSvetoslav2015-06-031-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add annotations to a new APISvetoslav2015-06-021-1/+1
* | | | | | | | | | Merge "Make ACTION_PROVISION_MANAGED_DEVICE public." into mnc-devNicolas Prevot2015-06-021-9/+43
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Make ACTION_PROVISION_MANAGED_DEVICE public.Nicolas Prevot2015-06-021-9/+43
| | |_|_|/ / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge "Fix java doc" into mnc-devSvetoslav2015-06-021-1/+1
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | Fix java docSvetoslav2015-06-021-1/+1
* | | | | | | | | | Merge "Add API to hint whether to show on-board UI before a permission reques...Svetoslav2015-06-022-0/+35
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | / / / / / / / / | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Add API to hint whether to show on-board UI before a permission request.Svetoslav2015-06-022-0/+35
* | | | | | | | | Merge "Temporarily whitelist an app for network during doze" into mnc-devAmith Yamasani2015-06-022-0/+23
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Temporarily whitelist an app for network during dozeAmith Yamasani2015-06-022-0/+23
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Device policy: consistent javadoc and annotationsRobin Lee2015-06-021-225/+227
| |/ / / / / / |/| | | | | |