summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge into jb-mr1-devJean-Baptiste Queru2012-09-259-14/+95
|\
| * AppInfo from Notifications for secondary usersAmith Yamasani2012-09-249-14/+95
* | Merge into jb-mr1-devJean-Baptiste Queru2012-09-251-4/+1
|\ \
| * | Move multi-user OBB under user-specific path.Jeff Sharkey2012-09-241-4/+1
* | | Merge into jb-mr1-devJean-Baptiste Queru2012-09-253-16/+24
|\ \ \
| * | | Fix surface view on secondary display.Jeff Brown2012-09-241-1/+2
| * | | Fix drag and drop surfaces on secondary displays.Jeff Brown2012-09-241-1/+3
| * | | Allow a window on a secondary display to have focus.Jeff Brown2012-09-241-14/+19
* | | | Merge into jb-mr1-devJean-Baptiste Queru2012-09-251-3/+27
|\ \ \ \ | |/ / /
| * | | Force activities to run on the second display for testing.Jeff Brown2012-09-241-3/+27
* | | | Merge into jb-mr1-devJean-Baptiste Queru2012-09-253-0/+162
|\ \ \ \
| * | | | Add test for copy kernels.Jason Sams2012-09-243-0/+162
* | | | | Fix alpha channel computation with ColorMatrixColorFilterRomain Guy2012-09-253-11/+13
* | | | | Fix build.Martijn Coenen2012-09-252-1/+5
* | | | | Merge into jb-mr1-devJean-Baptiste Queru2012-09-252-0/+9
|\ \ \ \ \
| * | | | | Adding support for new 'uid2445' column in Calendar's Events table.Sara Ting2012-09-242-0/+9
| | |_|_|/ | |/| | |
* | | | | Merge into jb-mr1-devJean-Baptiste Queru2012-09-251-2/+22
|\ \ \ \ \
| * | | | | pause music playback when switching user.Eric Laurent2012-09-211-2/+22
* | | | | | Merge into jb-mr1-devJean-Baptiste Queru2012-09-251-1/+5
|\ \ \ \ \ \
| * | | | | | TaskStackBuilder and intents without an explicit targetAdam Powell2012-09-241-1/+5
* | | | | | | Merge into jb-mr1-devJean-Baptiste Queru2012-09-251-0/+6
|\ \ \ \ \ \ \
| * | | | | | | Add extra error check when eglCreateContext failsRomain Guy2012-09-241-0/+6
* | | | | | | | Merge into jb-mr1-devJean-Baptiste Queru2012-09-251-4/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Allow multiple 'parcelable' declarations in aidl filesAdam Powell2012-08-161-4/+2
* | | | | | | | | Merge into jb-mr1-devJean-Baptiste Queru2012-09-251-13/+16
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Camera: Improve enableShutterSound documentation.Eino-Ville Talvala2012-09-241-13/+16
* | | | | | | | | | Merge into jb-mr1-devJean-Baptiste Queru2012-09-254-48/+91
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | |
| * | | | | | | | | Add a property to disable libhwui's scissor optimizationRomain Guy2012-09-244-48/+91
* | | | | | | | | | Merge into jb-mr1-devJean-Baptiste Queru2012-09-255-133/+76
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix issue #7215984: java.lang.RuntimeException: Unable to create...Dianne Hackborn2012-09-245-133/+76
* | | | | | | | | | | Add NfcBarcode technology API.Martijn Coenen2012-09-254-2/+121
* | | | | | | | | | | Merge "Fix build" into jb-mr1-devMichael Jurka2012-09-241-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix buildMichael Jurka2012-09-241-1/+1
* | | | | | | | | | | | Merge "Test image for 2 input tests." into jb-mr1-devJason Sams2012-09-242-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Test image for 2 input tests.Jason Sams2012-09-242-0/+0
| | |_|_|_|_|_|_|/ / / | |/| | | | | | | | |
* | | | | | | | | | | Merge "UI test automation service should not be auto reconnected." into jb-mr...Svetoslav Ganov2012-09-241-28/+10
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | UI test automation service should not be auto reconnected.Svetoslav Ganov2012-09-241-28/+10
* | | | | | | | | | | | Merge "Properly launch quicksettings activities." into jb-mr1-devDaniel Sandler2012-09-245-19/+35
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Properly launch quicksettings activities.Daniel Sandler2012-09-245-19/+35
* | | | | | | | | | | | Merge "Updated versions of DroidSansFallback" into jb-mr1-devBart Sears2012-09-243-0/+5
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Updated versions of DroidSansFallbackBart Sears2012-09-243-0/+5
| |/ / / / / / / / / /
* | | | | | | | | | | Merge "Do not preload videoeditor_jni since it breaks the emulator" into jb-m...Siva Velusamy2012-09-241-1/+0
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / |/| | | | | | | | | |
| * | | | | | | | | | Do not preload videoeditor_jni since it breaks the emulatorSiva Velusamy2012-09-241-1/+0
* | | | | | | | | | | Merge "Revert "Fix for bug: #7173350. elapsedRealtimeNano() -> elapsedRealtim...Philip Milne2012-09-246-9/+9
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Revert "Fix for bug: #7173350. elapsedRealtimeNano() -> elapsedRealtimeNanos()"Philip Milne2012-09-246-9/+9
* | | | | | | | | | | | Merge "Fix security check for private allocateAppWidgetId api" into jb-mr1-devMichael Jurka2012-09-241-2/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fix security check for private allocateAppWidgetId apiMichael Jurka2012-09-211-2/+1
* | | | | | | | | | | | | Merge "Fix issue #6926562: Ensure all multi-user cache files are managed corr...Dianne Hackborn2012-09-243-9/+48
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Fix issue #6926562: Ensure all multi-user cache files are managed correctlyDianne Hackborn2012-09-243-9/+48
* | | | | | | | | | | | | | Merge "Fix for bug: #7173350. elapsedRealtimeNano() -> elapsedRealtimeNanos()...Philip Milne2012-09-246-9/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | |