Christopher Tate
16e1408410
am 880340dd: am c9a016dd: Merge "Always give wifi a chance to quiet down during restore" into lmp-dev
...
* commit '880340dd0a25128f67e79c847c7c09a69a8618d7':
Always give wifi a chance to quiet down during restore
2014-09-20 00:44:11 +00:00
Dianne Hackborn
77290e69a2
am c34f5727: am da7e72b1: Merge "Fix issue #17492300 : NavUtils.shouldUpRecreateTask returns different..." into lmp-dev
...
* commit 'c34f5727986ab3dd84ea10d3f783805392954469':
Fix issue #17492300 : NavUtils.shouldUpRecreateTask returns different...
2014-09-20 00:44:06 +00:00
Christopher Tate
661f4f0799
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:11 +00:00
Dianne Hackborn
bad354f9a9
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:06 +00:00
Svetoslav
c40e00e408
am 0798db9b: am e87d1f7a: Merge "TouchExploer computes incorectly the click location." into lmp-dev
...
* commit '0798db9b40c63e5843e415ae353445d05007b12e':
TouchExploer computes incorectly the click location.
2014-09-20 00:26:59 +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
Svetoslav
3341ea8c7f
am e87d1f7a: Merge "TouchExploer computes incorectly the click location." into lmp-dev
...
* commit 'e87d1f7a9d36212d382694b1eefdc725dcd4e868':
TouchExploer computes incorectly the click location.
2014-09-20 00:14:53 +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
4d4b3aa3d9
am 91a40be0: am fe01ab10: Merge "Account for alpha in hasShadow()" into lmp-dev
...
* commit '91a40be04f8d1822c27888cc47124bf965633f4f':
Account for alpha in hasShadow()
2014-09-19 23:56:46 +00:00
Dianne Hackborn
a57901c5fb
am 7020e2c6: am 8a9df5a2: Merge "Fix issue #17574819 : Chrome browser process is killed in background..." into lmp-dev
...
* commit '7020e2c6a12814ac6aca2cfda6763beca50b2aa4':
Fix issue #17574819 : Chrome browser process is killed in background...
2014-09-19 23:56:41 +00:00
Dianne Hackborn
946e99cb4b
am 49c86c24: am cfcaa31f: Merge "Work on issue #17381033 : Program icon and shortcut disappear after..." into lmp-dev
...
* commit '49c86c24f0819997652d3250ca9a842e0d671d55':
Work on issue #17381033 : Program icon and shortcut disappear after...
2014-09-19 23:56:36 +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
746c441d4b
am fe01ab10: Merge "Account for alpha in hasShadow()" into lmp-dev
...
* commit 'fe01ab10593f07ec17bdf490fcd8b57296616fa4':
Account for alpha in hasShadow()
2014-09-19 23:47:21 +00:00
Dianne Hackborn
d42488dd8e
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:21 +00:00
Dianne Hackborn
ec612b25f4
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:16 +00:00
Amit Mahajan
b7295d26b9
am 60a0cebf: am 04ac796c: Merge "Control radio restart on PDP_FAIL_REGULAR_DEACTIVATION by a config variable" into lmp-dev
...
* commit '60a0cebfa2a944e7079121ada326c3fa3375ec4d':
Control radio restart on PDP_FAIL_REGULAR_DEACTIVATION by a config variable
2014-09-19 23:37:01 +00:00
Chris Craik
9e7c919191
Merge "Account for alpha in hasShadow()" into lmp-dev
2014-09-19 23:36:22 +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
Amit Mahajan
df5c8d3639
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:23:11 +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
Christopher Tate
a27e57ea4a
am 52b20b5d: am a739f0df: Logspam is spam
...
* commit '52b20b5dcbd93e715f046bce96145e93bbf6fe5e':
Logspam is spam
2014-09-19 23:16:50 +00:00
Amit Mahajan
c2492e19ea
Merge "Control radio restart on PDP_FAIL_REGULAR_DEACTIVATION by a config variable" into lmp-dev
2014-09-19 23:12:58 +00:00
Hui Wang
4b57b991ac
Control radio restart on PDP_FAIL_REGULAR_DEACTIVATION by a config variable
...
Bug: 17567651, 16308209
Change-Id: Ie164b16b70429d5815e9bef5f8c5489f6e49de36
2014-09-19 23:11:58 +00:00
Christopher Tate
9bb0e2307e
am a739f0df: Logspam is spam
...
* commit 'a739f0df4e63856b30a653f61a0a296fc6148688':
Logspam is spam
2014-09-19 23:05:35 +00:00
Chris Craik
9fa364dc72
Account for alpha in hasShadow()
...
bug:17587220
Change-Id: Ic7f2dea95302b713dc93edb4a0193a7be77fb2eb
2014-09-19 16:04:45 -07:00
Elliott Hughes
212998ce62
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:02:14 +00:00
Dan Albert
c04d92cac9
resolved conflicts for merge of 1a4527ce to lmp-dev-plus-aosp
...
Change-Id: Iee4e93e3a2b049ec5f13166dbbffdd77b301fe5c
2014-09-19 15:57:26 -07:00
Alan Viverette
901c36e51c
am 080c4437: am d112a2d9: Merge "Update theme colors for better contrast and de-blueing" into lmp-dev
...
* commit '080c443740042805b678b94f10982a41957490df':
Update theme colors for better contrast and de-blueing
2014-09-19 22:51:01 +00:00
Christopher Tate
eae9216770
Logspam is spam
...
This turns out to happen a lot in normal usage, but we're logging
copiously about it each time. It's reporting "oh hey we're already
in this state" -- and so the log is not useful anyway.
Logspam is spam.
Bug 15169507
Change-Id: Ie2d01ff1b0b3600dd9c15ccf83d60875558f1dc2
2014-09-19 22:49:20 +00:00
Alan Viverette
68247b0303
am f680e5f2: am 14932619: Merge "Correctly apply max width/height to preference icons" into lmp-dev
...
* commit 'f680e5f2820111f464f4100bb771bae0cca75518':
Correctly apply max width/height to preference icons
2014-09-19 22:42:02 +00:00
Alan Viverette
1183d55f48
am d112a2d9: Merge "Update theme colors for better contrast and de-blueing" into lmp-dev
...
* commit 'd112a2d9afb11c46d9c806d70c794cfaf972e510':
Update theme colors for better contrast and de-blueing
2014-09-19 22:41:56 +00:00
Dan Albert
ece13f90ed
resolved conflicts for merge of 8791ebf0 to lmp-dev-plus-aosp
...
Change-Id: I9d0f81003f84d03a7a67420dd496fde18dd654d4
2014-09-19 15:37:15 -07:00
Alan Viverette
edcb2d0e89
Merge "Update theme colors for better contrast and de-blueing" into lmp-dev
2014-09-19 22:28:08 +00:00
Ian Rogers
c058fbb5a0
am ad64befd: am 296a712e: Merge "Make a field final."
...
* commit 'ad64befd25befae3d71c53be6d6a31d1f8d12464':
Make a field final.
2014-09-19 22:27:18 +00:00
Alan Viverette
b6e5a88104
am 14932619: Merge "Correctly apply max width/height to preference icons" into lmp-dev
...
* commit '14932619ea17d7b224902c50db4d59f15eed7b1c':
Correctly apply max width/height to preference icons
2014-09-19 22:27:16 +00:00
Alan Viverette
daf8588275
Merge "Correctly apply max width/height to preference icons" into lmp-dev
2014-09-19 22:19:02 +00:00
Alan Viverette
0fa3c1c656
Update theme colors for better contrast and de-blueing
...
BUG: 17520824
Change-Id: Id9f90136cea169ba9e58db957034c539ef25121f
2014-09-19 22:17:45 +00:00
Elliott Hughes
4fec1b4887
am 600ca140: Merge "Use constants instead of resources for ellipsis."
...
* commit '600ca140e2e31e76f9bef7d484387ea366812cb3':
Use constants instead of resources for ellipsis.
2014-09-19 22:14:48 +00:00
Dan Albert
1a4527ce94
am 799812cd: Merge "Clean up makefile cruft."
...
* commit '799812cd6f7f9aa4a87d81dafd273d51ac5ba992':
Clean up makefile cruft.
2014-09-19 22:14:42 +00:00
Dan Albert
8791ebf0cd
am bcaaebb8: Merge "Clean up test makefiles."
...
* commit 'bcaaebb8a881951720190f4a6b9ffcbf871542af':
Clean up test makefiles.
2014-09-19 22:14:38 +00:00
Ian Rogers
ad64befd25
am 296a712e: Merge "Make a field final."
...
* commit '296a712e6b3fd48b5ace1128fa68547fdb8de84d':
Make a field final.
2014-09-19 22:14:33 +00:00
Dianne Hackborn
0fe3c25658
Fix issue #17574819 : Chrome browser process is killed in background...
...
...due to dying renderer process
Don't kill processes if they are bound to a service but not impacting
oom adjustment.
Change-Id: I1cc44e633feaeaad6e996b79a6cfd7b386c04095
2014-09-19 15:09:39 -07:00
Elliott Hughes
600ca140e2
Merge "Use constants instead of resources for ellipsis."
2014-09-19 22:02:45 +00:00
Svetoslav
dacb58d6f6
am 5b119d7d: am 35abe50d: Merge "Keep existing API behavior that regressed." into lmp-dev
...
* commit '5b119d7db1ccce7aef5230020ddc00fee858d573':
Keep existing API behavior that regressed.
2014-09-19 22:02:13 +00:00
Igor Viarheichyk
ed0daa93e4
Use constants instead of resources for ellipsis.
...
All supported locales use only U+2025 and U+2026 to represent
ellipses, and it will unlikely change in future. Given translated
resources are inconsistent and often use three dots it is safer
to use constants instead of resources.
Change-Id: I51a6cb903f62f739fbadd6b78e5765c0028d641a
2014-09-19 22:02:08 +00:00
Dianne Hackborn
df0f7082dc
am 0f10194f: am cb2775a7: Merge "Add new activity dumpsys command to persist all data." into lmp-dev
...
* commit '0f10194ff90ac1efc8c8ef3f17dbb7c74d2e9da1':
Add new activity dumpsys command to persist all data.
2014-09-19 22:02:06 +00:00