drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
156,755 Commits 1 Branch 0 Tags
Commit Graph

156755 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Baligh Uddin
02fde656c3 am fea91df7: (-s ours) am 5ed716c1: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit 'fea91df724464bc03b4afd348c52506f4ccb388a':
  Import translations. DO NOT MERGE
 2014-09-21 18:15:34 +00:00
Baligh Uddin
6f8df5f814 am 5ed716c1: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '5ed716c1f4a4ae0ec9c8ec787b56cf6596b1020d':
  Import translations. DO NOT MERGE
 2014-09-21 18:01:48 +00:00
Baligh Uddin
43c9e64b9a Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-09-21 17:51:34 +00:00
John Spurlock
6fe0f01886 am a3402f94: am bfaadc6b: Merge "Mark sysui config resource as untranslatable." into lmp-dev 
* commit 'a3402f940a6f59304fed30a35d33d44309fed14c':
  Mark sysui config resource as untranslatable.
 2014-09-21 17:17:58 +00:00
John Spurlock
45d1265696 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:58 +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
615bd17249 Import translations. DO NOT MERGE 
Change-Id: I63ca0e486e5e1ad3c2a0b654ce5be5b1789d11b1
Auto-generated-cl: translation import
 2014-09-20 16:09:28 -07:00
Nick Kralevich
d6087c0204 resolved conflicts for merge of 4cbee7d2 to lmp-dev-plus-aosp 
Change-Id: Ie35383ff88d63beef1e3ce4ae92813025709beb7
 2014-09-20 11:28:22 -07:00
Yigit Boyar
565dc77229 am 3439d367: am 646e0428: Merge "Find activity from context in menu inflator for click events" into lmp-dev 
* commit '3439d367f662f84cc26c3e7a0eefb6d5d57be5c0':
  Find activity from context in menu inflator for click events
 2014-09-20 04:46:21 +00:00
Jeff Brown
2a46170cd6 am 54d28e51: am 09395677: Merge "Decouple turning screen on from waking up in policy." into lmp-dev 
* commit '54d28e51275e948d59484e3bd3e3eaea25c012e8':
  Decouple turning screen on from waking up in policy.
 2014-09-20 04:46:16 +00:00
Jeff Brown
a43c3ce178 am d875a696: am 6d098d40: Merge "Fix order of operations while pulsing the ambient display." into lmp-dev 
* commit 'd875a6969eb810b8301d96f636f4710c5ab51484':
  Fix order of operations while pulsing the ambient display.
 2014-09-20 04:46:10 +00:00
Jeff Brown
c7b904465b am 3f6f0a50: am f10fc92c: Merge "Ensure that the screen on blocker is applied while dozing." into lmp-dev 
* commit '3f6f0a501dfebb9da9863891648976063d41f3bf':
  Ensure that the screen on blocker is applied while dozing.
 2014-09-20 04:46:04 +00:00
Yigit Boyar
6e6e3fbdb2 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 03:08:13 +00:00
Jeff Brown
fd92288dfe 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 03:07:31 +00:00
Jeff Brown
a598014121 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 03:07:26 +00:00
Jeff Brown
d39f2734eb 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 03:07:20 +00:00
Christopher Ferris
4cbee7d24d am b7442bbc: Merge "Remove MALLOC_LEAK_CHECK references." 
* commit 'b7442bbc8c27b0643b7235076ee151b8257bf28d':
  Remove MALLOC_LEAK_CHECK references.
 2014-09-20 01:30:36 +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
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 Ferris
5684e714a4 am 7d113829: am b6f891c4: Merge "Remove MALLOC_LEAK_CHECK references." 
* commit '7d1138298b37bca2340fc4610090b53f5b838f7a':
  Remove MALLOC_LEAK_CHECK references.
 2014-09-20 01:03:08 +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
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 Ferris
b6f891c42f Merge "Remove MALLOC_LEAK_CHECK references." 2014-09-20 00:42:22 +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