summaryrefslogtreecommitdiffstats
path: root/core/java
Commit message (Expand)AuthorAgeFilesLines
* 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 "notifyCarrierNetworkChange:TelephonyManager->CarrierService" into mnc-devAndrew Flynn2015-06-081-5/+43
|\ \ \
| * | | notifyCarrierNetworkChange:TelephonyManager->CarrierServiceAndrew Flynn2015-06-051-5/+43
* | | | API review: Update hasMic to hasMicrophone.Tim Kilbourn2015-06-082-9/+9
* | | | Merge "Remove insertion action mode runnable on selection start" into mnc-devClara Bayarri2015-06-081-4/+3
|\ \ \ \
| * | | | Remove insertion action mode runnable on selection startClara Bayarri2015-06-081-4/+3
* | | | | Merge "Pass an args bundle to launchAssistAction." into mnc-devTim Kilbourn2015-06-086-9/+21
|\ \ \ \ \
| * | | | | Pass an args bundle to launchAssistAction.Tim Kilbourn2015-06-056-9/+21
* | | | | | Merge "Zen: New user flow for requesting DND access." into mnc-devJohn Spurlock2015-06-084-79/+42
|\ \ \ \ \ \
| * | | | | | Zen: New user flow for requesting DND access.John Spurlock2015-06-084-79/+42
* | | | | | | Merge "API Council changes." into mnc-devGeorge Mount2015-06-082-18/+23
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | API Council changes.George Mount2015-06-052-18/+23
* | | | | | | Merge "Change stylus button press to context click in View - API review feedb...Mady Mellor2015-06-086-106/+104
|\ \ \ \ \ \ \
| * | | | | | | Change stylus button press to context click in View - API review feedbackMady Mellor2015-06-056-106/+104
* | | | | | | | Merge "Change stylus button press to context click in GD - API review feedbac...Mady Mellor2015-06-081-35/+31
|\ \ \ \ \ \ \ \
| * | | | | | | | Change stylus button press to context click in GD - API review feedbackMady Mellor2015-06-051-35/+31
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge "instrument emergency call button" into mnc-devChris Wren2015-06-081-0/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | instrument emergency call buttonChris Wren2015-06-051-0/+1
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge "Don't cause requestLayout when transition changes Visibility." into mn...George Mount2015-06-083-12/+22
|\ \ \ \ \ \ \ \
| * | | | | | | | Don't cause requestLayout when transition changes Visibility.George Mount2015-06-053-12/+22
| |/ / / / / / /
* | | | | | | | Merge "Correct the docs for getUserBadgedIcon" into mnc-devKenny Guy2015-06-081-4/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | Correct the docs for getUserBadgedIconKenny Guy2015-05-291-4/+5
* | | | | | | | | Merge "Fix ActionMode.snooze API" into mnc-devAbodunrinwa Toki2015-06-084-31/+36
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix ActionMode.snooze APIAbodunrinwa Toki2015-06-054-31/+36
* | | | | | | | | | Merge "Remove NFC CardEmulation dynamic resource APIs." into mnc-devMartijn Coenen2015-06-082-48/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Remove NFC CardEmulation dynamic resource APIs.Martijn Coenen2015-06-052-48/+2
| | |_|_|_|_|/ / / / | |/| | | | | | | |
* | | | | | | | | | Catch BadTokenException and continue in clearInsetofPreviousIme.Seigo Nonaka2015-06-081-5/+11
* | | | | | | | | | Merge "MediaController: Keep the controller when touch exploration is enabled...Jae Seo2015-06-061-13/+26
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | MediaController: Keep the controller when touch exploration is enabledJae Seo2015-06-051-13/+26
* | | | | | | | | | | 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 "Camera2: Legacy: Do not remap EACCES error code to PERMISSION_DENIED" ...Eino-Ville Talvala2015-06-061-10/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Camera2: Legacy: Do not remap EACCES error code to PERMISSION_DENIEDEino-Ville Talvala2015-06-041-10/+1
* | | | | | | | | | | | Merge "Camera2: add missing HFR implementation" into mnc-devZhijun He2015-06-061-3/+2
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Camera2: add missing HFR implementationZhijun He2015-06-051-3/+2
| | |/ / / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge "Add UI for camera + flashlight battery reporting." into mnc-devRuben Brunk2015-06-067-16/+154
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Add UI for camera + flashlight battery reporting.Ruben Brunk2015-06-047-16/+154
* | | | | | | | | | | | | Merge "Allow different visual and voice assist prompts" into mnc-devJames Cook2015-06-054-35/+230
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Allow different visual and voice assist promptsJames Cook2015-06-054-35/+230
* | | | | | | | | | | | | | 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 "Update docs to reflect correct time units" into mnc-devAdam Lesinski2015-06-052-4/+47
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Update docs to reflect correct time unitsAdam Lesinski2015-06-052-4/+47
* | | | | | | | | | | | | Merge "add gps gid to system_server" into mnc-devWei Wang2015-06-051-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | add gps gid to system_serverKevin Tang2015-06-051-1/+1
* | | | | | | | | | | | | | Merge "Use real rounding in ImageView bounds configuration" into mnc-devAdam Powell2015-06-051-5/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | |