109509 Commits

Author SHA1 Message Date
Baligh Uddin
f3f610b0d5 Merge "Import translations. DO NOT MERGE" 2013-07-25 02:39:04 +00:00
Todd Poynor
a9de3462a6 Add libbatteryservice AIDL and java interfaces
Add IBatteryPropertiesRegistrar and IBatteryPropertiesListener AIDLs,
BatteryProperties class.

Change-Id: Ic8e71178c02b04868eca29c3da88e877bc2590ca
2013-07-25 02:13:49 +00:00
Alan Viverette
0962ff1bce Merge "Update setAdapter() documentation for Spinner" 2013-07-25 00:32:27 +00:00
Zhihai Xu
e1280dd5d9 Merge "Bluetooth stopped working in master - "bad file descriptor"" 2013-07-25 00:21:12 +00:00
Alan Viverette
a089ddecaf Update setAdapter() documentation for Spinner
BUG: 9906193
Change-Id: Id21ee957cb72c9452b150a713ed37adb0fa82d30
2013-07-24 16:38:37 -07:00
Alan Viverette
0e14060bc6 Merge "Use clearFocus() when entering touch mode" 2013-07-24 23:34:35 +00:00
Scott Main
2b0ade2f0f am a6cd436c: am bde8ee81: remove UX process to open Recents bug: 10004058
* commit 'a6cd436c0d99eaa9cd283293db637270dc973081':
  remove UX process to open Recents bug: 10004058
2013-07-24 16:27:18 -07:00
Scott Main
07a38576bd am 0351de14: am 4a870646: Merge "fix xml markup typo" into jb-mr2-ub-dev
* commit '0351de143e1d2e47dd5d4511fdf92dd31e0c29af':
  fix xml markup typo
2013-07-24 16:27:15 -07:00
Dirk Dougherty
a26da049ff am 64800b56: am ee8ea96c: am 38d4cfd4: Merge "Doc change: fix reference to getBestDateTimePattern()." into jb-mr2-dev
* commit '64800b563b77feb015068baeef2a3a1af2e90fd8':
  Doc change: fix reference to getBestDateTimePattern().
2013-07-24 16:27:12 -07:00
Dirk Dougherty
192c9c3978 am 52b08aa9: am cbfde177: am ac6be105: Doc change: remove devices listed for vp8 hw encoder in highlights.
* commit '52b08aa9f3f5db0cffb45145e235c8009d369bef':
  Doc change: remove devices listed for vp8 hw encoder in highlights.
2013-07-24 16:27:09 -07:00
Scott Main
4660cfd1d4 am a56d1f5a: am fc78f9ae: Merge "docs: small fixes for Support Library Guide" into jb-mr2-ub-dev
* commit 'a56d1f5a22f4bb8d59f02499ab6c884131dc566d':
  docs: small fixes for Support Library Guide
2013-07-24 16:27:06 -07:00
Scott Main
f464377fa8 am 0fe4f745: am 84f2a0f5: revise split action bar and xml namespace
* commit '0fe4f7458543fb71e83e4db16a11644600562123':
  revise split action bar and xml namespace
2013-07-24 16:27:03 -07:00
Dirk Dougherty
956ce29a5c am 29b1267f: am c097c31c: am 58729dd6: Merge "Doc change: update carousel on develop home." into jb-mr2-dev
* commit '29b1267fe372480265d3b9d05e1360be870ce485':
  Doc change: update carousel on develop home.
2013-07-24 16:27:00 -07:00
Joe Fernandez
779d67cb3f am 82ce96f3: am 21a1df23: Merge "docs: Support Library Guide" into jb-mr2-ub-dev
* commit '82ce96f3ec386eccfb673b38c6675f95fae841da':
  docs: Support Library Guide
2013-07-24 16:26:57 -07:00
Scott Main
ffe9acda27 am ae9beefd: am b56cd290: Merge "update all links to the support library" into jb-mr2-ub-dev
* commit 'ae9beefd235335d75de0667de3d5d1de3dcd5490':
  update all links to the support library
2013-07-24 16:26:52 -07:00
Dirk Dougherty
b495c31317 am e7a0561b: am 20785842: am 144479f2: Merge "Doc change: Platform highlights for Android 4.3." into jb-mr2-dev
* commit 'e7a0561bd2438915a51e12cdbb1351ba77dc755d':
  Doc change: Platform highlights for Android 4.3.
2013-07-24 16:26:49 -07:00
Scott Main
154ecec37f am 1390fcbe: am 036874ce: revise DASH discussion in overview
* commit '1390fcbe845d1c1b8e1953a9c93df3db0cb3f6c1':
  revise DASH discussion in overview
