Joe Fernandez
c462073b24
am 8853b9c4: am 577570f2: am e5dc0c39: am 5b97ec6f: am 3885b00a: am f25bc75f: Merge "MediaRouter Developer Guide" into klp-docs
...
* commit '8853b9c4b478df6ac8286d3dc825aa821f375afa':
MediaRouter Developer Guide
2014-02-13 01:11:51 +00:00
Nick Kralevich
edb03c7d6d
am 4f2d02fb: am 20b5fd98: am 93994e9d: am a9bb594d: Merge "Convert all selinux_android_restorecon and _setfilecon calls to new API."
...
* commit '4f2d02fb0073c4129957c0d2ac6e0c0055f4dad8':
Convert all selinux_android_restorecon and _setfilecon calls to new API.
2014-02-13 01:11:47 +00:00
Dave Platt
2c7c0a8527
am 5137fa03: am 34cc9f90: am 53c7608a: am a3c3533b: Merge "Finish fixing Zygote descriptor leakage problem"
...
* commit '5137fa03c3e416c6f68c36f3ec922621853609b1':
Finish fixing Zygote descriptor leakage problem
2014-02-13 01:11:41 +00:00
Michael Wright
111d6fef3a
Merge changes I8f4249da,I012bd99f
...
* changes:
Extract automatic brightness strategy
New ambient light level filtering for automatic brightness
2014-02-13 00:46:59 +00:00
Michael Wright
639c8becc6
Extract automatic brightness strategy
...
Pull the strategy for determining the automatic brightness levels
into its own class. This cleans up DisplayPowerController a bit and
lets us experiment with different automatic brightness strategies
more easily.
Change-Id: I8f4249da511e38f63260dbef81f97f5507aac948
2014-02-12 16:44:37 -08:00
Adam Powell
c1d388fa0a
Merge "Point to the correct voice search icons in themes"
2014-02-13 00:43:26 +00:00
ztenghui
b67ca78d97
Merge "Fix one flag setting bug"
2014-02-13 00:16:37 +00:00
Joe Fernandez
8853b9c4b4
am 577570f2: am e5dc0c39: am 5b97ec6f: am 3885b00a: am f25bc75f: Merge "MediaRouter Developer Guide" into klp-docs
...
* commit '577570f29919da32e2b616dbab1e52fadabcb315':
MediaRouter Developer Guide
2014-02-13 00:13:02 +00:00
Nick Kralevich
4f2d02fb00
am 20b5fd98: am 93994e9d: am a9bb594d: Merge "Convert all selinux_android_restorecon and _setfilecon calls to new API."
...
* commit '20b5fd98fb9c80ed29d57d67eb706a36b02708da':
Convert all selinux_android_restorecon and _setfilecon calls to new API.
2014-02-13 00:12:55 +00:00
Dave Platt
5137fa03c3
am 34cc9f90: am 53c7608a: am a3c3533b: Merge "Finish fixing Zygote descriptor leakage problem"
...
* commit '34cc9f9056e8736143e82891ccd01a85106a4518':
Finish fixing Zygote descriptor leakage problem
2014-02-13 00:12:50 +00:00
Alan Viverette
71c6ca2a75
Merge "Update smoothScrollToPosition to move faster for large offsets"
2014-02-12 23:51:56 +00:00
Alan Viverette
5aa944d998
Merge "Fix RelativeLayout measurement"
2014-02-12 23:51:11 +00:00
Michael Wright
41a5cdf986
New ambient light level filtering for automatic brightness
...
This new filtering method maintains a ring buffer of all light sensor
measurements within the last ten seconds. Once all of the
measurements are either above the brightening threshold or below the
darkening threshold, adjust the screen brightness to the average of
the recorded measurements.
Change-Id: I012bd99f86149e02f03b05f19722aef9a07aba31
2014-02-12 15:50:54 -08:00
Alan Viverette
d5694f02d5
Fix RelativeLayout measurement
...
BUG: 12993953
Change-Id: Idf82734eb9a06ea7610e8eb42705da9f4a4639e9
2014-02-12 15:49:18 -08:00
Joe Fernandez
577570f299
am e5dc0c39: am 5b97ec6f: am 3885b00a: am f25bc75f: Merge "MediaRouter Developer Guide" into klp-docs
...
* commit 'e5dc0c39912d6e1392e1a3324ad210e65c0105c8':
MediaRouter Developer Guide
2014-02-12 23:33:43 +00:00
Joe Fernandez
e5dc0c3991
am 5b97ec6f: am 3885b00a: am f25bc75f: Merge "MediaRouter Developer Guide" into klp-docs
...
* commit '5b97ec6fa0e166113aad2abc1107e6bd3771cc2a':
MediaRouter Developer Guide
2014-02-12 23:29:38 +00:00
John Spurlock
3024f10224
Merge "Remove unused output array in QuickSettingsModel."
2014-02-12 23:21:16 +00:00
Joe Fernandez
5b97ec6fa0
am 3885b00a: am f25bc75f: Merge "MediaRouter Developer Guide" into klp-docs
...
* commit '3885b00ae12df9f56e922ceda12326e922be1414':
MediaRouter Developer Guide
2014-02-12 23:19:10 +00:00
Nick Kralevich
20b5fd98fb
am 93994e9d: am a9bb594d: Merge "Convert all selinux_android_restorecon and _setfilecon calls to new API."
...
* commit '93994e9db44a30402bd596764163d81ee1b1fd30':
Convert all selinux_android_restorecon and _setfilecon calls to new API.
2014-02-12 23:19:05 +00:00
Joe Fernandez
3885b00ae1
am f25bc75f: Merge "MediaRouter Developer Guide" into klp-docs
...
* commit 'f25bc75f591fbb04733b9cc33fabee2293973b8c':
MediaRouter Developer Guide
2014-02-12 23:15:50 +00:00
Joe Fernandez
f25bc75f59
Merge "MediaRouter Developer Guide" into klp-docs
2014-02-12 23:13:01 +00:00
Nick Kralevich
93994e9db4
am a9bb594d: Merge "Convert all selinux_android_restorecon and _setfilecon calls to new API."
...
* commit 'a9bb594da6aff97ba927ba67a34486d0b9c1b4a0':
Convert all selinux_android_restorecon and _setfilecon calls to new API.
2014-02-12 15:12:08 -08:00
Dave Platt
34cc9f9056
am 53c7608a: am a3c3533b: Merge "Finish fixing Zygote descriptor leakage problem"
...
* commit '53c7608aefb0ed754394e571cac02e96ad6fcdb3':
Finish fixing Zygote descriptor leakage problem
2014-02-12 23:10:36 +00:00
Nick Kralevich
a9bb594da6
Merge "Convert all selinux_android_restorecon and _setfilecon calls to new API."
2014-02-12 23:09:37 +00: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
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
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