Dianne Hackborn
3df84dd019
am f75f6e32: am 32acb5e9: am 97de064a: am 133f6826: am 89492190: Merge "Runtime resource overlay, iteration 2, test cases"
...
* commit 'f75f6e323c50eeb4e4e1a7034737c69eae74f97e':
Runtime resource overlay, iteration 2, test cases
2014-02-12 15:07:15 -08:00
Dave Platt
53c7608aef
am a3c3533b: Merge "Finish fixing Zygote descriptor leakage problem"
...
* commit 'a3c3533b1d6a4016cd1856fccac6cc404997b8a6':
Finish fixing Zygote descriptor leakage problem
2014-02-12 15:07:07 -08:00
Dave Platt
a3c3533b1d
Merge "Finish fixing Zygote descriptor leakage problem"
2014-02-12 23:03:48 +00:00
Ricardo Cervera
0815f499ae
am d3417283: am 481993e9: am 3cb62db2: am 640e0c89: am 36547014: am 670944aa: Merge "docs: Added missing elements in uses-feature. Bug: 12913153" into klp-docs
...
* commit 'd34172830cf4ce3524be500d77dc26e80f0f8190':
docs: Added missing elements in uses-feature. Bug: 12913153
2014-02-12 23:02:05 +00:00
Ricardo Cervera
1239405637
am 131c2e13: am 6fc66187: am 7d3344fd: am 58305f88: am bff7db19: am 521a54d0: Merge "docs: Added notes for Build Tools Revision 19.0.2" into klp-docs
...
* commit '131c2e13bac619144f2780baf229c34b33b0c674':
docs: Added notes for Build Tools Revision 19.0.2
2014-02-12 23:02:00 +00:00
Ricardo Cervera
b134b0ae45
am 6bc06c81: am 49968bb5: am 6960ad58: am ac74a524: am 566e4df8: am ca8757bf: Merge "docs: Added Revision 3 of Google APIs System Image." into klp-docs
...
* commit '6bc06c815f47021e49e191740caeb8ee2c846c5a':
docs: Added Revision 3 of Google APIs System Image.
2014-02-12 23:01:56 +00:00
Craig Mautner
4cfd54eaf0
am 69481d54: am 8dfda07d: am 731c30c1: Merge "Don\'t add windows from exiting app tokens twice." into klp-modular-dev
...
* commit '69481d54c2c6da6ec931bb7435bddf7be1aba0af':
Don't add windows from exiting app tokens twice.
2014-02-12 23:01:52 +00:00
John Spurlock
1182a111ec
am 5788f2ba: am ae5708db: am c4aee98a: Improve error handling in listener services.
...
* commit '5788f2ba9b634ecc35a861d53b086bee1384d0b0':
Improve error handling in listener services.
2014-02-12 23:01:48 +00:00
Narayan Kamath
7de20e6950
am efe6e05c: am 3caed58a: am 8fa3f443: am 54e7f53f: Merge "Fix build."
...
* commit 'efe6e05ca849ab479240fcf508b4d7af189a2c11':
Fix build.
2014-02-12 23:01:43 +00:00
Paul Duffin
5ea06c59be
am 4de91118: am 0741e11c: am 75d67c6a: am d562a9b5: Merge "Improve Parcel\'s handling of non-primitive arrays"
...
* commit '4de9111819638b70dd6fb58094d7a61477fc59da':
Improve Parcel's handling of non-primitive arrays
2014-02-12 23:01:39 +00:00
Narayan Kamath
5a42b10baa
am 34281966: am fc268eca: am aa98fb51: am f991771f: Merge "Use size_t* in AssetManager::createIdmap"
...
* commit '342819663c15db09dc60477167c5bdf1a5a877ae':
Use size_t* in AssetManager::createIdmap
2014-02-12 23:01:35 +00:00
Dianne Hackborn
f75f6e323c
am 32acb5e9: am 97de064a: am 133f6826: am 89492190: Merge "Runtime resource overlay, iteration 2, test cases"
...
* commit '32acb5e9d130ac858f34d83526e7460c624b41c7':
Runtime resource overlay, iteration 2, test cases
2014-02-12 23:01:30 +00:00
Andreas Huber
7825334929
Split AndroidRuntime into AndroidRuntimeBase base-class and the rest.
...
AndroidRuntimeBase (exported by libandroid_runtime_base.so) is all you need
to link against to gain the ability to do AndroidRuntimeBase::getJNIEnv()
thus minimizing build dependencies.
Change-Id: Ia7f0c94c8c02b974c068e0db34774827f96aa95b
2014-02-12 15:00:05 -08:00
Nick Kralevich
5ffa27fecd
am d5c8044e: resolved conflicts for merge of 1cbea39f to master
...
* commit 'd5c8044e7e1f1402fdd4a035690329294ab07b33':
Runtime resource overlay, iteration 2
2014-02-12 14:49:49 -08:00
Adam Powell
7a5427bbf5
Point to the correct voice search icons in themes
...
Update the preloaded drawables lists for previous asset import
Change-Id: Ia7be297f6387a14829717f64561c41fe0810a51c
2014-02-12 14:44:44 -08:00
John Spurlock
5bb5467d6c
Remove unused output array in QuickSettingsModel.
...
Change-Id: I0e9ce2ee1f20f5bf03f838a7ca965a71270b97d4
2014-02-12 17:44:41 -05:00
Nick Kralevich
d5c8044e7e
resolved conflicts for merge of 1cbea39f to master
...
Change-Id: Ib33484546c6a03cbc4cd96e97d9d785d68e10700
2014-02-12 14:41:25 -08:00
ztenghui
b9122c672e
Fix one flag setting bug
...
TODO: encapsulate the bit operations into functions.
Change-Id: I68ada214c080ac54ea43c327684c87dacef85491
2014-02-12 14:32:59 -08:00
Alan Viverette
7a1b7426ca
am cbdec7dd: Merge "Fix gradient radius attribute to match documentation"
...
* commit 'cbdec7dd8c45f70c678029783ab2f5657f6b36bd':
Fix gradient radius attribute to match documentation
2014-02-12 14:31:28 -08:00
Alan Viverette
cbdec7dd8c
Merge "Fix gradient radius attribute to match documentation"
2014-02-12 22:28:45 +00:00
Ricardo Cervera
d34172830c
am 481993e9: am 3cb62db2: am 640e0c89: am 36547014: am 670944aa: Merge "docs: Added missing elements in uses-feature. Bug: 12913153" into klp-docs
...
* commit '481993e92c20907521e22a57d09c8b7c206af726':
docs: Added missing elements in uses-feature. Bug: 12913153
2014-02-12 22:22:06 +00:00
Ricardo Cervera
131c2e13ba
am 6fc66187: am 7d3344fd: am 58305f88: am bff7db19: am 521a54d0: Merge "docs: Added notes for Build Tools Revision 19.0.2" into klp-docs
...
* commit '6fc66187b1920db0a233603721c3a2db15ae1269':
docs: Added notes for Build Tools Revision 19.0.2
2014-02-12 22:22:03 +00:00
Ricardo Cervera
6bc06c815f
am 49968bb5: am 6960ad58: am ac74a524: am 566e4df8: am ca8757bf: Merge "docs: Added Revision 3 of Google APIs System Image." into klp-docs
...
* commit '49968bb559cefbd96ce84b593b11203bddfa134a':
docs: Added Revision 3 of Google APIs System Image.
2014-02-12 22:22:00 +00:00
Craig Mautner
69481d54c2
am 8dfda07d: am 731c30c1: Merge "Don\'t add windows from exiting app tokens twice." into klp-modular-dev
...
* commit '8dfda07dd410c1776c6b0d373229fe77c76f8cfc':
Don't add windows from exiting app tokens twice.
2014-02-12 22:21:56 +00:00
John Spurlock
5788f2ba9b
am ae5708db: am c4aee98a: Improve error handling in listener services.
...
* commit 'ae5708db9d02433027f4574f912def6558805642':
Improve error handling in listener services.
2014-02-12 22:21:42 +00:00
Narayan Kamath
efe6e05ca8
am 3caed58a: am 8fa3f443: am 54e7f53f: Merge "Fix build."
...
* commit '3caed58ac7f439cfeefd2dd32d57f1d7d755bd29':
Fix build.
2014-02-12 22:20:01 +00:00
Paul Duffin
4de9111819
am 0741e11c: am 75d67c6a: am d562a9b5: Merge "Improve Parcel\'s handling of non-primitive arrays"
...
* commit '0741e11c65350aba95df150d52674c2fab41511a':
Improve Parcel's handling of non-primitive arrays
2014-02-12 22:19:58 +00:00
Narayan Kamath
342819663c
am fc268eca: am aa98fb51: am f991771f: Merge "Use size_t* in AssetManager::createIdmap"
...
* commit 'fc268ecae13f1634054e984a7cc6e325c21f6ab5':
Use size_t* in AssetManager::createIdmap
2014-02-12 22:19:56 +00:00
Dianne Hackborn
32acb5e9d1
am 97de064a: am 133f6826: am 89492190: Merge "Runtime resource overlay, iteration 2, test cases"
...
* commit '97de064a9a01d2481c47767d7fbb5b7d5482a3aa':
Runtime resource overlay, iteration 2, test cases
2014-02-12 22:19:53 +00:00
Joe Fernandez
70a2adc817
MediaRouter Developer Guide
...
staging: http://joefernandez2.mtv.corp.google.com:8210/guide/topics/media/mediarouter.html
Change-Id: I764828066de8b233e61ad8a5d4a102a4d231fa82
2014-02-12 14:12:15 -08:00
Ricardo Cervera
481993e92c
am 3cb62db2: am 640e0c89: am 36547014: am 670944aa: Merge "docs: Added missing elements in uses-feature. Bug: 12913153" into klp-docs
...
* commit '3cb62db29583d277ba630ee1644617fff5b615e5':
docs: Added missing elements in uses-feature. Bug: 12913153
2014-02-12 22:08:33 +00:00
Ricardo Cervera
6fc66187b1
am 7d3344fd: am 58305f88: am bff7db19: am 521a54d0: Merge "docs: Added notes for Build Tools Revision 19.0.2" into klp-docs
...
* commit '7d3344fd9c71fc3c7202250a6b4752d30da3295d':
docs: Added notes for Build Tools Revision 19.0.2
2014-02-12 22:08:30 +00:00
Ricardo Cervera
49968bb559
am 6960ad58: am ac74a524: am 566e4df8: am ca8757bf: Merge "docs: Added Revision 3 of Google APIs System Image." into klp-docs
...
* commit '6960ad58ac989ce6ab2b5d34159ceeb1093b0e39':
docs: Added Revision 3 of Google APIs System Image.
2014-02-12 22:08:27 +00:00
Nick Kralevich
1cbea39fe1
resolved conflicts for merge of dd3d95f1 to klp-volantis-dev
...
Change-Id: I96c0f0da852a0b3cf8aef9158678d38aa30f456f
2014-02-12 14:08:06 -08:00
Ricardo Cervera
3cb62db295
am 640e0c89: am 36547014: am 670944aa: Merge "docs: Added missing elements in uses-feature. Bug: 12913153" into klp-docs
...
* commit '640e0c89c3fb4ee4f180b7a2d8b9aaad237f2f9c':
docs: Added missing elements in uses-feature. Bug: 12913153
2014-02-12 22:02:53 +00:00
Ricardo Cervera
7d3344fd9c
am 58305f88: am bff7db19: am 521a54d0: Merge "docs: Added notes for Build Tools Revision 19.0.2" into klp-docs
...
* commit '58305f88fdf111f960869340d54f46387fcab4bf':
docs: Added notes for Build Tools Revision 19.0.2
2014-02-12 22:02:49 +00:00
Ricardo Cervera
6960ad58ac
am ac74a524: am 566e4df8: am ca8757bf: Merge "docs: Added Revision 3 of Google APIs System Image." into klp-docs
...
* commit 'ac74a5245bf115c4b5e23a3db515c0c3b5166662':
docs: Added Revision 3 of Google APIs System Image.
2014-02-12 22:02:43 +00:00
Ricardo Cervera
640e0c89c3
am 36547014: am 670944aa: Merge "docs: Added missing elements in uses-feature. Bug: 12913153" into klp-docs
...
* commit '36547014a3fa62e966739e12ccd31634b17058e9':
docs: Added missing elements in uses-feature. Bug: 12913153
2014-02-12 21:59:39 +00:00
Ricardo Cervera
58305f88fd
am bff7db19: am 521a54d0: Merge "docs: Added notes for Build Tools Revision 19.0.2" into klp-docs
...
* commit 'bff7db19e3bbd2997490beec671b52e4e925c0a5':
docs: Added notes for Build Tools Revision 19.0.2
2014-02-12 21:59:36 +00:00
Ricardo Cervera
ac74a5245b
am 566e4df8: am ca8757bf: Merge "docs: Added Revision 3 of Google APIs System Image." into klp-docs
...
* commit '566e4df8c3ff66fae6c343524272d332510e26f4':
docs: Added Revision 3 of Google APIs System Image.
2014-02-12 21:59:33 +00:00
Ricardo Cervera
36547014a3
am 670944aa: Merge "docs: Added missing elements in uses-feature. Bug: 12913153" into klp-docs
...
* commit '670944aa7272e95ba3ec02b83b2ae4f38ad577ba':
docs: Added missing elements in uses-feature. Bug: 12913153
2014-02-12 21:56:29 +00:00
Ricardo Cervera
bff7db19e3
am 521a54d0: Merge "docs: Added notes for Build Tools Revision 19.0.2" into klp-docs
...
* commit '521a54d0cc5288c4467652f4d773f372eebe970b':
docs: Added notes for Build Tools Revision 19.0.2
2014-02-12 21:56:27 +00:00
Ricardo Cervera
566e4df8c3
am ca8757bf: Merge "docs: Added Revision 3 of Google APIs System Image." into klp-docs
...
* commit 'ca8757bfc5fd506c647ccd1452c53c6ca4fafb81':
docs: Added Revision 3 of Google APIs System Image.
2014-02-12 21:56:24 +00:00
Chris Craik
166d89ae03
am c70c723c: Merge "Avoid crash if layer is destroyed after GLRenderer"
...
* commit 'c70c723cf8a892fb4be2f5917e596d79dfb3cb91':
Avoid crash if layer is destroyed after GLRenderer
2014-02-12 13:56:22 -08:00
Christopher Tate
b235993359
am c65d26ee: Merge "Always call super.onCreate(). Always."
...
* commit 'c65d26ee0e3792fc17c156c48e62b24f242e0c8d':
Always call super.onCreate(). Always.
2014-02-12 13:56:19 -08:00
Chris Craik
c70c723cf8
Merge "Avoid crash if layer is destroyed after GLRenderer"
2014-02-12 21:52:42 +00:00
Alan Viverette
861621eb8a
Fix gradient radius attribute to match documentation
...
BUG: 12191666
Change-Id: I62de3296500543797c595eeee15aa250e5b1511a
2014-02-12 13:50:34 -08:00
Chris Craik
637314d15c
Avoid crash if layer is destroyed after GLRenderer
...
bug:12988766
Change-Id: I96961aeef0b1d42ae8c609f1607a100e61a3d593
2014-02-12 13:45:52 -08:00
Dirk Dougherty
3155825c25
Doc change: minor edits to support easier extraction of document summaries.
...
Change-Id: I1a15a1d233464d6c8d35a741c54932412dea28ee
2014-02-12 13:31:14 -08:00
Alan Viverette
441b437b72
Update smoothScrollToPosition to move faster for large offsets
...
Adds a method to AbsListView for translating from position to row
and vice-versa. Doesn't NPE this time.
BUG: 3434554
Change-Id: I6a731aedda6d951ad46322dbe87df00b8d34a22c
2014-02-12 13:30:20 -08:00