git.osdn.net Git - android-x86/frameworks-base.git/log

(root) / android-x86 / frameworks-base.git / log

Elliott Hughes [Tue, 9 Dec 2014 23:46:44 +0000 (23:46 +0000)]

am d50a5e74: am afc5b22c: am da30b545: Merge "Fix typo."

* commit 'd50a5e7486432f7554f5135ac0609531d0fa8663':
Fix typo.

commit | commitdiff | tree

Jorim Jaggi [Tue, 9 Dec 2014 23:46:38 +0000 (23:46 +0000)]

am 6c0c349f: am bd6aff3b: am 9ba89ad8: Merge "Make hint text centerred if multiline" into lmp-mr1-dev

* commit '6c0c349f82d0d94eda4b2a6d3b97ec6c24abdccd':
Make hint text centerred if multiline

commit | commitdiff | tree

Jorim Jaggi [Tue, 9 Dec 2014 23:46:34 +0000 (23:46 +0000)]

am 029c90fd: am d1aa0273: am 99117c9b: Merge "Reinspect notification for dark mode when updated" into lmp-mr1-dev

* commit '029c90fdb181e13737b42ae54f099514f1c55b10':
Reinspect notification for dark mode when updated

commit | commitdiff | tree

Jorim Jaggi [Tue, 9 Dec 2014 23:46:29 +0000 (23:46 +0000)]

am ef9db949: am fa9f1c5d: am 0d0bd44d: Merge "Update dark mode when notification is updated" into lmp-mr1-dev

* commit 'ef9db94914cc2614ec6828719f2bf7a5d4a57f51':
Update dark mode when notification is updated

commit | commitdiff | tree

Dan Sandler [Tue, 9 Dec 2014 23:46:24 +0000 (23:46 +0000)]

am 4ced1d95: am 7971db8c: am c8466327: Squelch chatty log messages.

* commit '4ced1d959024e2d74f92d9fbdd21b787fd1ba53c':
Squelch chatty log messages.

commit | commitdiff | tree

Dan Sandler [Tue, 9 Dec 2014 23:46:19 +0000 (23:46 +0000)]

am c0f60f5e: am 139619b7: am e912c9cc: Repair wifi/cellular kerning.

* commit 'c0f60f5e55d9d3f3c11c850b7c804f786fa8ae29':
Repair wifi/cellular kerning.

commit | commitdiff | tree

Mathieu Chartier [Tue, 9 Dec 2014 23:45:42 +0000 (23:45 +0000)]

am f9a1f1bb: am 7a811fc7: (-s ours) am fb5c932d: Merge "Add more -d dalvik details to dumpsys"

* commit 'f9a1f1bb95b3f79667b4e7fd69eef2773fae892d':
Add more -d dalvik details to dumpsys

commit | commitdiff | tree

Dmitriy Ivanov [Tue, 9 Dec 2014 23:44:57 +0000 (23:44 +0000)]

am 5a785719: am 4fed05b4: am f0070999: Merge "Remove unsed check for simulator"

* commit '5a785719492519afe54eb2dbde3094253826d695':
Remove unsed check for simulator

commit | commitdiff | tree

Lajos Molnar [Tue, 9 Dec 2014 23:23:50 +0000 (23:23 +0000)]

am 77d3489a: am 3547de2f: am 9d6fa062: Merge "media: fix isSupportedFormat for integer frame rate"

* commit '77d3489ac7342840b7376c9484e5c9f12c163d3c':
media: fix isSupportedFormat for integer frame rate

commit | commitdiff | tree

Lajos Molnar [Tue, 9 Dec 2014 23:23:46 +0000 (23:23 +0000)]

am bbd58d88: am f5375fbd: am 38935e6e: Merge "media: allow full range of Vorbis sampling rates"

* commit 'bbd58d88f0d3ed891dbe15116bfbd1496052b586':
media: allow full range of Vorbis sampling rates

commit | commitdiff | tree

Narayan Kamath [Tue, 9 Dec 2014 23:23:41 +0000 (23:23 +0000)]

am 8ff1a5ee: am 56206042: am bdc6cde7: Merge "Fix PhoneStateListener constructor javadoc."

* commit '8ff1a5ee0df9abba4fc63bcfc93efbda4a176255':
Fix PhoneStateListener constructor javadoc.

commit | commitdiff | tree

Sebastien Hertz [Tue, 9 Dec 2014 23:23:36 +0000 (23:23 +0000)]

am 70acd9b3: resolved conflicts for merge of beb84982 to lmp-mr1-dev-plus-aosp

* commit '70acd9b36a9fc0d212b25d64f4edf0fc582331cf':
Work on issue #18640385: Add procstats test mode

commit | commitdiff | tree

