summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am 59d208dd: Merge "Remove UsageEvents#resetToStart() as it doesn\'t work" ↵Adam Lesinski2014-10-092-10/+3
|\ | | | | | | | | | | | | into lmp-dev * commit '59d208ddc1c5c51ae4d4f19ffbaf7685e534fe7f': Remove UsageEvents#resetToStart() as it doesn't work
| * Merge "Remove UsageEvents#resetToStart() as it doesn't work" into lmp-devAdam Lesinski2014-10-082-10/+3
| |\
| | * Remove UsageEvents#resetToStart() as it doesn't workAdam Lesinski2014-10-082-10/+3
| | | | | | | | | | | | | | | | | | | | | | | | After completely iterating over a UsageEvents object, the internal parcel is recycled. If resetToStart is called then, it does nothing. Bug:17909428 Change-Id: I7bc68d3429e4621a50dedbfc1789576d44dbb3be
* | | am 49c5ddd6: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-devGeoff Mendal2014-10-090-0/+0
|\ \ \ | |/ / | | | | | | | | | * commit '49c5ddd67793735a2d6fc036614cdfab944d56f6': Import translations. DO NOT MERGE
| * | Merge "Import translations. DO NOT MERGE" into lmp-devGeoff Mendal2014-10-082-3/+3
| |\ \
| | * | Import translations. DO NOT MERGEGeoff Mendal2014-10-082-3/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: I38a6ea57b8a5cde20e80427bcb46caf0b1048d2c Auto-generated-cl: translation import
* | | | am 8f25f390: am 9df3d67b: am 7f567e4a: docs: Changed date of GMS v6.1 ↵Quddus Chong2014-10-091-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | (Manchego) release to October 2014. * commit '8f25f390e515be9783e8cce913f8de051e097419': docs: Changed date of GMS v6.1 (Manchego) release to October 2014.
| * | | am 9df3d67b: am 7f567e4a: docs: Changed date of GMS v6.1 (Manchego) release ↵Quddus Chong2014-10-081-1/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to October 2014. * commit '9df3d67bdc7c1fa79d0daab1f2ae5f69a476f8dd': docs: Changed date of GMS v6.1 (Manchego) release to October 2014.
| | * \ \ am 7f567e4a: docs: Changed date of GMS v6.1 (Manchego) release to October 2014.Quddus Chong2014-10-081-1/+1
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit '7f567e4a1c561f60c6d31f6709508f5ec5a6ba88': docs: Changed date of GMS v6.1 (Manchego) release to October 2014.
| | | * | | docs: Changed date of GMS v6.1 (Manchego) release to October 2014.Quddus Chong2014-10-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I710c0eab6913988d8bc70ded344a2d60fa594d92
* | | | | | am 3910f53c: Merge "bootanimation: Tweak parameters for pcm_open for playing ↵Mike Lockwood2014-10-091-0/+3
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | boot sounds." into lmp-dev * commit '3910f53c5ebccbe64ab768591dc7c377f1eb0153': bootanimation: Tweak parameters for pcm_open for playing boot sounds.
| * | | | | Merge "bootanimation: Tweak parameters for pcm_open for playing boot ↵Mike Lockwood2014-10-081-0/+3
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | sounds." into lmp-dev
| | * | | | | bootanimation: Tweak parameters for pcm_open for playing boot sounds.Mike Lockwood2014-10-071-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set start_threshold and avail_min to 1/4th period size and stop_threshold to INT_MAX Change-Id: I0a3aac18533709daa86a024cdd6a32086410723a
* | | | | | | am ef773e35: Merge changes Id09663d8,Ie88f3750 into lmp-devEino-Ville Talvala2014-10-094-484/+2086
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ef773e3569969592fb220b7ccc49dafcabfdd67a': Camera2: Docs cleanup, especially units and range camera2: Update docs only for legacy devices
| * | | | | | Merge changes Id09663d8,Ie88f3750 into lmp-devEino-Ville Talvala2014-10-084-484/+2086
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: Camera2: Docs cleanup, especially units and range camera2: Update docs only for legacy devices
| | * | | | | | Camera2: Docs cleanup, especially units and rangeEino-Ville Talvala2014-10-084-494/+1557
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add entries for units and range into javadoc - Fix up existing units entries and add new ones - Fix up range entries to be consistent for enums - Add range entries where it makes sense - Minor fix to javadoc gen to allow for code indentation - Lots of edits for consistency, especially to available* entries. Bug: 16525650 Change-Id: Id09663d897ec98122073e6e13719731ec0de4dad
| | * | | | | | camera2: Update docs only for legacy devicesIgor Murashkin2014-10-034-21/+560
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17788234 Change-Id: Ie88f3750cc06d889c6750f2099598d53ccb601b7
* | | | | | | | am 3dd06d90: Merge "Restored widget provider id not properly updated." into ↵Svetoslav2014-10-091-2/+3
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-dev * commit '3dd06d9005bd572a3b012b3a2b27adfa94533144': Restored widget provider id not properly updated.
| * | | | | | | Merge "Restored widget provider id not properly updated." into lmp-devSvetoslav2014-10-081-2/+3
| |\ \ \ \ \ \ \
| | * | | | | | | Restored widget provider id not properly updated.Svetoslav2014-10-081-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | During restore first the provider records and then the applications are restored. Therefore, we keep the restored provider records in a zombie state and once we get the package install broadcasts from the package manager we update the zombie providers to be real ones. The bug was that while doing this we were not updating the provider id from one with an undefined UID to the one with the UID under which its package now runs. bug:17869323 Change-Id: I20b7cbfd2f90e2f5bf3a6b858d8da99cc1c82841
* | | | | | | | | am 89b19695: Merge "Put in real "code" (aka marketing) name." into lmp-devDianne Hackborn2014-10-0929-50/+49
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '89b196958fee07475765bd3c458098464ba16f2e': Put in real "code" (aka marketing) name.
| * | | | | | | | Merge "Put in real "code" (aka marketing) name." into lmp-devDianne Hackborn2014-10-0829-50/+49
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Put in real "code" (aka marketing) name.Dianne Hackborn2014-10-0729-50/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Idb3976edfae37293ed75cb5b869b4b42d8042bbe
* | | | | | | | | | am 908a4f9a: am 4f133894: Exclude KXmlParser from LayoutLib.Deepanshu Gupta2014-10-095-22/+125
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '908a4f9a4372a9627e821b5800936095b0f0b5b0': Exclude KXmlParser from LayoutLib.
| * | | | | | | | | am 4f133894: Exclude KXmlParser from LayoutLib.Deepanshu Gupta2014-10-085-22/+125
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4f133894a6e98d8d30557ea42cec92cfb21fa5c9': Exclude KXmlParser from LayoutLib.
| | * | | | | | | | Exclude KXmlParser from LayoutLib.Deepanshu Gupta2014-10-085-22/+125
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The class was incorrectly being included in the LayoutLib. Change-Id: I3c86662efa068019fe9165f2fc49a00d0a1b7f2d
* | | | | | | | | | am 562262cc: Merge "Bring along more ApplicationInfo fields." into lmp-devJeff Sharkey2014-10-091-0/+6
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '562262cc89838529316ff2f3e511c0d876b08677': Bring along more ApplicationInfo fields.
| * | | | | | | | | Merge "Bring along more ApplicationInfo fields." into lmp-devJeff Sharkey2014-10-081-0/+6
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Bring along more ApplicationInfo fields.Jeff Sharkey2014-10-081-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we added scan paths, we forgot to bring them along through Parcel and copy constructor. Bug: 17900178 Change-Id: I0ee9374f909d375768045976fd88cee7431f7d4d
* | | | | | | | | | | am f121892b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-devGeoff Mendal2014-10-090-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f121892bc8c73b06086f8ebc059dd86f680b5197': Import translations. DO NOT MERGE
| * | | | | | | | | | Merge "Import translations. DO NOT MERGE" into lmp-devGeoff Mendal2014-10-081-1/+1
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2014-10-081-1/+1
| | | |_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I94aa8de0fe7a191d0312dbbb9f2b583c7afbdade Auto-generated-cl: translation import
* | | | | | | | | | | Merge "Log exception when creating Activity in ActivityUnitTestCase." into ↵Filip Gruszczynski2014-10-081-4/+9
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-sprout-dev
| * | | | | | | | | | | Log exception when creating Activity in ActivityUnitTestCase.Filip Gruszczynski2014-10-031-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the creation of an Activity fails, it is impossible to determine what went wrong. We should log the exception immediately before failing on assert. Change-Id: Ie6cbe87ff342b8d60989f5e1a6ffa3efc058c585
* | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into lmp-sprout-devGeoff Mendal2014-10-082-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2014-10-082-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I30dfc9ade88728eaa4ee1d1a9921c3f69d9e349b Auto-generated-cl: translation import
* | | | | | | | | | | | | am a5119ae7: am 59c04ece: am bcd1af39: Merge "docs: Wear UI Lib training ↵Joe Fernandez2014-10-083-2/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixes" into klp-modular-docs * commit 'a5119ae776e10d023cae456a0bd5ca1c41e37910': docs: Wear UI Lib training fixes
| * | | | | | | | | | | | am 59c04ece: am bcd1af39: Merge "docs: Wear UI Lib training fixes" into ↵Joe Fernandez2014-10-083-2/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / | |/| | | | / / / / / / / | | | |_|_|/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | klp-modular-docs * commit '59c04ece5614ffa20e10964a70c5faeafe565aa3': docs: Wear UI Lib training fixes
| | * | | | | | | | | | am bcd1af39: Merge "docs: Wear UI Lib training fixes" into klp-modular-docsJoe Fernandez2014-10-083-2/+9
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'bcd1af39fa674dcc46ddb30778304eaf67100a13': docs: Wear UI Lib training fixes
| | | * | | | | | | | | Merge "docs: Wear UI Lib training fixes" into klp-modular-docsJoe Fernandez2014-10-083-2/+9
| | | |\ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | docs: Wear UI Lib training fixesRicardo Cervera2014-10-033-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8d4610b68218455b8a00a34a101cee1f0d945633
* | | | | | | | | | | | | am 2200f86f: All (er, L) is finally revealed.Dan Sandler2014-10-0817-260/+842
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '2200f86f800876d005f911e6864708fa9772d03a': All (er, L) is finally revealed.
| * | | | | | | | | | | | All (er, L) is finally revealed.Dan Sandler2014-10-0817-260/+842
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If you exceed 20000 points, please send in a screenshot. Bug: 15984887 Change-Id: I1164160bfa8e7dca3b9e7d7ca5d50ef9abd38b61
* | | | | | | | | | | | | am b8a20e68: am 11b14e39: (-s ours) LayoutLib: Use ICU\'s line break algo. ↵Deepanshu Gupta2014-10-080-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [DO NOT MERGE] * commit 'b8a20e682d60b0cec3b9f5f6adb9a69e980a68ea': LayoutLib: Use ICU's line break algo. [DO NOT MERGE]
| * | | | | | | | | | | | am 11b14e39: (-s ours) LayoutLib: Use ICU\'s line break algo. [DO NOT MERGE]Deepanshu Gupta2014-10-080-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '11b14e3996d3602155d6a61afb286e5bc0941a1f': LayoutLib: Use ICU's line break algo. [DO NOT MERGE]
| | * | | | | | | | | | | LayoutLib: Use ICU's line break algo. [DO NOT MERGE]Deepanshu Gupta2014-10-082-0/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7e5b0ab7423a72f5a4b0e1163d0a537f0b03ba07 (cherry picked from commit 760f6394d0f65fbb5365186e8e068d53c506b653)
* | | | | | | | | | | | | am 318f0fe4: AudioService: Fix monitorRotation for landscape applicationsJon Eklund2014-10-081-8/+34
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '318f0fe43bdc4b2f6764edd91d6b78d9875ffdeb': AudioService: Fix monitorRotation for landscape applications
| * | | | | | | | | | | | AudioService: Fix monitorRotation for landscape applicationsJon Eklund2014-10-081-8/+34
| | |_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Current implmentation only sends rotation updates on orientation changes, so does not handle direct 0<->180 or 90<->270 transitions. Update rotation based on an OrientationEventListener instead of Intent.ACTION_CONFIGURATION_CHANGED Bug 17606902 Change-Id: I01dfcd1c587f5b2e8a96365c2389782ad77936ef
* | | | | | | | | | | | am fdbbed60: am 916a6ea3: am 6af8fc7f: Merge "docs:64 bit image and skd ↵Rich Slogar2014-10-082-1/+40
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | update" into klp-modular-docs * commit 'fdbbed6090d47c5ebbf254dfda7a87ef154c8a2c': docs:64 bit image and skd update
| * | | | | | | | | | | am 916a6ea3: am 6af8fc7f: Merge "docs:64 bit image and skd update" into ↵Rich Slogar2014-10-082-1/+40
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | klp-modular-docs * commit '916a6ea30377730d578692b625b1c18aa9f13564': docs:64 bit image and skd update