Winson Chung
be1b7ddb44
am ac5bb347: am 3175f7d2: am 2396f135: am e3206407: Merge "Fixing crash in Recents due to late onBootCompleted call (Bug 17572254)" into lmp-dev
...
* commit 'ac5bb347cb769f217135124ddb6008bab9727d22':
Fixing crash in Recents due to late onBootCompleted call (Bug 17572254)
2014-10-01 17:09:22 +00:00
John Spurlock
f35be105ee
am 9a4fc6aa: am eac6926f: am 260e6d54: am a1b84165: Merge "Don\'t play hint animations when dozing" into lmp-dev
...
* commit '9a4fc6aab9884af87d49e0d912da56dd8bfe8868':
Don't play hint animations when dozing
2014-10-01 17:09:18 +00:00
Jason Monk
e9250ae94f
am 81ab90f2: am 9e280c44: am 15349991: am e7b18d2b: Merge "Pull roaming from mServiceState for consistency" into lmp-dev
...
* commit '81ab90f2173c8afac82a22c2cca72eb90293de9a':
Pull roaming from mServiceState for consistency
2014-10-01 17:09:13 +00:00
John Spurlock
c4b4ffb808
am abc4db31: am 3fd4440f: am af41d847: am ee98df79: Doze: Log screenOnFromTouch when flinging.
...
* commit 'abc4db312aa6e5287b5abbd2d201f10d642fca7d':
Doze: Log screenOnFromTouch when flinging.
2014-10-01 17:09:05 +00:00
Winson Chung
ac5bb347cb
am 3175f7d2: am 2396f135: am e3206407: Merge "Fixing crash in Recents due to late onBootCompleted call (Bug 17572254)" into lmp-dev
...
* commit '3175f7d245daba660852cbcb92a7a821899b70a3':
Fixing crash in Recents due to late onBootCompleted call (Bug 17572254)
2014-10-01 17:00:14 +00:00
John Spurlock
9a4fc6aab9
am eac6926f: am 260e6d54: am a1b84165: Merge "Don\'t play hint animations when dozing" into lmp-dev
...
* commit 'eac6926f0cb260339ec7ec2495964331249338e2':
Don't play hint animations when dozing
2014-10-01 17:00:10 +00:00
Jason Monk
81ab90f217
am 9e280c44: am 15349991: am e7b18d2b: Merge "Pull roaming from mServiceState for consistency" into lmp-dev
...
* commit '9e280c447f5f8747f7c4777d80d5dd7c25e7713e':
Pull roaming from mServiceState for consistency
2014-10-01 17:00:05 +00:00
John Spurlock
abc4db312a
am 3fd4440f: am af41d847: am ee98df79: Doze: Log screenOnFromTouch when flinging.
...
* commit '3fd4440fea2d29f423a99cfaa5e30f4ff5c2239d':
Doze: Log screenOnFromTouch when flinging.
2014-10-01 16:59:44 +00:00
Baligh Uddin
f13bb6f53c
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
2014-10-01 16:35:21 +00:00
Winson Chung
3175f7d245
am 2396f135: am e3206407: Merge "Fixing crash in Recents due to late onBootCompleted call (Bug 17572254)" into lmp-dev
...
* commit '2396f135678e8a40b963904e8a6710bc6a204180':
Fixing crash in Recents due to late onBootCompleted call (Bug 17572254)
2014-10-01 15:14:34 +00:00
John Spurlock
eac6926f0c
am 260e6d54: am a1b84165: Merge "Don\'t play hint animations when dozing" into lmp-dev
...
* commit '260e6d542ff05094063f1a1574f41fa165308eef':
Don't play hint animations when dozing
2014-10-01 15:14:30 +00:00
Jason Monk
9e280c447f
am 15349991: am e7b18d2b: Merge "Pull roaming from mServiceState for consistency" into lmp-dev
...
* commit '15349991240bb9443d704b4ac85915f474e5108c':
Pull roaming from mServiceState for consistency
2014-10-01 15:14:26 +00:00
John Spurlock
3fd4440fea
am af41d847: am ee98df79: Doze: Log screenOnFromTouch when flinging.
...
* commit 'af41d8477a8152c0597630066207a863ad74614e':
Doze: Log screenOnFromTouch when flinging.
2014-10-01 15:14:18 +00:00
Winson Chung
2396f13567
am e3206407: Merge "Fixing crash in Recents due to late onBootCompleted call (Bug 17572254)" into lmp-dev
...
* commit 'e3206407a5968dcf6690793f047bdfede0424df5':
Fixing crash in Recents due to late onBootCompleted call (Bug 17572254)
2014-10-01 14:59:12 +00:00
John Spurlock
260e6d542f
am a1b84165: Merge "Don\'t play hint animations when dozing" into lmp-dev
...
* commit 'a1b84165f9520c025c59f5b2d93a65d4609b8088':
Don't play hint animations when dozing
2014-10-01 14:59:07 +00:00
Jason Monk
1534999124
am e7b18d2b: Merge "Pull roaming from mServiceState for consistency" into lmp-dev
...
* commit 'e7b18d2bab30ca257b63e9029c6e08b9700b89a6':
Pull roaming from mServiceState for consistency
2014-10-01 14:58:57 +00:00
John Spurlock
af41d8477a
am ee98df79: Doze: Log screenOnFromTouch when flinging.
...
* commit 'ee98df79a1797323aaa6d645e9cd5dc6a7cc0ee4':
Doze: Log screenOnFromTouch when flinging.
2014-10-01 14:58:45 +00:00
Winson Chung
e3206407a5
Merge "Fixing crash in Recents due to late onBootCompleted call (Bug 17572254)" into lmp-dev
2014-09-30 16:39:43 +00:00
John Spurlock
a1b84165f9
Merge "Don't play hint animations when dozing" into lmp-dev
2014-09-30 16:35:26 +00:00
Jorim Jaggi
2e10611a85
am 4b5bd729: am 4fda5644: am 88126aa1: am b5140130: Merge "Revert "Add massive logging to investigate blank Keyguard"" into lmp-dev
...
* commit '4b5bd7292ab591657128364dbc1ea9c334eb6597':
Revert "Add massive logging to investigate blank Keyguard"
2014-09-30 16:12:21 +00:00
John Spurlock
1ba8af18e7
am c2c317aa: am d990706b: am 0bea7286: am e5238f7a: Merge "DozeLog: Keep keyguard monitor alive, keep emer call stats." into lmp-dev
...
* commit 'c2c317aa5372c65d33378a066bd1d9fe8c824b1f':
DozeLog: Keep keyguard monitor alive, keep emer call stats.
2014-09-30 16:11:48 +00:00
Jorim Jaggi
ca4e7dabc2
am 1bde0f0e: am c0350c7c: am 5b002995: am 79107083: Merge "Add option to enable scrim SRC optimization" into lmp-dev
...
* commit '1bde0f0e69a352bec42b469e144d2c4cdd09df0f':
Add option to enable scrim SRC optimization
2014-09-30 16:11:36 +00:00
Jorim Jaggi
74db803f54
am fc133d09: am b0c3726a: am 697ace4e: am e2ff1a4e: Merge "Fix overdraw" into lmp-dev
...
* commit 'fc133d093441a2c9c2b743cc07008821bb3d08fd':
Fix overdraw
2014-09-30 16:11:32 +00:00
Selim Cinek
eed8347874
am 9e7b6c04: am f2a6160b: am 6b44ae6e: am 311fc0b3: Fixed a crash that could occur in the ObservableScrollView
...
* commit '9e7b6c045d0e9768ff2daa7541348975f401a064':
Fixed a crash that could occur in the ObservableScrollView
2014-09-30 16:11:28 +00:00
Jorim Jaggi
d7912d2f10
Don't play hint animations when dozing
...
Bug: 17718416
Change-Id: I2c27b4ea479ee46612eb5284a2c872d03dc52ab0
2014-09-30 17:38:19 +02:00
Jason Monk
e7b18d2bab
Merge "Pull roaming from mServiceState for consistency" into lmp-dev
2014-09-30 15:30:11 +00:00
John Spurlock
ee98df79a1
Doze: Log screenOnFromTouch when flinging.
...
Bug: 17350239
Bug: 17496795
Change-Id: I4a8e26c2fc05cf4396e9c8cb58e81b4f95c531e6
2014-09-30 14:07:23 +00:00
Jason Monk
1cd44e3ab4
Pull roaming from mServiceState for consistency
...
Also consolidate roaming logic while here, to make it easier to
maintain.
Bug: 17514906
Bug: 17619763
Change-Id: I8efabdecc26722ff6ac70d715f3befaae989abdc
2014-09-30 10:05:46 -04:00
Baligh Uddin
415c64b60d
Import translations. DO NOT MERGE
...
Change-Id: Ibf7c0b27ceae6f07a7f0e38e0fae2e83d218051c
Auto-generated-cl: translation import
2014-09-30 04:05:35 -07:00
Jorim Jaggi
4fda564456
am 88126aa1: am b5140130: Merge "Revert "Add massive logging to investigate blank Keyguard"" into lmp-dev
...
* commit '88126aa1707e38af0b70cb8b9752917f9589cb88':
Revert "Add massive logging to investigate blank Keyguard"
2014-09-29 21:03:02 +00:00
John Spurlock
d990706b03
am 0bea7286: am e5238f7a: Merge "DozeLog: Keep keyguard monitor alive, keep emer call stats." into lmp-dev
...
* commit '0bea72864e1129ef559744ab00e74b6215ef246c':
DozeLog: Keep keyguard monitor alive, keep emer call stats.
2014-09-29 21:01:50 +00:00
Jorim Jaggi
c0350c7c00
am 5b002995: am 79107083: Merge "Add option to enable scrim SRC optimization" into lmp-dev
...
* commit '5b002995ad5bda15fc7456228789b6b94ae2522c':
Add option to enable scrim SRC optimization
2014-09-29 21:01:30 +00:00
Jorim Jaggi
b0c3726a3b
am 697ace4e: am e2ff1a4e: Merge "Fix overdraw" into lmp-dev
...
* commit '697ace4edd1f1bf28dd0c058f53ad7af5858f2c8':
Fix overdraw
2014-09-29 21:01:22 +00:00
Selim Cinek
f2a6160b92
am 6b44ae6e: am 311fc0b3: Fixed a crash that could occur in the ObservableScrollView
...
* commit '6b44ae6e921ec6030274b96e88c6e5746c74d6c2':
Fixed a crash that could occur in the ObservableScrollView
2014-09-29 21:01:15 +00:00
Jorim Jaggi
88126aa170
am b5140130: Merge "Revert "Add massive logging to investigate blank Keyguard"" into lmp-dev
...
* commit 'b5140130839e70f1fb55a0bc81b11354b42b820b':
Revert "Add massive logging to investigate blank Keyguard"
2014-09-29 20:49:08 +00:00
John Spurlock
0bea72864e
am e5238f7a: Merge "DozeLog: Keep keyguard monitor alive, keep emer call stats." into lmp-dev
...
* commit 'e5238f7a8db90ebc0e8875adaff84efc198f0800':
DozeLog: Keep keyguard monitor alive, keep emer call stats.
2014-09-29 20:48:15 +00:00
Jorim Jaggi
5b002995ad
am 79107083: Merge "Add option to enable scrim SRC optimization" into lmp-dev
...
* commit '79107083ca50b99c9e7b678d7739b9ab4798db0f':
Add option to enable scrim SRC optimization
2014-09-29 20:47:53 +00:00
Jorim Jaggi
697ace4edd
am e2ff1a4e: Merge "Fix overdraw" into lmp-dev
...
* commit 'e2ff1a4edbe5c8eeb2610a62b8cfe7a58d4c8150':
Fix overdraw
2014-09-29 20:47:46 +00:00
Selim Cinek
6b44ae6e92
am 311fc0b3: Fixed a crash that could occur in the ObservableScrollView
...
* commit '311fc0b399f01a79169ae69aea05556043a7d7df':
Fixed a crash that could occur in the ObservableScrollView
2014-09-29 20:47:39 +00:00
Winson Chung
8bf05afc26
Fixing crash in Recents due to late onBootCompleted call (Bug 17572254)
...
Change-Id: I016dd8b7be9efa786291051152b1b56aac708e33
2014-09-29 13:42:49 -07:00
Jorim Jaggi
b514013083
Merge "Revert "Add massive logging to investigate blank Keyguard"" into lmp-dev
2014-09-29 16:31:55 +00:00
Baligh Uddin
04678abbe5
Merge "Import translations. DO NOT MERGE" into lmp-dev
2014-09-29 16:30:58 +00:00
John Spurlock
e5238f7a8d
Merge "DozeLog: Keep keyguard monitor alive, keep emer call stats." into lmp-dev
2014-09-29 16:28:52 +00:00
John Spurlock
bee3b0a023
DozeLog: Keep keyguard monitor alive, keep emer call stats.
...
Ensure the existing keyguard callback survives weak reference
collection, and add missing emergency call stats append.
Bug:17496795
Change-Id: Iecec4646562cf1f6edb5bc5972767127f4419035
2014-09-29 11:30:12 -04:00
Jorim Jaggi
8a63806a8d
Revert "Add massive logging to investigate blank Keyguard"
...
This reverts commit 10ead64346b2651be144ac591117cc2413d8caa3.
Bug: 17475334
Change-Id: Ie7103a2ede1f00a91a2afc51d9e6ecf5ae569545
2014-09-29 16:24:55 +02:00
Jorim Jaggi
79107083ca
Merge "Add option to enable scrim SRC optimization" into lmp-dev
2014-09-29 13:44:07 +00:00
Jorim Jaggi
e2ff1a4edb
Merge "Fix overdraw" into lmp-dev
2014-09-29 13:43:20 +00:00
Selim Cinek
311fc0b399
Fixed a crash that could occur in the ObservableScrollView
...
Bug: 17644848
Change-Id: I771c27f9fee8c0d5edfbd21998ea015fd1d6f685
2014-09-29 12:21:48 +00:00
Baligh Uddin
e923f53640
Import translations. DO NOT MERGE
...
Change-Id: I50e2c272196c5ae07c950caef75b75686414b309
Auto-generated-cl: translation import
2014-09-28 22:41:17 -07:00
Jorim Jaggi
0e66439387
Add option to enable scrim SRC optimization
...
It turns out that the optimization to disable glClear + draw scrim
with SRC is not good for all devices, so this CL adds a config flag
to revert to the old behavior.
Bug: 17673806
Change-Id: Ic4e0177f2d6fcf4448755d0be66e8fbef2d15ab5
2014-09-28 20:16:53 +00:00