Mathieu Chartier [Tue, 9 Dec 2014 23:22:38 +0000 (23:22 +0000)]

am e417db6d: am 4ec1bdf5: am 52070f81: Merge "Add more -d dalvik details to dumpsys" into lmp-mr1-dev

* commit 'e417db6d574e90566e827bb2a1e5efeaa9c6d42e':
Add more -d dalvik details to dumpsys

commit | commitdiff | tree

Pavel Zhamaitsiak [Tue, 9 Dec 2014 23:22:33 +0000 (23:22 +0000)]

am 963db3fa: am c67da06d: am 0f78ad87: Merge "IMS: start and stop dtmf tones." into lmp-mr1-dev

* commit '963db3fa697016051a570ccb2d6b566db4f2d594':
IMS: start and stop dtmf tones.

commit | commitdiff | tree

Adam Lesinski [Tue, 9 Dec 2014 23:22:00 +0000 (23:22 +0000)]

am 55188f59: am c765655a: am fbba9b57: Merge "AAPT: Dump status of required flag for uses-feature" into lmp-mr1-dev

* commit '55188f591844ce34e9c1862f10a85d89fa20cb91':
AAPT: Dump status of required flag for uses-feature

commit | commitdiff | tree

Alan Viverette [Tue, 9 Dec 2014 23:21:43 +0000 (23:21 +0000)]

am 2bbf5575: am 4b944f3a: am 7781647a: Merge "Fix auto-advance regression in radial time picker" into lmp-mr1-dev

* commit '2bbf5575e71f414d7ad8333d5daeef13ace04cfa':
Fix auto-advance regression in radial time picker

commit | commitdiff | tree

Santos Cordon [Tue, 9 Dec 2014 23:20:31 +0000 (23:20 +0000)]

am 02775fca: am 8dd185b0: am 5d2c1e69: (Telecom-system part 3) Adding Telecom Loader Service

* commit '02775fca2b78af8089e9f50575ca639898f4f21c':
(Telecom-system part 3) Adding Telecom Loader Service

commit | commitdiff | tree

Jeff Sharkey [Tue, 9 Dec 2014 23:20:26 +0000 (23:20 +0000)]

am ea06d6ce: am 2f1e953f: am 4df65bf1: Merge "Direct notification of network interface changes." into lmp-mr1-dev

* commit 'ea06d6ceb70a0a091cae674bb7296bb470f7e594':
Direct notification of network interface changes.

commit | commitdiff | tree

Alan Viverette [Tue, 9 Dec 2014 23:20:21 +0000 (23:20 +0000)]

am 08431d05: am c3e16fe3: am 3ba83288: Merge "Add focused & disabled states for spinner assets" into lmp-mr1-dev

* commit '08431d056990f2dd3bd0d3a0ac8ea9006b423315':
Add focused & disabled states for spinner assets

commit | commitdiff | tree

Jinsuk Kim [Tue, 9 Dec 2014 23:20:16 +0000 (23:20 +0000)]

am 1365a398: am 19e53e9c: am c414f466: Merge "CEC: Explictly remove and add device when updating" into lmp-mr1-dev

* commit '1365a3985d961adbe36d12bf3ebff82e30243d74':
CEC: Explictly remove and add device when updating

commit | commitdiff | tree

Alan Viverette [Tue, 9 Dec 2014 23:20:11 +0000 (23:20 +0000)]

am f758af4e: am 32230b2b: am 882a1e89: Merge "Let host view handle long-press when using drag-to-open" into lmp-mr1-dev

* commit 'f758af4e72db1055bae180b3ac92a8194b8653fd':
Let host view handle long-press when using drag-to-open

commit | commitdiff | tree

Alan Viverette [Tue, 9 Dec 2014 23:20:07 +0000 (23:20 +0000)]

am b0efde16: am 5a8b956f: am db82c9e0: Merge "Fix regression, don\'t NPE if Switch doesn\'t have a thumb set" into lmp-mr1-dev

* commit 'b0efde16ea2418e63e535aa186b5df1352209d1a':
Fix regression, don't NPE if Switch doesn't have a thumb set

commit | commitdiff | tree

Svet Ganov [Tue, 9 Dec 2014 23:20:02 +0000 (23:20 +0000)]

am aad2ffe6: am 7f980d75: am 381a4236: Merge "When accessibility on cannot click on a view covered by a HorizontalScrollView" into lmp-mr1-dev

* commit 'aad2ffe67af43fcfc8784b57c0fb9fe4687c9d69':
When accessibility on cannot click on a view covered by a HorizontalScrollView

commit | commitdiff | tree

Svet Ganov [Tue, 9 Dec 2014 23:19:58 +0000 (23:19 +0000)]

am 2dbd133c: am a91256bc: am e232d4a6: Merge "Clear clicked nodes from the accessibiliy cache." into lmp-mr1-dev

