Commit Graph

177092 Commits

Author SHA1 Message Date
Rich Slogar
da66b8fb2c am da5184e2: (-s ours) am 7593c6ce: am bcb57c70: am 05d1ba69: am 84f7d62b: am 153c8287: docs:revision updates
* commit 'da5184e2dc44b04fb54619b487e56f8b9bdb8638':
  docs:revision updates
2014-12-09 11:30:05 +00:00
Przemyslaw Szczepaniak
735c31c344 Merge "Add UtteranceProgressListener#onStop callback" 2014-12-09 11:13:44 +00:00
Wonsik Kim
6573fd535e 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
2014-12-09 11:06:16 +00:00
Jean-Michel Trivi
b3f390fe86 am 83d0c86b: am d14f98fd: am 8638877f: Merge "Support collaborative audio focus handling" into lmp-mr1-dev
* commit '83d0c86b869fe84b3172028a5598ebd87ce7745b':
  Support collaborative audio focus handling
2014-12-09 11:06:11 +00:00
Rich Slogar
404f602fa7 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]
2014-12-09 11:06:07 +00:00
Przemyslaw Szczepaniak
4b73867a12 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
2014-12-09 11:06:06 +00:00
smain@google.com
e856fb7ae4 am 6eef2c3a: am 6d3b6ff4: am fe3aabda: am bb642586: am 9fd7804b: am 377604af: docs: project updates [CP]
* commit '6eef2c3a44017069c5d50a469549cd1fce0c447c':
  docs: project updates [CP]
2014-12-09 11:06:02 +00:00
smain@google.com
9a573a430a am 7e6713fc: am 13b29519: am 382040d4: am 5b2cac58: am f5fa25ec: am 9dd6a07f: docs: setup-virtual-device [CP]
* commit '7e6713fc080d70721cd33d088f23fa66afcde12f':
  docs: setup-virtual-device [CP]
2014-12-09 11:05:56 +00:00
Rich Slogar
8e1bd15a7c am b5c81893: am bc683297: am 70d5341c: am 5b440be7: am d4c89098: am f592a587: docs support library updates [CP]
* commit 'b5c81893e781aa8e11d59b027f2fa4884b700ad6':
  docs support library updates [CP]
2014-12-09 11:05:51 +00:00
Rich Slogar
067736807e am cdad9919: am 2bba0c94: am 892577b0: am 86db5b43: am ff88ac5e: am 7a69c2de: docs: debugging studio [CP]
* commit 'cdad9919ced52b1f7bd00ee442ee97e9c0fd397b':
  docs: debugging studio [CP]
2014-12-09 11:05:44 +00:00
Rich Slogar
650d4df87b 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]
2014-12-09 11:05:39 +00:00
Rich Slogar
acee3b63a4 am 44176d92: am 5da1430e: am a402fa5f: am f26726b1: am 63d5c3e1: am d16db79e: docs: workflow index [CP]
* commit '44176d92e0b65a9cc88a4a4d3d7b52278a22a73c':
  docs: workflow index [CP]
2014-12-09 11:05:34 +00:00
Rich Slogar
36595d2628 am 0622234b: am 359e5597: am d5b6d08e: am 8fbb3f6e: am cf516099: am 5e8d9a02: docs: tools help update [CP]
* commit '0622234bcc5ec27d3f57b674f98f607c101d9f4a':
  docs: tools help update [CP]
2014-12-09 11:05:29 +00:00
Scott Rowe
3e885e3fa0 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]
2014-12-09 11:05:24 +00:00
Mike Lockwood
ae13230b87 Merge "MIDI: API changes to support multiple ports per device" 2014-12-09 02:37:40 +00:00
Mike Lockwood
b6b9a91c02 MIDI: API changes to support multiple ports per device
Add MidiInputPort and MidiOutputPort classes (with MidiPort base class)
A MidiDevice can now have multiple input and output ports.
Multiple ports are currently supported only for virtual devices, USB support coming later.

Change-Id: Ib55076aa1374aa46ae4ae76ad93bd717df6d7e21
2014-12-08 17:09:14 -08:00
Jinsuk Kim
7822e6437a am 62bb43db: am 122e704a: am 4da55388: Merge "CEC: Avoid setting op in disabled mode" into lmp-mr1-dev
* commit '62bb43dbec930b7a4dc2272d8ed4da73d9aef8b1':
  CEC: Avoid setting op in disabled mode
