summaryrefslogtreecommitdiffstats
path: root/core/java/com/android
Commit message (Expand)AuthorAgeFilesLines
* am 65ba6d11: am 1e7276ce: Merge "Fix typo in AlertController.java"Jean-Baptiste Queru2013-07-081-1/+1
|\
| * am 1e7276ce: Merge "Fix typo in AlertController.java"Jean-Baptiste Queru2013-07-081-1/+1
| |\
| | * Merge "Fix typo in AlertController.java"Jean-Baptiste Queru2013-07-081-1/+1
| | |\
| | | * Fix typo in AlertController.javaSangkyu Lee2013-02-151-1/+1
* | | | resolved conflicts for merge of a920f25f to jb-mr2-dev-plus-aospElliott Hughes2013-06-282-7/+7
|\ \ \ \ | |/ / /
| * | | resolved conflicts for merge of fca0f92e to stage-aosp-masterElliott Hughes2013-06-282-7/+7
| |\ \ \ | | |/ /
| | * | Switch frameworks/base over from @hidden Charsets to public StandardCharsets.Elliott Hughes2013-06-282-7/+7
* | | | am d293d229: Merge "Create missing Uids when recording network stats." into j...Jeff Sharkey2013-06-041-3/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Create missing Uids when recording network stats.Jeff Sharkey2013-06-041-3/+1
* | | | am 636af7a1: Merge "Rename CALLBACK_FLAG_ACTIVE_SCAN for clarity." into jb-mr...Jeff Brown2013-05-301-1/+1
|\ \ \ \ | |/ / /
| * | | Rename CALLBACK_FLAG_ACTIVE_SCAN for clarity.Jeff Brown2013-05-301-1/+1
* | | | am bf0d561c: Merge "Pipe through bounding box information (DO NOT MERGE)" int...Michael Wright2013-05-241-9/+35
|\ \ \ \ | |/ / /
| * | | Pipe through bounding box information (DO NOT MERGE)Michael Wright2013-05-231-9/+35
* | | | am 83d6df27: Merge "Help on issue #8863955: Google Services keeping phone awa...Dianne Hackborn2013-05-091-7/+2
|\ \ \ \ | |/ / /
| * | | Merge "Help on issue #8863955: Google Services keeping phone awake..." into j...Dianne Hackborn2013-05-091-7/+2
| |\ \ \
| | * | | Help on issue #8863955: Google Services keeping phone awake...Dianne Hackborn2013-05-091-7/+2
* | | | | am b2f6842d: Merge "Add an API to allow a callback to request active scans." ...Jeff Brown2013-05-091-20/+1
|\ \ \ \ \ | |/ / / /
| * | | | Add an API to allow a callback to request active scans.Jeff Brown2013-05-091-20/+1
| |/ / /
* | | | am 2b662e8e: Merge "Fix a NPE in MenuItemImpl when setting null ActionProvide...Adam Powell2013-05-061-5/+7
|\ \ \ \ | |/ / /
| * | | Merge "Fix a NPE in MenuItemImpl when setting null ActionProvider" into jb-mr...Adam Powell2013-05-031-5/+7
| |\ \ \
| | * | | Fix a NPE in MenuItemImpl when setting null ActionProviderAdam Powell2013-05-031-5/+7
* | | | | am 245a3e1c: Merge "Change the initial disabled state of disabled IMEs" into ...Satoshi Kataoka2013-05-031-2/+76
|\ \ \ \ \ | |/ / / /
| * | | | Change the initial disabled state of disabled IMEsSatoshi Kataoka2013-05-021-2/+76
| |/ / /
* | | | am 203aa72e: Merge "Rebuilds ActionBar accessibility description as needed" i...Casey Burkhardt2013-04-301-14/+16
|\ \ \ \ | |/ / /
| * | | Rebuilds ActionBar accessibility description as neededCasey Burkhardt2013-04-301-14/+16
* | | | am a6436526: Merge "Human-readable POSIX capabilities for SystemServer."Alex Klyubin2013-04-231-1/+29
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Human-readable POSIX capabilities for SystemServer.Alex Klyubin2013-04-221-1/+29
* | | Fix ActionBar#setHomeActionContentDescription(0)Adam Powell2013-04-181-1/+1
* | | Merge "Move owner info from Settings.Secure to LockSettings" into jb-mr2-devJim Miller2013-04-171-0/+20
|\ \ \
| * | | Move owner info from Settings.Secure to LockSettingsJim Miller2013-04-161-0/+20
* | | | Disable tracing from ZygoteJamie Gennis2013-04-161-0/+5
* | | | Merge "Send tab selection event from ScrollingTabContainerView." into jb-mr2-devSvetoslav Ganov2013-04-161-0/+25
|\ \ \ \
| * | | | Send tab selection event from ScrollingTabContainerView.Alan Viverette2013-04-151-0/+25
| |/ / /
* | | | Add mHasQuit to fix an NPE in StateMachine.Wink Saville2013-04-161-22/+28
|/ / /
* | | Merge "Fix keyguard pattern invalidate bug" into jb-mr2-devJim Miller2013-04-111-25/+22
|\ \ \
| * | | Fix keyguard pattern invalidate bugJim Miller2013-04-101-25/+22
* | | | Adding LocalePicker support for the zz_ZZ pseudolocaleBenjamin Poiesz2013-04-111-5/+40
|/ / /
* | | Fix for ActionBar#setSelectedNavigationItem() in collapsed tab modeAdam Powell2013-04-091-0/+3
* | | Merge "Have audio service clean up new receivers in crashing processes." into...Dianne Hackborn2013-04-081-0/+146
|\ \ \
| * | | Have audio service clean up new receivers in crashing processes.Dianne Hackborn2013-04-081-0/+146
* | | | Fix accessibility in action bars and add extra customizationAdam Powell2013-04-053-7/+101
* | | | Merge "Correctly manage the lifecycle of IME InputChannels." into jb-mr2-devJeff Brown2013-04-051-1/+1
|\ \ \ \
| * | | | Correctly manage the lifecycle of IME InputChannels.Jeff Brown2013-04-041-1/+1
* | | | | New NotificationListenerService.Daniel Sandler2013-04-054-185/+2
| |/ / / |/| | |
* | | | Uphold common ordering expectations around action bar Home/Up dispatchAdam Powell2013-04-041-2/+9
|/ / /
* | | RemoteControlClient receives playback position change requestsJean-Michel Trivi2013-04-011-1/+1
* | | RemoteControlClient can report current position, speedJean-Michel Trivi2013-03-291-1/+2
* | | Add BT - DataTracker connectionRobert Greenwalt2013-03-271-0/+1
* | | Merge "Use input transport for communications between app and IME." into jb-m...Jeff Brown2013-03-274-41/+33
|\ \ \
| * | | Use input transport for communications between app and IME.Jeff Brown2013-03-264-41/+33