* commit '2dbd133c966a3b1acc51a9b645622667830c7e3e':
Clear clicked nodes from the accessibiliy cache.

commit | commitdiff | tree

John Spurlock [Tue, 9 Dec 2014 23:18:40 +0000 (23:18 +0000)]

am 9cfdb4f6: am 967e19a4: am 2f47eaff: Merge "Volume: Only play the new vibrate hint once per volume-down." into lmp-mr1-dev

* commit '9cfdb4f658b7f366780ccd1102959afcb76640b1':
Volume: Only play the new vibrate hint once per volume-down.

commit | commitdiff | tree

Joe Fernandez [Tue, 9 Dec 2014 22:23:48 +0000 (22:23 +0000)]

am d50390ec: am 17ab7f49: am cdcabe4c: am d6a66d84: am 6ecc6d59: am 88b8b4a5: Merge "docs: studio revision update 1.0" into lmp-docs

* commit 'd50390ecde4b762217a4508db54ed478267a7286':
docs: studio revision update 1.0

commit | commitdiff | tree

Rich Slogar [Tue, 9 Dec 2014 22:23:43 +0000 (22:23 +0000)]

am 99253bff: am 53202d01: am 1dfaa3a0: am 78264a4d: am 0039a73b: am b7ef7fcd: Merge "docs: skd tools revision 24.0.0" into lmp-docs

* commit '99253bff20d8106ef30d388c5ad1941fbb999973':
docs: skd tools revision 24.0.0

commit | commitdiff | tree

Alan Viverette [Tue, 9 Dec 2014 22:23:37 +0000 (22:23 +0000)]

am 5a50a8bc: am e615da7e: am f1792c42: Merge "Fix hotspot coordinate propagation in ViewGroup and AbsListView" into lmp-mr1-dev

* commit '5a50a8bcabdb2593b48b06854a7455318399b6d1':
Fix hotspot coordinate propagation in ViewGroup and AbsListView

commit | commitdiff | tree

Winson Chung [Tue, 9 Dec 2014 22:23:33 +0000 (22:23 +0000)]

am b8c4a0f9: am 87024f73: am 16158852: Merge "Ensure that loading and unloading of tasks happen symmetrically with lifecycle events. (Bug 18574950)" into lmp-mr1-dev

* commit 'b8c4a0f99864378dc256c66db22970a53a82fc4c':
Ensure that loading and unloading of tasks happen symmetrically with lifecycle events. (Bug 18574950)

commit | commitdiff | tree

smain@google.com [Tue, 9 Dec 2014 22:23:28 +0000 (22:23 +0000)]

am c37424dc: am 54403cf8: am 97afbe1e: am 39519067: am a4924046: am d48168bd: add survey link

* commit 'c37424dcfe3a354c7528855a64bf09b943e8b035':
add survey link

commit | commitdiff | tree

Geoff Mendal [Tue, 9 Dec 2014 22:23:24 +0000 (22:23 +0000)]

am 20ed21a5: (-s ours) am d7be88dc: (-s ours) am 878b49dc: (-s ours) am 31a23f3b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev

* commit '20ed21a5d52fe2a6b1d86bbeb3ca447d7f8aa6dc':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Jeff Sharkey [Tue, 9 Dec 2014 22:23:19 +0000 (22:23 +0000)]

am d5b5576d: am 5b41696c: am a8fb5803: Merge "Offer to "merge" subscribers for data usage." into lmp-mr1-dev

* commit 'd5b5576dd6565a61030d7769a44bd5189242a7e2':
Offer to "merge" subscribers for data usage.

commit | commitdiff | tree

Alan Viverette [Tue, 9 Dec 2014 22:23:14 +0000 (22:23 +0000)]

am 87dd3428: am 3891784f: am 3ad41537: Merge "Adjust edit text layout, ripple alphas to be closer to Material spec" into lmp-mr1-dev

* commit '87dd3428f04031f3b13dba5a4c202ab4ab6932fc':
Adjust edit text layout, ripple alphas to be closer to Material spec

commit | commitdiff | tree

Geoff Mendal [Tue, 9 Dec 2014 22:23:10 +0000 (22:23 +0000)]

am 0d77548c: (-s ours) am 654d8805: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev

* commit '0d77548cda02c3ab2e37d13cfc2edf57239c4372':
Import translations. DO NOT MERGE

commit | commitdiff | tree

John Spurlock [Tue, 9 Dec 2014 22:23:04 +0000 (22:23 +0000)]

am ef10307e: am 20a46fb1: am 2ea3650d: Merge "Zen: New behavior for built-in downtime + nextalarm conditions." into lmp-mr1-dev

