summaryrefslogtreecommitdiffstats
path: root/core/java
Commit message (Expand)AuthorAgeFilesLines
* Merge "Move ContentInfoExtender from Notification.java to a support library" ...Jose Lima2015-05-041-471/+0
|\
| * Move ContentInfoExtender from Notification.java to a support libraryJose Lima2015-05-011-471/+0
* | Merge "Remove Bitmap#getSkBitmap" into mnc-devJohn Reck2015-05-041-3/+3
|\ \
| * | Remove Bitmap#getSkBitmapJohn Reck2015-05-011-3/+3
* | | Merge "Move AssetAtlas off of SkBitmap*" into mnc-devJohn Reck2015-05-041-28/+0
|\ \ \ | |/ /
| * | Move AssetAtlas off of SkBitmap*John Reck2015-05-011-28/+0
* | | Merge "Add permission annotations on the AccountManager" into mnc-devTor Norbye2015-05-041-1/+37
|\ \ \
| * | | Add permission annotations on the AccountManagerTor Norbye2015-05-041-1/+37
* | | | Add full backup criteria to android manifestMatthew Williams2015-05-034-67/+651
|/ / /
* | | Merge "Add read cell broadcast app op - framework" into mnc-devSvet Ganov2015-05-031-7/+20
|\ \ \
| * | | Add read cell broadcast app op - frameworkSvet Ganov2015-05-021-7/+20
* | | | Merge "Add camera app op - framework" into mnc-devSvetoslav2015-05-034-7/+12
|\ \ \ \ | |/ / /
| * | | Add camera app op - frameworkSvetoslav2015-05-024-7/+12
| | |/ | |/|
* | | Merge "BluetoothMidiService: Add support for sending SysEx messages that span...Mike Lockwood2015-05-021-2/+2
|\ \ \ | |/ / |/| |
| * | BluetoothMidiService: Add support for sending SysEx messages that span multip...Mike Lockwood2015-05-011-2/+2
* | | Merge "Expose StaticLayout.Builder publicly" into mnc-devRaph Levien2015-05-023-22/+141
|\ \ \
| * | | Expose StaticLayout.Builder publiclyRaph Levien2015-05-013-22/+141
* | | | Merge "Make Paint a required field of StaticLayout Builder" into mnc-devRaph Levien2015-05-023-8/+7
|\ \ \ \ | |/ / /
| * | | Make Paint a required field of StaticLayout BuilderRaph Levien2015-04-303-8/+7
* | | | Remove unused methods/variables/fields from Editor.java.Yohei Yukawa2015-05-011-8/+1
* | | | Merge "Add body sensors app op - framework base" into mnc-devSvet Ganov2015-05-014-91/+112
|\ \ \ \
| * | | | Add body sensors app op - framework baseSvet Ganov2015-05-014-91/+112
* | | | | Revert "Revert "Merge getDisplayList and updateDisplayListIfDirty""Chris Craik2015-05-015-29/+19
* | | | | Merge "Fix build." into mnc-devChris Craik2015-05-015-13/+26
|\ \ \ \ \
| * | | | | Fix build.Chris Craik2015-05-015-13/+26
* | | | | | Merge "Merge getDisplayList and updateDisplayListIfDirty" into mnc-devChris Craik2015-05-015-26/+13
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge getDisplayList and updateDisplayListIfDirtyChris Craik2015-04-305-26/+13
* | | | | | Merge "Update alpha documentation" into mnc-devChris Craik2015-05-011-11/+20
|\ \ \ \ \ \
| * | | | | | Update alpha documentationChris Craik2015-04-301-11/+20
| |/ / / / /
* | | | | | Merge "Rename supportsAssistGesture to supportsAssist" into mnc-devJorim Jaggi2015-05-012-6/+6
|\ \ \ \ \ \
| * | | | | | Rename supportsAssistGesture to supportsAssistJorim Jaggi2015-05-012-6/+6
* | | | | | | Merge changes from topic 'tron' into mnc-devChris Wren2015-05-011-0/+1
|\ \ \ \ \ \ \
| * | | | | | | log clear all buttonChris Wren2015-05-011-0/+1
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge "Correctly handle intercepted touch events in FastScroller" into mnc-devAlan Viverette2015-05-012-6/+15
|\ \ \ \ \ \ \
| * | | | | | | Correctly handle intercepted touch events in FastScrollerAlan Viverette2015-05-012-6/+15
| | |_|_|_|/ / | |/| | | | |
* | | | | | | camera: Update Camera2 API for arbitration.Ruben Brunk2015-05-012-13/+32
* | | | | | | Merge "Add IntentFilter auto verification - part 7" into mnc-devFabrice Di Meglio2015-05-011-16/+14
|\ \ \ \ \ \ \
| * | | | | | | Add IntentFilter auto verification - part 7Fabrice Di Meglio2015-05-011-16/+14
* | | | | | | | Merge "Suggestions popup must be dismissed before device rotation." into mnc-devYohei Yukawa2015-05-011-1/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | Suggestions popup must be dismissed before device rotation.Yohei Yukawa2015-04-301-1/+6
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge "Exclude bound app widgets from idle app list" into mnc-devAmith Yamasani2015-05-012-0/+15
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | Exclude bound app widgets from idle app listAmith Yamasani2015-05-012-0/+15
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge "Icon: a clean, parcelable place for images." into mnc-devDan Sandler2015-05-011-1/+19
|\ \ \ \ \ \ \
| * | | | | | | Icon: a clean, parcelable place for images.Dan Sandler2015-05-011-1/+19
| | |/ / / / / | |/| | | | |
* | | | | | | Merge "Make sure transform matrix is applied when hardware layer is re-create...Doris Liu2015-05-011-0/+3
|\ \ \ \ \ \ \
| * | | | | | | Make sure transform matrix is applied when hardware layer is re-createdDoris Liu2015-04-301-0/+3
* | | | | | | | Merge "Move both app code and data together." into mnc-devJeff Sharkey2015-05-011-0/+10
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | Move both app code and data together.Jeff Sharkey2015-04-301-0/+10
* | | | | | | | Merge "A bunch more cleanups" into mnc-devJohn Reck2015-05-011-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | A bunch more cleanupsJohn Reck2015-04-301-2/+2