2013-07-24 16:26:45 -07:00
Scott Main
a06cba19c9 am 8d9a4bd1: am 174dd066: Merge "remove link to renderscript support library" into jb-mr2-ub-dev
* commit '8d9a4bd1eb09cc795bf96c4f3a2824f9642c70e4':
  remove link to renderscript support library
2013-07-24 16:26:43 -07:00
Scott Main
109c9b57f6 am 5ad6ba51: am 0f9b6c59: Revert "docs: NDK r9 Release Notes"
* commit '5ad6ba511271265b0e8ab14cf4d4a54fcb9b4a61':
  Revert "docs: NDK r9 Release Notes"
2013-07-24 16:26:40 -07:00
Scott Main
fe93f90970 am 6224f2e7: am f2134151: api overview edits
* commit '6224f2e73017696d822715ddbdcd8858f87a8478':
  api overview edits
2013-07-24 16:26:34 -07:00
Scott Main
ee672b8e71 am ce7c5052: am 0cf24a5a: am 538ccd69: Merge "update usb driver doc with download link; delete revision notes" into jb-mr2-dev
* commit 'ce7c50521c65c2b3611727f38d9fc6a14d780bd6':
  update usb driver doc with download link; delete revision notes
2013-07-24 16:26:31 -07:00
Joe Fernandez
6cdd45b4d8 am 91a211f1: am 8b93ba78: am cd76edb9: Merge "docs: OpenGL ES 3.0 dev guide update" into jb-mr2-dev
* commit '91a211f11fab2fb995b4c49dd09517c36db84231':
  docs: OpenGL ES 3.0 dev guide update
2013-07-24 16:26:28 -07:00
Scott Main
8fe8c3b4ae am 5aaf3859: am ef43b761: am 2edf372e: fix javadoc error
* commit '5aaf38590130f3b56bcbcc74d2fead1da111b29d':
  fix javadoc error
2013-07-24 16:26:24 -07:00
Scott Main
12bafdbd85 am c3427dc4: am a73fb627: am 3dee8aaf: Merge "update action bar guide for support lib ABC" into jb-mr2-dev
* commit 'c3427dc4da9d0a1471f0ca0f938d481a805e51db':
  update action bar guide for support lib ABC
2013-07-24 16:26:20 -07:00
Scott Main
a6cd436c0d am bde8ee81: remove UX process to open Recents bug: 10004058
* commit 'bde8ee81ba2595d4b0b2ab99b9f7df222b17cc34':
  remove UX process to open Recents bug: 10004058
2013-07-24 16:20:56 -07:00
Scott Main
0351de143e am 4a870646: Merge "fix xml markup typo" into jb-mr2-ub-dev
* commit '4a870646fa133c8bd8774ee14fc59aabdc9bdaa1':
  fix xml markup typo
2013-07-24 16:20:48 -07:00
Dirk Dougherty
64800b563b am ee8ea96c: am 38d4cfd4: Merge "Doc change: fix reference to getBestDateTimePattern()." into jb-mr2-dev
* commit 'ee8ea96c4ecbb1e52944a1d960584d0645af6d79':
  Doc change: fix reference to getBestDateTimePattern().
2013-07-24 16:20:45 -07:00
Dirk Dougherty
52b08aa9f3 am cbfde177: am ac6be105: Doc change: remove devices listed for vp8 hw encoder in highlights.
* commit 'cbfde177160b816ff56ab7b703b5f488578d6edb':
  Doc change: remove devices listed for vp8 hw encoder in highlights.
2013-07-24 16:20:40 -07:00
Scott Main
a56d1f5a22 am fc78f9ae: Merge "docs: small fixes for Support Library Guide" into jb-mr2-ub-dev
* commit 'fc78f9ae3da1d9b0de161c0ff28ac7f68691310c':
  docs: small fixes for Support Library Guide
2013-07-24 16:20:32 -07:00
Scott Main
0fe4f74585 am 84f2a0f5: revise split action bar and xml namespace
* commit '84f2a0f5e7a2ae63f4bc64f494b2aa6c94e7eb5a':
  revise split action bar and xml namespace
2013-07-24 16:20:29 -07:00
Dirk Dougherty
29b1267fe3 am c097c31c: am 58729dd6: Merge "Doc change: update carousel on develop home." into jb-mr2-dev
* commit 'c097c31ca20043c041aef4a821169078ec87bcb9':
  Doc change: update carousel on develop home.
2013-07-24 16:20:26 -07:00
Joe Fernandez
82ce96f3ec am 21a1df23: Merge "docs: Support Library Guide" into jb-mr2-ub-dev
* commit '21a1df23cda2e08702a19f4fc9cd884da17997cc':
  docs: Support Library Guide
2013-07-24 16:20:23 -07:00
Scott Main
ae9beefd23 am b56cd290: Merge "update all links to the support library" into jb-mr2-ub-dev
* commit 'b56cd2903e80adb9db64cc375be23e741048b964':
  update all links to the support library