* commit 'ef10307e4a4942c5867ba696e12e13556ac7a716':
Zen: New behavior for built-in downtime + nextalarm conditions.

commit | commitdiff | tree

Geoff Mendal [Tue, 9 Dec 2014 22:23:00 +0000 (22:23 +0000)]

am fb4c06da: (-s ours) am fb293b9f: (-s ours) am 9eb2092e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

* commit 'fb4c06dafb8c4d04e94f26f3c59d351103f340db':
Import translations. DO NOT MERGE

commit | commitdiff | tree

smain@google.com [Tue, 9 Dec 2014 22:22:56 +0000 (22:22 +0000)]

am 4df464d0: am 8bd51aa5: am 983ba2ba: am 9a379e73: am 341c518f: am 43838855: fix migrate instruction step

* commit '4df464d053669392e1f1c235744ff5359b9f84cd':
fix migrate instruction step

commit | commitdiff | tree

Jinsuk Kim [Tue, 9 Dec 2014 22:22:52 +0000 (22:22 +0000)]

am ec3f3244: am 33697d85: am 78a73577: Merge "CEC: Update CEC device info properly" into lmp-mr1-dev

* commit 'ec3f3244ae5b995fa981a216da3c21d387fb050a':
CEC: Update CEC device info properly

commit | commitdiff | tree

Geoff Mendal [Tue, 9 Dec 2014 22:22:48 +0000 (22:22 +0000)]

am 6e5522ca: (-s ours) am a551f6c8: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev

* commit '6e5522ca814d1bd0882b57bbe5abe9c0af413bc6':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Tue, 9 Dec 2014 22:22:36 +0000 (22:22 +0000)]

am 18446cb1: (-s ours) am b266393e: (-s ours) am b9f245d4: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

* commit '18446cb185ba29a300c0d3d7a20b86a318c2939f':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Jason Monk [Tue, 9 Dec 2014 22:22:31 +0000 (22:22 +0000)]

am d3eee336: am 15a8a153: am 32eb928c: Merge "QS Wifi panel show icon on secure networks" into lmp-mr1-dev

* commit 'd3eee336d68bf44aba42a834bdf76a8fa1c8f5e8':
QS Wifi panel show icon on secure networks

commit | commitdiff | tree

Geoff Mendal [Tue, 9 Dec 2014 22:22:26 +0000 (22:22 +0000)]

am c34118a7: (-s ours) am 9c00c3d5: (-s ours) am 8510d014: (-s ours) Import translations. DO NOT MERGE

* commit 'c34118a70d5a9e91cfbb5c532d74aedd3d67d968':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Tue, 9 Dec 2014 22:22:22 +0000 (22:22 +0000)]

am f10f2f47: (-s ours) am e734a86b: (-s ours) Import translations. DO NOT MERGE

* commit 'f10f2f47b5db1132362af9c76a1577ccc95fb92d':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Zoltan Szatmary-Ban [Tue, 9 Dec 2014 22:22:17 +0000 (22:22 +0000)]

am 32ed193b: am f5e44c29: am c5c93edd: Merge "When switching to default USB function set, check restriction" into lmp-mr1-dev

* commit '32ed193bb5396451401e62493f83664da9228729':
When switching to default USB function set, check restriction

commit | commitdiff | tree

Jinsuk Kim [Tue, 9 Dec 2014 22:22:13 +0000 (22:22 +0000)]

am 4fffb748: am 0cc53a5b: am 15556bbb: Merge "CEC: Disable debug logging" into lmp-mr1-dev

* commit '4fffb7484755e3599099aacd9771b0b4e080242c':
CEC: Disable debug logging

commit | commitdiff | tree

smain@google.com [Tue, 9 Dec 2014 22:19:57 +0000 (14:19 -0800)]

resolved conflicts for merge of c137d08c to master

Change-Id: I1addaa7b46e893014eca23746c6bf5f7e71dc2ca

commit | commitdiff | tree

smain@google.com [Tue, 9 Dec 2014 22:14:11 +0000 (14:14 -0800)]

resolved conflicts for merge of 132004f8 to master

Change-Id: I35c6ef810daf2b1329c46798fe6c7e6f2c1dfc82

commit | commitdiff | tree

smain@google.com [Tue, 9 Dec 2014 22:09:30 +0000 (22:09 +0000)]

am dbb636fc: (-s ours) am befef081: am 2b4bd09c: am d9c08bac: am 895ab42f: am 59a3dd7b: misc fixes for studio launch: update install instructions, update tools nav for AVD page, update AVD instructions in first app class, other edits to first app.

* commit 'dbb636fc5355d63f0c3348dbb88e27c6f0ae4c5c':
misc fixes for studio launch: update install instructions, update tools nav for AVD page, update AVD instructions in first app class, other edits to first app.

