Michael Wright
c8ab96a416
am 111d6fef: Merge changes I8f4249da,I012bd99f
...
* commit '111d6fef3a362bc9fd4fa61c49bccc9079521161':
Extract automatic brightness strategy
New ambient light level filtering for automatic brightness
2014-02-12 16:49:21 -08: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
Adam Powell
45faba7ac3
am c1d388fa: Merge "Point to the correct voice search icons in themes"
...
* commit 'c1d388fa0ae72b8171fb64b8dc2a43116db5c983':
Point to the correct voice search icons in themes
2014-02-12 16:46:02 -08: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
d4d87466c4
am b67ca78d: Merge "Fix one flag setting bug"
...
* commit 'b67ca78d97f775cfd5b37e9a63fc708fd2897d01':
Fix one flag setting bug
2014-02-12 16:18:23 -08:00
ztenghui
b67ca78d97
Merge "Fix one flag setting bug"
2014-02-13 00:16:37 +00:00
Alan Viverette
2a7fc2bf15
am 71c6ca2a: Merge "Update smoothScrollToPosition to move faster for large offsets"
...
* commit '71c6ca2a752d9b722a9774a881f8e539a24ea862':
Update smoothScrollToPosition to move faster for large offsets
2014-02-12 15:55:03 -08:00
Alan Viverette
aa32af1c4f
am 5aa944d9: Merge "Fix RelativeLayout measurement"
...
* commit '5aa944d9985344ac3be113eee3874be920bf12d2':
Fix RelativeLayout measurement
2014-02-12 15:55:00 -08: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
John Spurlock
94eea666d9
am 3024f102: Merge "Remove unused output array in QuickSettingsModel."
...
* commit '3024f1022400ca7e316cf7e4b08a325e51ceebb9':
Remove unused output array in QuickSettingsModel.
2014-02-12 15:30:28 -08:00
John Spurlock
3024f10224
Merge "Remove unused output array in QuickSettingsModel."
2014-02-12 23:21:16 +00:00
Ricardo Cervera
26d99e4f3f
am 0815f499: 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 '0815f499ae64cb5eea4c046ddb3e37834f7267f6':
docs: Added missing elements in uses-feature. Bug: 12913153
2014-02-12 15:07:43 -08:00
Ricardo Cervera
23e74aaff7
am 12394056: 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 '12394056376c9fed94825fc20f1093ee64c4deda':
docs: Added notes for Build Tools Revision 19.0.2
2014-02-12 15:07:39 -08:00
Ricardo Cervera
3ee83f4b40
am b134b0ae: 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 'b134b0ae45ef7520c026cc740ab4422ff9c2b95c':
docs: Added Revision 3 of Google APIs System Image.
2014-02-12 15:07:37 -08:00
Craig Mautner
7fd6b24ac6
am 4cfd54ea: am 69481d54: am 8dfda07d: am 731c30c1: Merge "Don\'t add windows from exiting app tokens twice." into klp-modular-dev
...
* commit '4cfd54eaf0106373e1fea75a1e33ac460cf7c23d':
Don't add windows from exiting app tokens twice.
2014-02-12 15:07:33 -08:00
John Spurlock
4cf083d047
am 1182a111: am 5788f2ba: am ae5708db: am c4aee98a: Improve error handling in listener services.
...
* commit '1182a111ece20707da9b689ada28af190a2ee41a':
Improve error handling in listener services.
2014-02-12 15:07:30 -08:00
Narayan Kamath
403f31788a
am 7de20e69: am efe6e05c: am 3caed58a: am 8fa3f443: am 54e7f53f: Merge "Fix build."
...
* commit '7de20e69508a67cb1777fa88ecbd86a11efdd8f0':
Fix build.
2014-02-12 15:07:26 -08:00
Paul Duffin
a8a0d5721f
am 5ea06c59: am 4de91118: am 0741e11c: am 75d67c6a: am d562a9b5: Merge "Improve Parcel\'s handling of non-primitive arrays"
...
* commit '5ea06c59be1f7a0495378f703562ee02eaad99d8':
Improve Parcel's handling of non-primitive arrays
2014-02-12 15:07:23 -08:00
Narayan Kamath
d7eeb2f5c3
am 5a42b10b: am 34281966: am fc268eca: am aa98fb51: am f991771f: Merge "Use size_t* in AssetManager::createIdmap"
...
* commit '5a42b10baa1c852558ac45276e005a2667d9227b':
Use size_t* in AssetManager::createIdmap
2014-02-12 15:07:20 -08:00
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
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
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
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