2014-12-09 01:00:50 +00:00
David Friedman
cf7f964999 am 587d349e: am cac94aa0: am 06e922fc: am cf528ec7: am d56f55de: am caacc895: Fixes (updates) download links for NDK r10d.
* commit '587d349eff8c19ee8380cb4dc2751608986d7e83':
  Fixes (updates) download links for NDK r10d.
2014-12-09 01:00:45 +00:00
Jeff Davidson
01b43ded9b am 5550a408: am 5b8c5dd4: am 699faa1d: Merge "Show "Connected via Wi-Fi assistant" for ephemeral networks." into lmp-mr1-dev
* commit '5550a408c4b9a530674a1766875f272e46a1e1fb':
  Show "Connected via Wi-Fi assistant" for ephemeral networks.
2014-12-09 01:00:40 +00:00
Jeff Davidson
4520f656f1 am 0efd29fc: am 386effc7: am f779e6b8: Merge "Fix flipped captive portal bit in network conditions bcast." into lmp-mr1-dev
* commit '0efd29fc57c7369e2371aa3226e90f97331f517a':
  Fix flipped captive portal bit in network conditions bcast.
2014-12-09 01:00:34 +00:00
Jeff Davidson
5d0bf5de0d am 820ba1f9: am 401ef259: am a4144563: Merge "add disable Ephemeral Network API Bug:18525241" into lmp-mr1-dev
* commit '820ba1f96f5917db98df5b5d36cf5f4b32f50f59':
  add disable Ephemeral Network API Bug:18525241
2014-12-09 01:00:29 +00:00
Jeremy Joslin
902cc578a4 am d4753450: am c4b2ec1a: am 1edc73aa: Merge "Don\'t send the same PendingIntent more than once." into lmp-mr1-dev
* commit 'd4753450f37d88fec11d1405250529ca794ae70c':
  Don't send the same PendingIntent more than once.
2014-12-09 01:00:09 +00:00
Evan Charlton
d4f3f8b81a am 1b001cae: am 068a0786: am 59dac0e1: Merge "Associate a UserHandle with each PhoneAccountHandle" into lmp-mr1-dev
* commit '1b001caed3f2ee150850830dba371f13d61d5512':
  Associate a UserHandle with each PhoneAccountHandle
2014-12-09 01:00:04 +00:00
Paul Jensen
64a3ba3f2e am 446a59bc: am a4afe13a: am 891dd574: Merge "Reap unvalidated networks that have no chance of becoming highest scoring." into lmp-mr1-dev
* commit '446a59bc26ffab59e05bb0967bb27758170dbcf5':
  Reap unvalidated networks that have no chance of becoming highest scoring.
2014-12-09 01:00:00 +00:00
Jeff Tinker
6d4c6db5cf am f062d8d7: am b15a57d6: am 82cc1c5a: Merge "Unhide secure stop APIs" into lmp-mr1-dev
* commit 'f062d8d7df6b6ca72f103d133a3483cd91c95c60':
  Unhide secure stop APIs
2014-12-09 00:59:55 +00:00
Jinsong Mu
0de9745c20 am 5a181a24: am 6fac0351: am b3898fbe: Merge "Talk-back doesn\'t notify user to enter unlock PIN when device is locked with PIN lock. b/18568003" into lmp-mr1-dev
* commit '5a181a2436fb629c2298b9bfb0b2848b514edbe6':
  Talk-back doesn't notify user to enter unlock PIN when device is locked with PIN lock. b/18568003
2014-12-09 00:59:45 +00:00
Ihab Awad
88bf9bcb49 am 657f25e9: am 2b455544: am 6a1c8256: Merge "Add Text-to-Speech annotations for phone number displays (1/3)" into lmp-mr1-dev
* commit '657f25e9641e7c546032adf90b9c4bdaef36eab9':
  Add Text-to-Speech annotations for phone number displays (1/3)
2014-12-09 00:59:40 +00:00
David Friedman
5f156f9f95 am ad9e0d5e: am 7823e6ee: am 968ef51c: am c305e6eb: am 860bdc7d: am b357f74e: Merge "Updates GMSCore docs to reflect ability to selectively include APIs Bug 16679117" into lmp-docs
* commit 'ad9e0d5ed57d9d32074566e6da400d1a7313236a':
  Updates GMSCore docs to reflect ability to selectively include APIs Bug 16679117