commit | commitdiff | tree

Joe Fernandez [Tue, 9 Dec 2014 21:59:52 +0000 (21:59 +0000)]

Merge "resolved conflicts for merge of 66189de6 to master"

commit | commitdiff | tree

Joe Fernandez [Tue, 9 Dec 2014 21:58:23 +0000 (13:58 -0800)]

resolved conflicts for merge of 66189de6 to master

Change-Id: Id4a80013dd506bd1135dd931450ee2a08a4c77aa

commit | commitdiff | tree

smain@google.com [Tue, 9 Dec 2014 20:21:52 +0000 (20:21 +0000)]

am 6310c323: am 42b65c6e: am 4ec024e9: am 71319f28: am 160e7607: am dee9e37e: Merge "add studio 1.0 files and reorder features list" into lmp-docs

* commit '6310c32386b053fe25a8e2c11354de65681088b3':
add studio 1.0 files and reorder features list

commit | commitdiff | tree

Joe Fernandez [Tue, 9 Dec 2014 20:12:24 +0000 (12:12 -0800)]

resolved conflicts for merge of dda0cb9f to master

Change-Id: Id649a91b403f0b6c077ada1c11495657ddc6d181

commit | commitdiff | tree

Elliott Hughes [Tue, 9 Dec 2014 16:17:34 +0000 (16:17 +0000)]

am afc5b22c: am da30b545: Merge "Fix typo."

* commit 'afc5b22c229b94228aa5ae1ff20117c9c76ba2ad':
Fix typo.

commit | commitdiff | tree

Elliott Hughes [Tue, 9 Dec 2014 16:11:01 +0000 (16:11 +0000)]

am da30b545: Merge "Fix typo."

* commit 'da30b545f93757d15e4ed58fe8946ada9d8cc3e0':
Fix typo.

commit | commitdiff | tree

Elliott Hughes [Tue, 9 Dec 2014 16:02:56 +0000 (16:02 +0000)]

Merge "Fix typo."

commit | commitdiff | tree

Jorim Jaggi [Tue, 9 Dec 2014 15:40:54 +0000 (15:40 +0000)]

am bd6aff3b: am 9ba89ad8: Merge "Make hint text centerred if multiline" into lmp-mr1-dev

* commit 'bd6aff3b58ee3ee6be0cd657d8b227483d37d96f':
Make hint text centerred if multiline

commit | commitdiff | tree

Jorim Jaggi [Tue, 9 Dec 2014 15:40:48 +0000 (15:40 +0000)]

am d1aa0273: am 99117c9b: Merge "Reinspect notification for dark mode when updated" into lmp-mr1-dev

* commit 'd1aa0273dda18216cbe0d5161e644eb1680875fc':
Reinspect notification for dark mode when updated

commit | commitdiff | tree

Jorim Jaggi [Tue, 9 Dec 2014 15:40:42 +0000 (15:40 +0000)]

am fa9f1c5d: am 0d0bd44d: Merge "Update dark mode when notification is updated" into lmp-mr1-dev

* commit 'fa9f1c5d42c3716062323c34ca502d17e284d536':
Update dark mode when notification is updated

commit | commitdiff | tree

Dan Sandler [Tue, 9 Dec 2014 15:40:34 +0000 (15:40 +0000)]

am 7971db8c: am c8466327: Squelch chatty log messages.

* commit '7971db8cfca67b8d7d37e339cb1b021a1da6ee06':
Squelch chatty log messages.

commit | commitdiff | tree

Dan Sandler [Tue, 9 Dec 2014 15:40:28 +0000 (15:40 +0000)]

am 139619b7: am e912c9cc: Repair wifi/cellular kerning.

* commit '139619b753e906c33ece2f1fc040ddd118980d8c':
Repair wifi/cellular kerning.

commit | commitdiff | tree

Jorim Jaggi [Tue, 9 Dec 2014 15:18:25 +0000 (15:18 +0000)]

am 9ba89ad8: Merge "Make hint text centerred if multiline" into lmp-mr1-dev

* commit '9ba89ad8ebb7d7917ee2afa319929b153743d8b9':
Make hint text centerred if multiline

commit | commitdiff | tree

Jorim Jaggi [Tue, 9 Dec 2014 15:18:20 +0000 (15:18 +0000)]

am 99117c9b: Merge "Reinspect notification for dark mode when updated" into lmp-mr1-dev

* commit '99117c9b11784ba37c07ab3e696fb90c03326474':
Reinspect notification for dark mode when updated

commit | commitdiff | tree

Jorim Jaggi [Tue, 9 Dec 2014 15:18:15 +0000 (15:18 +0000)]

am 0d0bd44d: Merge "Update dark mode when notification is updated" into lmp-mr1-dev

