Christopher Ferris
b7442bbc8c
Merge "Remove MALLOC_LEAK_CHECK references."
2014-09-20 01:23:27 +00:00
Jeff Brown
6e53b7476e
Merge "Decouple turning screen on from waking up in policy." into lmp-dev
2014-09-20 01:09:40 +00:00
Jeff Brown
7858a1b5d8
Merge "Fix order of operations while pulsing the ambient display." into lmp-dev
2014-09-20 01:09:10 +00:00
Jeff Brown
1ecada8582
Merge "Ensure that the screen on blocker is applied while dozing." into lmp-dev
2014-09-20 01:08:52 +00:00
Christopher Ferris
9244436a05
Remove MALLOC_LEAK_CHECK references.
...
Bug: 17378595
Change-Id: Ie7f8af88c7f3b0c3dc2c2e75bbaaa9e6a81269ae
2014-09-19 18:08:29 -07:00
Christopher Tate
396cc75319
am 4cd2c811: am ebff637b: am c9a016dd: Merge "Always give wifi a chance to quiet down during restore" into lmp-dev
...
* commit '4cd2c8117174d0692b79f8346706f193d7242c3d':
Always give wifi a chance to quiet down during restore
2014-09-20 00:55:45 +00:00
Dianne Hackborn
44fecb0b76
am 423a1069: am cec64f46: am da7e72b1: Merge "Fix issue #17492300 : NavUtils.shouldUpRecreateTask returns different..." into lmp-dev
...
* commit '423a1069bd0dba4e74d412a0f30aeff1fee8eca5':
Fix issue #17492300 : NavUtils.shouldUpRecreateTask returns different...
2014-09-20 00:55:41 +00:00
Svetoslav
dbe48d33fb
am c6570bca: am a5fe65ad: am 86636aa3: am e87d1f7a: Merge "TouchExploer computes incorectly the click location." into lmp-dev
...
* commit 'c6570bca53f291bf897c6b0a5c691fc642438fc2':
TouchExploer computes incorectly the click location.
2014-09-20 00:50:11 +00:00
Christopher Ferris
7d1138298b
am b6f891c4: Merge "Remove MALLOC_LEAK_CHECK references."
...
* commit 'b6f891c42ffdfdd9adc3811adaf09e09e3db7e84':
Remove MALLOC_LEAK_CHECK references.
2014-09-20 00:49:35 +00:00
John Spurlock
6035834cdd
Mark sysui config resource as untranslatable.
...
Bug:17523754
Change-Id: I8917c110acc02c501e4dc011de4e6e7f8a0545c5
2014-09-19 20:48:24 -04:00
Christopher Tate
688c88e0d2
am ebff637b: am c9a016dd: Merge "Always give wifi a chance to quiet down during restore" into lmp-dev
...
* commit 'ebff637b894a60a20e62b12089c29779cc6f9e98':
Always give wifi a chance to quiet down during restore
2014-09-20 00:45:09 +00:00
Dianne Hackborn
1fe3ed40f1
am cec64f46: am da7e72b1: Merge "Fix issue #17492300 : NavUtils.shouldUpRecreateTask returns different..." into lmp-dev
...
* commit 'cec64f466c4010dbf97d00a3fc713b36c82bc42c':
Fix issue #17492300 : NavUtils.shouldUpRecreateTask returns different...
2014-09-20 00:45:00 +00:00
Christopher Ferris
b6f891c42f
Merge "Remove MALLOC_LEAK_CHECK references."
2014-09-20 00:42:22 +00:00
Svetoslav
5796d19481
am a5fe65ad: am 86636aa3: am e87d1f7a: Merge "TouchExploer computes incorectly the click location." into lmp-dev
...
* commit 'a5fe65adc7de853a6525c4cef47f2084a1231622':
TouchExploer computes incorectly the click location.
2014-09-20 00:38:10 +00:00
Christopher Tate
604de34956
am c9a016dd: Merge "Always give wifi a chance to quiet down during restore" into lmp-dev
...
* commit 'c9a016dd4eefd01ab6acc916d2a1bad854933e58':
Always give wifi a chance to quiet down during restore
2014-09-20 00:33:14 +00:00
Dianne Hackborn
89de053753
am da7e72b1: Merge "Fix issue #17492300 : NavUtils.shouldUpRecreateTask returns different..." into lmp-dev
...
* commit 'da7e72b1c1f43fecc522727f42eb2fa01b6f8df4':
Fix issue #17492300 : NavUtils.shouldUpRecreateTask returns different...
2014-09-20 00:33:10 +00:00
Svetoslav
90cab35dc1
am 86636aa3: am e87d1f7a: Merge "TouchExploer computes incorectly the click location." into lmp-dev
...
* commit '86636aa313671e6387abc1c81a6a8ed37e495fbb':
TouchExploer computes incorectly the click location.
2014-09-20 00:27:00 +00:00
Christopher Tate
4c45b649c3
Merge "Always give wifi a chance to quiet down during restore" into lmp-dev
2014-09-20 00:25:12 +00:00
Dianne Hackborn
000e464f30
Merge "Fix issue #17492300 : NavUtils.shouldUpRecreateTask returns different..." into lmp-dev
2014-09-20 00:22:52 +00:00
Dianne Hackborn
f3eb843665
Fix issue #17492300 : NavUtils.shouldUpRecreateTask returns different...
...
...value in L
Only do the new logic when the task is a document.
Change-Id: I4664b94a3fe86ea266c2feb4e889c14c06751a15
2014-09-19 17:21:46 -07:00
Chris Craik
f1c91fec09
am 30dca470: am f0a80b68: am ea74883e: am fe01ab10: Merge "Account for alpha in hasShadow()" into lmp-dev
...
* commit '30dca470d6b261433f0ad11117e5dff7d9124d9e':
Account for alpha in hasShadow()
2014-09-20 00:19:38 +00:00
Dianne Hackborn
44c49d9291
am 77817a6b: am 4b091802: am 3ed0079f: am 8a9df5a2: Merge "Fix issue #17574819 : Chrome browser process is killed in background..." into lmp-dev
...
* commit '77817a6b4e3bf133505e079de654afff0ba25b0d':
Fix issue #17574819 : Chrome browser process is killed in background...
2014-09-20 00:19:34 +00:00
Dianne Hackborn
5dc8f3ff16
am 9f547d09: am c8baca41: am ae1e4824: am cfcaa31f: Merge "Work on issue #17381033 : Program icon and shortcut disappear after..." into lmp-dev
...
* commit '9f547d09c19dc8aea3f7cffd84ade9ecc7ed17a6':
Work on issue #17381033 : Program icon and shortcut disappear after...
2014-09-20 00:19:29 +00:00
Svetoslav
8c99909fb5
am e87d1f7a: Merge "TouchExploer computes incorectly the click location." into lmp-dev
...
* commit 'e87d1f7a9d36212d382694b1eefdc725dcd4e868':
TouchExploer computes incorectly the click location.
2014-09-20 00:13:49 +00:00
Chris Craik
cac59c8de4
am f0a80b68: am ea74883e: am fe01ab10: Merge "Account for alpha in hasShadow()" into lmp-dev
...
* commit 'f0a80b68f729914c83ee897d8bf8060b031333bc':
Account for alpha in hasShadow()
2014-09-20 00:08:12 +00:00
Dianne Hackborn
a0e661ee3d
am 4b091802: am 3ed0079f: am 8a9df5a2: Merge "Fix issue #17574819 : Chrome browser process is killed in background..." into lmp-dev
...
* commit '4b0918021665f499c7fa57b8d6d5cb3ceca9c77e':
Fix issue #17574819 : Chrome browser process is killed in background...
2014-09-20 00:08:08 +00:00
Dianne Hackborn
fc1ed4adaa
am c8baca41: am ae1e4824: am cfcaa31f: Merge "Work on issue #17381033 : Program icon and shortcut disappear after..." into lmp-dev
...
* commit 'c8baca41100b17e321d8df4c72e741d30563788b':
Work on issue #17381033 : Program icon and shortcut disappear after...
2014-09-20 00:08:04 +00:00
Amit Mahajan
6aed028e8a
am 1ab5ba1b: am 9abf8a29: am 57f63262: am 04ac796c: Merge "Control radio restart on PDP_FAIL_REGULAR_DEACTIVATION by a config variable" into lmp-dev
...
* commit '1ab5ba1b7d1ef926d72013cb2b7795284d70f101':
Control radio restart on PDP_FAIL_REGULAR_DEACTIVATION by a config variable
2014-09-20 00:06:49 +00:00
Christopher Tate
7274444b6e
Always give wifi a chance to quiet down during restore
...
Not just when the current scan-always setting is on.
Bug 17571997
Change-Id: Idc56c9682c18f5e23c0bde98736522a79583af5e
2014-09-19 17:03:59 -07:00
Svetoslav
49c469165f
Merge "TouchExploer computes incorectly the click location." into lmp-dev
2014-09-20 00:02:46 +00:00
Chris Craik
031bc65836
am ea74883e: am fe01ab10: Merge "Account for alpha in hasShadow()" into lmp-dev
...
* commit 'ea74883e54be60bad3fb6021c5842b238d535d27':
Account for alpha in hasShadow()
2014-09-19 23:56:43 +00:00
Dianne Hackborn
1335769823
am 3ed0079f: am 8a9df5a2: Merge "Fix issue #17574819 : Chrome browser process is killed in background..." into lmp-dev
...
* commit '3ed0079f283999fe25e5afff73710fec2c2c8162':
Fix issue #17574819 : Chrome browser process is killed in background...
2014-09-19 23:56:40 +00:00
Dianne Hackborn
f2c638ecb3
am ae1e4824: am cfcaa31f: Merge "Work on issue #17381033 : Program icon and shortcut disappear after..." into lmp-dev
...
* commit 'ae1e4824bd049ffc6e677ab1c6de16fe35cf266c':
Work on issue #17381033 : Program icon and shortcut disappear after...
2014-09-19 23:56:36 +00:00
Christopher Tate
37a52a103a
am 27935970: am 4f3cb005: am 9c236001: am a739f0df: Logspam is spam
...
* commit '2793597078ee6cbb04eafea48ba0ee89f0b73449':
Logspam is spam
2014-09-19 23:56:20 +00:00
Amit Mahajan
2bf16788c9
am 9abf8a29: am 57f63262: am 04ac796c: Merge "Control radio restart on PDP_FAIL_REGULAR_DEACTIVATION by a config variable" into lmp-dev
...
* commit '9abf8a29afacd6ad2b87f5563152e1ebb0dadf13':
Control radio restart on PDP_FAIL_REGULAR_DEACTIVATION by a config variable
2014-09-19 23:55:39 +00:00
Svetoslav
8d412fe18b
TouchExploer computes incorectly the click location.
...
If there is accessibilty focus and the user touch explores
location that does not change accessibility focus that is
not in the app window, e.g. system bar, double tap does not
click on the system UI affordance. This is due to obsolete
logic from the time where accessibility focus was only in
the active window at the time of double clicking.
bug:17588024
Change-Id: Ib780103e873d8a2afd3b35de3227d54116f1a1b0
2014-09-19 16:54:20 -07:00
Chris Craik
3d4df3b67b
am fe01ab10: Merge "Account for alpha in hasShadow()" into lmp-dev
...
* commit 'fe01ab10593f07ec17bdf490fcd8b57296616fa4':
Account for alpha in hasShadow()
2014-09-19 23:44:04 +00:00
Dianne Hackborn
fb08ea8b03
am 8a9df5a2: Merge "Fix issue #17574819 : Chrome browser process is killed in background..." into lmp-dev
...
* commit '8a9df5a21c166218ace936e1443948500ed0792f':
Fix issue #17574819 : Chrome browser process is killed in background...
2014-09-19 23:38:34 +00:00
Dianne Hackborn
d61d0ade23
am cfcaa31f: Merge "Work on issue #17381033 : Program icon and shortcut disappear after..." into lmp-dev
...
* commit 'cfcaa31f5136b44da4b8b9ae16ec3311d9c7cdde':
Work on issue #17381033 : Program icon and shortcut disappear after...
2014-09-19 23:38:29 +00:00
Amit Mahajan
af1fc47cd4
am 57f63262: am 04ac796c: Merge "Control radio restart on PDP_FAIL_REGULAR_DEACTIVATION by a config variable" into lmp-dev
...
* commit '57f632624cb36e86fa92ab072ee56796862237ed':
Control radio restart on PDP_FAIL_REGULAR_DEACTIVATION by a config variable
2014-09-19 23:36:53 +00:00
Christopher Tate
258a120a22
am 4f3cb005: am 9c236001: am a739f0df: Logspam is spam
...
* commit '4f3cb0054c5ba1283335cb1901c0d74b085d4f33':
Logspam is spam
2014-09-19 23:36:35 +00:00
Chris Craik
9e7c919191
Merge "Account for alpha in hasShadow()" into lmp-dev
2014-09-19 23:36:22 +00:00
Amit Mahajan
94c554ccdf
am 04ac796c: Merge "Control radio restart on PDP_FAIL_REGULAR_DEACTIVATION by a config variable" into lmp-dev
...
* commit '04ac796c6191dbeb7d393664ef1ca27624f934b8':
Control radio restart on PDP_FAIL_REGULAR_DEACTIVATION by a config variable
2014-09-19 23:27:03 +00:00
Dianne Hackborn
cf456e3c22
Merge "Fix issue #17574819 : Chrome browser process is killed in background..." into lmp-dev
2014-09-19 23:26:18 +00:00
Dianne Hackborn
cfb67ee40c
Merge "Work on issue #17381033 : Program icon and shortcut disappear after..." into lmp-dev
2014-09-19 23:24:19 +00:00
Dianne Hackborn
0ed82e2c21
Work on issue #17381033 : Program icon and shortcut disappear after...
...
...running monkey test overnight [FACTORY ROM BLOCKER]
Add surface tracing to debug output.
Change-Id: I65f7fc90c51b0805f7e0090141c33d6b60ccb3b4
2014-09-19 16:22:50 -07:00
Alan Viverette
4828d7afed
am a59a64e7: am c53cce28: am 38321d61: am d112a2d9: Merge "Update theme colors for better contrast and de-blueing" into lmp-dev
...
* commit 'a59a64e7b890e0683592479ec4d985f383792c54':
Update theme colors for better contrast and de-blueing
2014-09-19 23:18:55 +00:00
Elliott Hughes
69eb21074f
am 4fec1b48: am 600ca140: Merge "Use constants instead of resources for ellipsis."
...
* commit '4fec1b488759a89732af151e21a89aa6693ba9bf':
Use constants instead of resources for ellipsis.
2014-09-19 23:16:52 +00:00
Christopher Tate
9564b1d2f7
am 9c236001: am a739f0df: Logspam is spam
...
* commit '9c23600139f0b410cd85d6495da2fe92c4def17f':
Logspam is spam
2014-09-19 23:16:32 +00:00
Dan Albert
8ab25d82b5
resolved conflicts for merge of 1a4527ce to lmp-mr1-dev-plus-aosp
...
Change-Id: If649bd9ef98181a1e1e341cc5b73d237586fb72c
2014-09-19 16:13:49 -07:00