2014-12-09 00:59:34 +00:00
RoboErik
9053ce8c20 am b22eea72: am 2d7a1b09: am d386d0f3: Merge "Route mute key events through MediaSessionService" into lmp-mr1-dev
* commit 'b22eea724b4f1d1ccbb1fd7ddd2eb3d9eb3204c8':
  Route mute key events through MediaSessionService
2014-12-09 00:59:30 +00:00
Quddus Chong
bfa063b6fd am 0d9d5d0a: am e6000f47: am 52fec470: am f7b51977: am 87644a43: am 2b32a042: Merge "docs: Added API highlights for Google Play service v6.5 (Nacho) release." into lmp-docs
* commit '0d9d5d0a838a5eaea6c5915358ee089b9ae0e45e':
  docs: Added API highlights for Google Play service v6.5 (Nacho) release.
2014-12-09 00:59:23 +00:00
Quddus Chong
754c62ab43 am a40c6b04: am f428952e: am 9deffecc: am 15c3ce77: am 0dfcfdcb: am 23056929: Merge "docs: Updated Google Play services Javadocs to reflect v6.5 (Nacho) release." into lmp-docs
* commit 'a40c6b0479c9fbc738aeb04c0cd585d00d6ba9c5':
  docs: Updated Google Play services Javadocs to reflect v6.5 (Nacho) release.
2014-12-09 00:59:17 +00:00
Wale Ogunwale
b414f005b5 am 30b74ccf: am 80d11912: am b503e3f2: Merge "Don\'t destroy surfaces of activities launched behind early." into lmp-mr1-dev
* commit '30b74ccf69474333e9ec42192fb1b23b3dcc420d':
  Don't destroy surfaces of activities launched behind early.
2014-12-09 00:59:11 +00:00
Filip Gruszczynski
4bcc9f2679 am 73f0e9a3: am 91a5dd9b: am e6a2ff2b: Merge "Fix calculation of overscan insets in WindowState." into lmp-mr1-dev
* commit '73f0e9a3feec091f67c9db00ce2d3116b6d91fbd':
  Fix calculation of overscan insets in WindowState.
2014-12-09 00:59:06 +00:00
Dianne Hackborn
9b07ba1990 am 0cfdd810: am e52a2ea0: am 0029f0ac: Merge "Fix issue #17323751: Additional items in aggregated battery stats" into lmp-mr1-dev
* commit '0cfdd810ded6f8486a6b0a61044594f58ab5c052':
  Fix issue #17323751: Additional items in aggregated battery stats
2014-12-09 00:59:01 +00:00
ztenghui
3de2fd483c am 4cb33e76: am 55034822: am 62517a6e: Merge "Fine tune the light radius from 800dp to 600dp" into lmp-mr1-dev
* commit '4cb33e7657f9adae41fda5fd95c23060f515a238':
  Fine tune the light radius from 800dp to 600dp
2014-12-09 00:19:43 +00:00
Sanket Padawe
13ead56beb am 17c2719d: am 49aeee2e: am 0c1a5bea: Merge "Doing provisioning check for wifi tethering from SystemUI" into lmp-mr1-dev
* commit '17c2719d037bee0823dd90c363cee4716ed43d5b':
  Doing provisioning check for wifi tethering from SystemUI
2014-12-09 00:19:38 +00:00
Eino-Ville Talvala
18f5141dd8 am b71d983a: am 4b905ad4: am 2ff214b6: Merge "Camera2: Add HDR scene mode for backwards compatibility." into lmp-mr1-dev
* commit 'b71d983a7ff7ba0d993c32692035ae92db0c9a44':
  Camera2: Add HDR scene mode for backwards compatibility.
2014-12-09 00:19:23 +00:00
Eino-Ville Talvala
e50e596e50 am cfdc0762: am 3e3ae5b7: am 0aaf843c: Merge "Fix docs build" into lmp-mr1-dev
* commit 'cfdc0762e22ec82fa6f6d98abf1d14d5f54ab633':
  Fix docs build
2014-12-09 00:19:15 +00:00
Stuart Scott
85ca687df8 am 6b0025ea: am eb29c733: am d2028d90: Merge "Add mapping between RAT and Network Mode" into lmp-mr1-dev
* commit '6b0025ea7ca0e7343ee95bc622261b2f3e86012a':
  Add mapping between RAT and Network Mode
