Commit Graph

152793 Commits

Author SHA1 Message Date
Baligh Uddin
b5acf9bfc1 am 5adb5a18: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
* commit '5adb5a18ccb1b79adfce925da1012ec580baf636':
  Import translations. DO NOT MERGE
2014-09-22 19:18:04 +00:00
Baligh Uddin
4413889dbc am 906ba6b9: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
* commit '906ba6b951c241c254f3257a2ed81663ff11f39b':
  Import translations. DO NOT MERGE
2014-09-22 19:18:00 +00:00
John Spurlock
50d0144996 am 7e5776e1: am bfaadc6b: Merge "Mark sysui config resource as untranslatable." into lmp-dev
* commit '7e5776e12c9706f511c22993dfed3bb30d22ed8d':
  Mark sysui config resource as untranslatable.
2014-09-22 19:17:38 +00:00
Baligh Uddin
64387a366d Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-09-21 18:07:46 +00:00
Baligh Uddin
6a307e8ba1 Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-09-21 17:52:16 +00:00
Baligh Uddin
e2334661d7 Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-09-21 17:51:55 +00:00
Baligh Uddin
c9759d761e Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 2014-09-21 17:51:47 +00:00
Baligh Uddin
817bb46306 Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 2014-09-21 17:51:04 +00:00
John Spurlock
91e022b426 am bfaadc6b: Merge "Mark sysui config resource as untranslatable." into lmp-dev
* commit 'bfaadc6b4098c23f5dc1a15522a011ba3cd72bf5':
  Mark sysui config resource as untranslatable.
2014-09-21 17:06:49 +00:00
John Spurlock
8fefb4281a Merge "Mark sysui config resource as untranslatable." into lmp-dev 2014-09-21 16:57:55 +00:00
Baligh Uddin
974c9c8187 Import translations. DO NOT MERGE
Change-Id: Ib126d3dd73ff597b813ed6f792ca2e667abc155d
Auto-generated-cl: translation import
2014-09-20 23:11:31 -07:00
Baligh Uddin
0315371dd2 Import translations. DO NOT MERGE
Change-Id: Ie0eee73354b0677b17df5e3d3118f9e0e062e5e2
Auto-generated-cl: translation import
2014-09-20 16:16:12 -07:00
Baligh Uddin
63caa9d5c3 Import translations. DO NOT MERGE
Change-Id: Ibe2f80b5805c0805c1eb708deadf81b57302e8c5
Auto-generated-cl: translation import
2014-09-20 16:11:52 -07:00
Baligh Uddin
0d0f0ce44f Import translations. DO NOT MERGE
Change-Id: I648dbc9b63a1e550db4c935923d627150bb57e7a
Auto-generated-cl: translation import
2014-09-20 13:52:17 -07:00
Baligh Uddin
5c87e54608 Import translations. DO NOT MERGE
Change-Id: Ic10484794305306aef57f8e289c27a3aa438a26e
Auto-generated-cl: translation import
2014-09-20 13:36:34 -07:00
Baligh Uddin
39df7209b1 Import translations. DO NOT MERGE
Change-Id: I11cded1dd334b8088faa24a66c66341fe0e0f38d
Auto-generated-cl: translation import
2014-09-20 12:57:53 -07:00
Yigit Boyar
31ff5b9fd3 am 397c6004: am 646e0428: Merge "Find activity from context in menu inflator for click events" into lmp-dev
* commit '397c6004706f93941514d31c2cafdbd6183634fd':
  Find activity from context in menu inflator for click events
2014-09-20 02:05:07 +00:00
Jeff Brown
de7c9b964f am a94c9ccb: am 09395677: Merge "Decouple turning screen on from waking up in policy." into lmp-dev
* commit 'a94c9ccb8a7f85ff2a3e1329e94367c863f39309':
  Decouple turning screen on from waking up in policy.
2014-09-20 02:05:03 +00:00
Jeff Brown
4ed1dbcf0b am f138c63e: am 6d098d40: Merge "Fix order of operations while pulsing the ambient display." into lmp-dev
* commit 'f138c63e799090b7e796b577ce9926753c7b77c8':
  Fix order of operations while pulsing the ambient display.
2014-09-20 02:04:59 +00:00
Jeff Brown
00a3441b25 am 5737f7d7: am f10fc92c: Merge "Ensure that the screen on blocker is applied while dozing." into lmp-dev
* commit '5737f7d75c34b2cb7c66771d3cda21a019acd2d2':
  Ensure that the screen on blocker is applied while dozing.
2014-09-20 02:04:55 +00:00
Yigit Boyar
0f46dd0de9 am 646e0428: Merge "Find activity from context in menu inflator for click events" into lmp-dev
* commit '646e0428a489d786c29a9ad48c1f21f3d644af42':
  Find activity from context in menu inflator for click events
2014-09-20 01:36:12 +00:00
Yigit Boyar
1a74dc4547 Merge "Find activity from context in menu inflator for click events" into lmp-dev 2014-09-20 01:30:00 +00:00
Jeff Brown
e8e3125eeb am 09395677: Merge "Decouple turning screen on from waking up in policy." into lmp-dev
* commit '09395677f7ef5119556e8ba100c0bd27480c9797':
  Decouple turning screen on from waking up in policy.
2014-09-20 01:27:03 +00:00
Jeff Brown
76eb0a5b79 am 6d098d40: Merge "Fix order of operations while pulsing the ambient display." into lmp-dev
* commit '6d098d406305bb6f34d48ce6035ba3920659a805':
  Fix order of operations while pulsing the ambient display.
2014-09-20 01:26:59 +00:00
Jeff Brown
044af2d4f5 am f10fc92c: Merge "Ensure that the screen on blocker is applied while dozing." into lmp-dev
* commit 'f10fc92c564048b51f1775fe92738669d358fa16':
  Ensure that the screen on blocker is applied while dozing.
2014-09-20 01:26:54 +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
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 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
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
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
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
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