* commit '0d0bd44d649c21cc7368a988a894d221e6731c0d':
Update dark mode when notification is updated

commit | commitdiff | tree

Jorim Jaggi [Tue, 9 Dec 2014 15:11:36 +0000 (15:11 +0000)]

Merge "Make hint text centerred if multiline" into lmp-mr1-dev

commit | commitdiff | tree

Jorim Jaggi [Tue, 9 Dec 2014 15:11:20 +0000 (15:11 +0000)]

Merge "Reinspect notification for dark mode when updated" into lmp-mr1-dev

commit | commitdiff | tree

Jorim Jaggi [Tue, 9 Dec 2014 15:10:49 +0000 (15:10 +0000)]

Merge "Update dark mode when notification is updated" into lmp-mr1-dev

commit | commitdiff | tree

Mathieu Chartier [Tue, 9 Dec 2014 15:03:12 +0000 (15:03 +0000)]

am 7a811fc7: (-s ours) am fb5c932d: Merge "Add more -d dalvik details to dumpsys"

* commit '7a811fc7f23e4375a29ac5e7cfaf88efd657c33f':
Add more -d dalvik details to dumpsys

commit | commitdiff | tree

smain@google.com [Tue, 9 Dec 2014 14:52:16 +0000 (14:52 +0000)]

am 7e5fbc1d: am 8804b2a6: am 4e0575be: am c10acd71: am 9a041f18: am d3c9f2b9: update studio hero image and add section about code editor [CP]

* commit '7e5fbc1dc03e577ae37bfbc634a2ebb2cd2c5b32':
update studio hero image and add section about code editor [CP]

commit | commitdiff | tree

Rich Slogar [Tue, 9 Dec 2014 14:52:11 +0000 (14:52 +0000)]

am 85f69e0b: am 6a0e1906: am 8fa02c18: am 08ba05b9: am 6cc5e87d: am 4083327e: docs:build system updates [CP]

* commit '85f69e0b96844551157db7051c0d98c43c5d7b4a':
docs:build system updates [CP]

commit | commitdiff | tree

smain@google.com [Tue, 9 Dec 2014 14:52:07 +0000 (14:52 +0000)]

am 48590173: (-s ours) am 8e29e218: am acd40aa9: am 67fa34e9: am 2d0cf342: am d0c79c4e: fix migrate guide and other studio edits [CP]

* commit '485901732ecbb549109de1a496058c987c9a8647':
fix migrate guide and other studio edits [CP]

commit | commitdiff | tree

smain@google.com [Tue, 9 Dec 2014 14:45:33 +0000 (14:45 +0000)]

am ae3a1d70: (-s ours) am 8dac5b5e: am fedf3943: am c493dd3f: am e9f63a0f: am 5797e272: docs:sdk installing file update [CP]

* commit 'ae3a1d70e5870847fb5fadcbbd7cc342a4edee18':
docs:sdk installing file update [CP]

commit | commitdiff | tree

Dan Sandler [Tue, 9 Dec 2014 14:45:24 +0000 (14:45 +0000)]

am c8466327: Squelch chatty log messages.

* commit 'c846632762f0579d504d90e5b986183779fcf034':
Squelch chatty log messages.

commit | commitdiff | tree

Dan Sandler [Tue, 9 Dec 2014 14:45:19 +0000 (14:45 +0000)]

am e912c9cc: Repair wifi/cellular kerning.

* commit 'e912c9cc39807f95815400981ed27d121e8b293a':
Repair wifi/cellular kerning.

commit | commitdiff | tree

Dmitriy Ivanov [Tue, 9 Dec 2014 14:40:56 +0000 (14:40 +0000)]

am 4fed05b4: am f0070999: Merge "Remove unsed check for simulator"

* commit '4fed05b4e679276050b5eaad51ce96848ddc561e':
Remove unsed check for simulator

commit | commitdiff | tree

smain@google.com [Tue, 9 Dec 2014 14:39:03 +0000 (14:39 +0000)]

am 283a2046: (-s ours) am c5d38e73: am baa56314: am f0eee644: am 521d7277: am 29e13c5a: new Android Studio download page [CP]

* commit '283a2046d23214f4a5beff9454a2e9781dbccffe':
new Android Studio download page [CP]

commit | commitdiff | tree

Dan Sandler [Mon, 8 Dec 2014 20:42:52 +0000 (15:42 -0500)]

Squelch chatty log messages.

Bug: 18666850
Change-Id: I0f9fe4fd0143b5668f66bd0a9c407a5018876b44

commit | commitdiff | tree

Dan Sandler [Mon, 8 Dec 2014 20:00:09 +0000 (15:00 -0500)]

Repair wifi/cellular kerning.

The wifi spacer should only be shown if the first mobile
network has a data type indicator.