2013-07-24 16:20:20 -07:00
Dirk Dougherty
e7a0561bd2 am 20785842: am 144479f2: Merge "Doc change: Platform highlights for Android 4.3." into jb-mr2-dev
* commit '20785842930d5dac6d0be35ea6f7b13012e10c59':
  Doc change: Platform highlights for Android 4.3.
2013-07-24 16:20:16 -07:00
Scott Main
1390fcbe84 am 036874ce: revise DASH discussion in overview
* commit '036874ce4e106133b4d89e24a7493f1b67daaa32':
  revise DASH discussion in overview
2013-07-24 16:20:13 -07:00
Scott Main
8d9a4bd1eb am 174dd066: Merge "remove link to renderscript support library" into jb-mr2-ub-dev
* commit '174dd06650a1ffa12a305a3a982d890caf416387':
  remove link to renderscript support library
2013-07-24 16:20:10 -07:00
Scott Main
5ad6ba5112 am 0f9b6c59: Revert "docs: NDK r9 Release Notes"
* commit '0f9b6c598b90b948c01d2fecfe3a8206ed3c445d':
  Revert "docs: NDK r9 Release Notes"
2013-07-24 16:20:07 -07:00
Scott Main
6224f2e730 am f2134151: api overview edits
* commit 'f213415175ec83df7b39089d559eb9d02b72883a':
  api overview edits
2013-07-24 16:20:01 -07:00
Scott Main
ce7c50521c am 0cf24a5a: am 538ccd69: Merge "update usb driver doc with download link; delete revision notes" into jb-mr2-dev
* commit '0cf24a5aa5f04ee48f643fd4cb707f3ed64b8e29':
  update usb driver doc with download link; delete revision notes
2013-07-24 16:19:57 -07:00
Joe Fernandez
91a211f11f am 8b93ba78: am cd76edb9: Merge "docs: OpenGL ES 3.0 dev guide update" into jb-mr2-dev
* commit '8b93ba786f0e50ab8cfbfb9a6f723913cc8e6eeb':
  docs: OpenGL ES 3.0 dev guide update
2013-07-24 16:19:49 -07:00
Scott Main
5aaf385901 am ef43b761: am 2edf372e: fix javadoc error
* commit 'ef43b7617c3b067d5d1f34ed41581f55c28c0659':
  fix javadoc error
2013-07-24 16:19:42 -07:00
Scott Main
c3427dc4da am a73fb627: am 3dee8aaf: Merge "update action bar guide for support lib ABC" into jb-mr2-dev
* commit 'a73fb627dc87128b7999fac4d8742881737290d6':
  update action bar guide for support lib ABC
2013-07-24 16:19:32 -07:00
Alan Viverette
ed7821a60c Use clearFocus() when entering touch mode
Calling unFocus() leaves the view hierarchy in an inconsistent
state. This is okay in ViewGroup, where the state is manually
updated, but causes issues in ViewRootImpl.

BUG: 9983358
Change-Id: Id63e62962d895e6bd4f816f202dcf77254ceab4e
2013-07-24 15:49:23 -07:00
Matthew Williams
f7e843e3a2 Merge "AnonymousSyncService & SyncRequest." 2013-07-24 22:41:22 +00:00
Jean-Michel Trivi
2e01220647 Merge "More info in audio focus stack entry" 2013-07-24 22:35:30 +00:00
Glenn Kasten
1bd84bd3d5 Merge "Rename mChannels to mChannelMask to avoid ambiguity" 2013-07-24 22:35:11 +00:00
Glenn Kasten
44097837df Merge "Match AudioRecord.getChannelConfiguration docs" 2013-07-24 22:30:20 +00:00
Matthew Williams
fa77418134 AnonymousSyncService & SyncRequest.
Changes to the way bundles are parcelled broke SM,
this update writes out the bundle as xml. This circumvents
the need for parcel, and makes it easier to debug whats
happening.
Change-Id: I6cd5d3a2eb80bfa5b3ae0c7f2d2ff91a65daaa34
2013-07-24 15:25:29 -07:00
Zhihai Xu
df3cedab6f Bluetooth stopped working in master - "bad file descriptor"
ignore IllegalArgumentException in BluetoothSocket.close().

bug: 9960585
Change-Id: I301aa388b738dcb92b643fdd96b5c9cb6f8b3efe
2013-07-24 15:09:45 -07:00
Jean-Michel Trivi
caa2c5bba8 More info in audio focus stack entry
Add fields in an audio focus stack entry to track what type of audio
 focus was requested, and why it was lost.
Make audio focus dump easier to read.

Change-Id: I61f6e43c13a32328a07125a2ba0dce1053872c86
2013-07-24 14:52:57 -07:00