2014-12-09 00:19:09 +00:00
Jing Zhao
a0973778ca am 8d50d0fb: am 23ad6efb: am df1d07b4: Add checking to find AppDirectedSmsProxy for App Directed SMS feature
* commit '8d50d0fb27c1958dbd047bb8a46d7183d873f131':
  Add checking to find AppDirectedSmsProxy for App Directed SMS feature
2014-12-09 00:19:03 +00:00
Chris Wren
0d6aacb802 am d4ba216a: am ea9abd14: am 0c5ec0e0: Merge "Avoid race condition in heads up snooze code path." into lmp-mr1-dev
* commit 'd4ba216a0f0e7b175fa1aa6a054c6f257cb88c17':
  Avoid race condition in heads up snooze code path.
2014-12-09 00:18:57 +00:00
Christopher Tate
6e69f370f9 am a2a5d4d0: am 41b0cbb3: am 2aa909f0: Merge "Correctly parse previous PMBA state during backup" into lmp-mr1-dev
* commit 'a2a5d4d043378b1a7e3630f89f182a32affac27f':
  Correctly parse previous PMBA state during backup
2014-12-09 00:18:52 +00:00
Christopher Tate
891663f9fc am bd2d8202: am a42d95f1: am 8ec2dc00: Merge "Tune delivery and batching of alarms" into lmp-mr1-dev
* commit 'bd2d8202e353cda22e288452c4feb8344f20c5ef':
  Tune delivery and batching of alarms
2014-12-09 00:18:47 +00:00
Pavel Zhamaitsiak
0cec63a283 am 913c9895: am d89f0d3d: am b81ce34a: Merge "Revert "Merge "Remove CONNECTIVITY_CHANGE_DELAY and friends." into lmp-mr1-dev"" into lmp-mr1-dev
* commit '913c9895466c6749aa1c41b875d69d5de3e3b66b':
  Revert "Merge "Remove CONNECTIVITY_CHANGE_DELAY and friends." into lmp-mr1-dev"
2014-12-09 00:18:39 +00:00
Justin Harrison
04e8a5fb4c am e0b2fa5c: am 87797c05: am 4a9cecb1: Merge "Add UUID for Pbap client" into lmp-mr1-dev
* commit 'e0b2fa5c57c64ffbfebcdcca0b2c96a70cf49983':
  Add UUID for Pbap client
2014-12-09 00:18:35 +00:00
Ihab Awad
cbf5984bbc am 91fd7728: am 9ae44f92: am 710e20d2: Merge "Relax access on deprecated fields for compatibility." into lmp-mr1-dev
* commit '91fd77283b41e988e6dea0ba02a5994f00b8e1ad':
  Relax access on deprecated fields for compatibility.
2014-12-09 00:18:30 +00:00
Dan Sandler
864fda2cc7 am b3014b0f: am 9e3adb82: am 4ca9d738: Merge "RTL support for Lollipop Land." into lmp-mr1-dev
* commit 'b3014b0f3ae26c5b8e42bee79600a293787866da':
  RTL support for Lollipop Land.
2014-12-09 00:18:26 +00:00
Fyodor Kupolov
77779aa3a5 am d483a85e: am fed2812d: am 22afe626: Merge "Added isRemovingAdmin method" into lmp-mr1-dev
* commit 'd483a85e69c3bb83b25473b93806e063b72c9315':
  Added isRemovingAdmin method
2014-12-09 00:18:21 +00:00
Amith Yamasani
0d1f8bf705 am 333c4a96: am 50734b70: am 43606641: Merge "Correct check of is user running" into lmp-mr1-dev
* commit '333c4a968edc48d4a0ceb1e82f8f9b520696be8a':
  Correct check of is user running
2014-12-09 00:18:16 +00:00
Cheuksan Wang
8b3f47b35a am 673f443f: am 695b5d25: am 0752da22: Merge "add system|signature protection to android.permission.BIND_CARRIER_MESSAGING_SERVICE" into lmp-mr1-dev
* commit '673f443f7e92956399c322b31a14178436fa723b':
  add system|signature protection to android.permission.BIND_CARRIER_MESSAGING_SERVICE
2014-12-09 00:18:12 +00:00