Bug: 18665813
Change-Id: Ifcd3a61ebc8cdb76d134baa23b22f1291edadd28

commit | commitdiff | tree

Rich Slogar [Tue, 9 Dec 2014 14:29:39 +0000 (14:29 +0000)]

am b2b89de6: (-s ours) am d0a96b67: am cd13e657: am ca61ce33: am e1136835: am 5d9d7610: docs: publishing with studio [CP]

* commit 'b2b89de6079bb5471dc396637cc7ef4e1cb8a0fd':
docs: publishing with studio [CP]

commit | commitdiff | tree

smain@google.com [Tue, 9 Dec 2014 13:57:58 +0000 (13:57 +0000)]

am 2153969c: (-s ours) am d1ffd1e3: am 139c7def: am 53513e9e: am 5962474c: am fc64b70a: docs: new Eclipse menu [CP]

* commit '2153969c199ecda6ff4f19bf2d6a34a9bbbe8a59':
docs: new Eclipse menu [CP]

commit | commitdiff | tree

Rich Slogar [Tue, 9 Dec 2014 13:38:23 +0000 (13:38 +0000)]

am 3d368a16: (-s ours) am 2e3daaa6: am 6bbb5ed1: am 43304cfc: am 9e6ad10b: am e3fe9382: docs: studio basics v2 [CP]

* commit '3d368a16d8bb7849abd36ba9b337a6576040111d':
docs: studio basics v2 [CP]

commit | commitdiff | tree

Rich Slogar [Tue, 9 Dec 2014 13:21:38 +0000 (13:21 +0000)]

am a5155276: (-s ours) am e20c9496: am 0b52c5b3: am 88546c85: am 47a19d5d: am fdeb27f9: docs:download updates for studio [CP]

* commit 'a51552768bfab83b68f1e7310c3660ec905d16c3':
docs:download updates for studio [CP]

commit | commitdiff | tree

Rich Slogar [Tue, 9 Dec 2014 11:30:05 +0000 (11:30 +0000)]

am da5184e2: (-s ours) am 7593c6ce: am bcb57c70: am 05d1ba69: am 84f7d62b: am 153c8287: docs:revision updates

* commit 'da5184e2dc44b04fb54619b487e56f8b9bdb8638':
docs:revision updates

commit | commitdiff | tree

Lajos Molnar [Tue, 9 Dec 2014 11:25:28 +0000 (11:25 +0000)]

am 3547de2f: am 9d6fa062: Merge "media: fix isSupportedFormat for integer frame rate"

* commit '3547de2f15310c266ab0cc35736cfc5a11950f60':
media: fix isSupportedFormat for integer frame rate

commit | commitdiff | tree

Lajos Molnar [Tue, 9 Dec 2014 11:25:22 +0000 (11:25 +0000)]

am f5375fbd: am 38935e6e: Merge "media: allow full range of Vorbis sampling rates"

* commit 'f5375fbd8ef47f9c285ec2ccf857d673ed15d30d':
media: allow full range of Vorbis sampling rates

commit | commitdiff | tree

Narayan Kamath [Tue, 9 Dec 2014 11:25:04 +0000 (11:25 +0000)]

am 56206042: am bdc6cde7: Merge "Fix PhoneStateListener constructor javadoc."

* commit '5620604261a24419bb87a4540f1a4ff333d32a3f':
Fix PhoneStateListener constructor javadoc.

commit | commitdiff | tree

Przemyslaw Szczepaniak [Tue, 9 Dec 2014 11:13:42 +0000 (11:13 +0000)]

Merge "Add UtteranceProgressListener#onStop callback"

commit | commitdiff | tree

Wonsik Kim [Tue, 9 Dec 2014 11:06:16 +0000 (11:06 +0000)]

am a565716a: am 14965d0e: am 2abd2dd1: Merge "TIF: TvInputHardwareManager to listen to volume changes" into lmp-mr1-dev

* commit 'a565716a2a26c7522dabfb28f646508cc1928053':
TIF: TvInputHardwareManager to listen to volume changes

commit | commitdiff | tree

Jean-Michel Trivi [Tue, 9 Dec 2014 11:06:11 +0000 (11:06 +0000)]

am 83d0c86b: am d14f98fd: am 8638877f: Merge "Support collaborative audio focus handling" into lmp-mr1-dev

* commit '83d0c86b869fe84b3172028a5598ebd87ce7745b':
Support collaborative audio focus handling

commit | commitdiff | tree

Rich Slogar [Tue, 9 Dec 2014 11:06:07 +0000 (11:06 +0000)]

am 458a3b8a: am 1ce435cb: am 13a69707: am 1e51b3ae: am 14864414: am f7f20a45: docs:building your first app [CP]

* commit '458a3b8afdd0f152902d4930f9fa22bf226b6227':
docs:building your first app [CP]

commit | commitdiff | tree

Przemyslaw Szczepaniak [Wed, 19 Nov 2014 17:36:57 +0000 (17:36 +0000)]

Add UtteranceProgressListener#onStop callback

New UtteranceProgressListener callback that allows
to detect a call to TextToSpeech#stop() (or QUEUE_FLUSH usage)
from the same client, or a QUEUE_DESTROY usage from any other
client (Talkback uses it to preempt other users of TextToSpeech
queue). This change is required for seamless Books read aloud
feature+Talkback usage.

+ Fixes for broken tests/TtsTests

Bug: 17901521

Change-Id: I30d2f297bb7c8d05cbeb16f63e85c1be0cca5c84

commit | commitdiff | tree

smain@google.com [Tue, 9 Dec 2014 11:06:02 +0000 (11:06 +0000)]

am 6eef2c3a: am 6d3b6ff4: am fe3aabda: am bb642586: am 9fd7804b: am 377604af: docs: project updates [CP]

* commit '6eef2c3a44017069c5d50a469549cd1fce0c447c':
docs: project updates [CP]

commit | commitdiff | tree

smain@google.com [Tue, 9 Dec 2014 11:05:56 +0000 (11:05 +0000)]

am 7e6713fc: am 13b29519: am 382040d4: am 5b2cac58: am f5fa25ec: am 9dd6a07f: docs: setup-virtual-device [CP]

* commit '7e6713fc080d70721cd33d088f23fa66afcde12f':
docs: setup-virtual-device [CP]

commit | commitdiff | tree

Rich Slogar [Tue, 9 Dec 2014 11:05:51 +0000 (11:05 +0000)]

am b5c81893: am bc683297: am 70d5341c: am 5b440be7: am d4c89098: am f592a587: docs support library updates [CP]

* commit 'b5c81893e781aa8e11d59b027f2fa4884b700ad6':
docs support library updates [CP]

commit | commitdiff | tree

Rich Slogar [Tue, 9 Dec 2014 11:05:44 +0000 (11:05 +0000)]

am cdad9919: am 2bba0c94: am 892577b0: am 86db5b43: am ff88ac5e: am 7a69c2de: docs: debugging studio [CP]

* commit 'cdad9919ced52b1f7bd00ee442ee97e9c0fd397b':
docs: debugging studio [CP]

commit | commitdiff | tree

Rich Slogar [Tue, 9 Dec 2014 11:05:39 +0000 (11:05 +0000)]

am 059b6ef3: am 46150b5f: am 51ffc634: am bf96a239: am 5aac6042: am cc4d08b4: docs:setting up hardware devices [CP]

* commit '059b6ef35c90706ba2a37b69f77abff200b97243':
docs:setting up hardware devices [CP]

commit | commitdiff | tree

Rich Slogar [Tue, 9 Dec 2014 11:05:34 +0000 (11:05 +0000)]

am 44176d92: am 5da1430e: am a402fa5f: am f26726b1: am 63d5c3e1: am d16db79e: docs: workflow index [CP]

* commit '44176d92e0b65a9cc88a4a4d3d7b52278a22a73c':
docs: workflow index [CP]

commit | commitdiff | tree

Rich Slogar [Tue, 9 Dec 2014 11:05:29 +0000 (11:05 +0000)]

am 0622234b: am 359e5597: am d5b6d08e: am 8fbb3f6e: am cf516099: am 5e8d9a02: docs: tools help update [CP]

* commit '0622234bcc5ec27d3f57b674f98f607c101d9f4a':
docs: tools help update [CP]

commit | commitdiff | tree

Scott Rowe [Tue, 9 Dec 2014 11:05:24 +0000 (11:05 +0000)]

am 46f7dcf1: (-s ours) am 43883b11: am 044a7802: am 4bc2c3bd: am 1efca60b: am e829d8fc: docs: Training refactor for Android Studio [CP]

* commit '46f7dcf1e41c1f4fa8477b184dd3d775070220a0':
docs: Training refactor for Android Studio [CP]

commit | commitdiff | tree

Sebastien Hertz [Tue, 9 Dec 2014 08:07:25 +0000 (09:07 +0100)]

resolved conflicts for merge of beb84982 to lmp-mr1-dev-plus-aosp

Change-Id: Ib420549f3e20c149c15966dfece980b4f150177d

commit | commitdiff | tree

Elliott Hughes [Tue, 9 Dec 2014 04:47:11 +0000 (20:47 -0800)]

Fix typo.

Bug: https://code.google.com/p/android/issues/detail?id=78422
Change-Id: I0dfbb74334e126062660831a4e01817dde068b56

frameworks/base

RSS Atom

About OSDN

Find Software

Develop Software

Help