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

79108 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ben Murdoch
1bd37b176e Deprecate WebChromeClient.onJsTimeout 
This method was only supported with the JSC JavaScript engine.
V8 became the default JavaScript engine in Froyo and this method
has not been invoked since. Support for building JSC was removed
in b/5495373.

Bug: 6295376
Change-Id: I3dbe83f375b88ebbbb713d3c3fa5a2fa323a0d45
 2012-05-28 14:20:07 +01:00
Steve Block
47faa92c62 Merge "Avoid unintended side-effects of loading javascript: URLS in Java Bridge tests" 2012-05-28 03:29:22 -07:00
Bryan Mawhinney
fc11edb05a am 592a3f54: am c3a5cf9a: Actually set the video scaling mode :-) 
* commit '592a3f544745f19d9901692700a1b439b9f8c57b':
  Actually set the video scaling mode :-)
 2012-05-27 12:53:48 -07:00
Bryan Mawhinney
592a3f5447 am c3a5cf9a: Actually set the video scaling mode :-) 
* commit 'c3a5cf9aab3d409445accb2a93c09e6b4140d196':
  Actually set the video scaling mode :-)
 2012-05-27 12:50:40 -07:00
Bryan Mawhinney
c3a5cf9aab Actually set the video scaling mode :-) 
Change-Id: Ia3e77b68a07651861e9be268ab77cac808b3be79
 2012-05-27 17:42:46 +01:00
Romain Guy
44660e6d07 am 59893daa: am bbedfa00: Merge "Tale of status bar on crespo, part 3 Bug #6541079" into jb-dev 
* commit '59893daa5002f1c6dd10b97f5ee6645550554179':
  Tale of status bar on crespo, part 3 Bug #6541079
 2012-05-25 19:28:00 -07:00
Romain Guy
59893daa50 am bbedfa00: Merge "Tale of status bar on crespo, part 3 Bug #6541079" into jb-dev 
* commit 'bbedfa0036f8de393c05b2ad981695ae74e7ab42':
  Tale of status bar on crespo, part 3 Bug #6541079
 2012-05-25 19:23:48 -07:00
Romain Guy
bbedfa0036 Merge "Tale of status bar on crespo, part 3 Bug #6541079" into jb-dev 2012-05-25 19:21:49 -07:00
Jeff Brown
401950e3d4 am 9026fecd: am d4cf7e7b: Merge "Don\'t ANR on hover, scroll or if a window goes away." into jb-dev 
* commit '9026fecd517020d70d62379c49e749d25a65a9cb':
  Don't ANR on hover, scroll or if a window goes away.
 2012-05-25 18:44:54 -07:00
Jeff Brown
9026fecd51 am d4cf7e7b: Merge "Don\'t ANR on hover, scroll or if a window goes away." into jb-dev 
* commit 'd4cf7e7b06e6870d447dbed2683b8849cfe5336b':
  Don't ANR on hover, scroll or if a window goes away.
 2012-05-25 18:41:20 -07:00
Jeff Brown
d4cf7e7b06 Merge "Don't ANR on hover, scroll or if a window goes away." into jb-dev 2012-05-25 18:38:24 -07:00
Chet Haase
5f9853738a am 9d8933ec: am a27551dd: Merge "Make Google search panel go away when receiving phone call" into jb-dev 
* commit '9d8933ec11416147af2d2c36ba0dfa5e806b851a':
  Make Google search panel go away when receiving phone call
 2012-05-25 15:56:52 -07:00
John Reck
83a40e8e64 am 2611f1ec: am 7cbe6457: Merge "Copy over the scroll position for the scrolling layer" into jb-dev 
* commit '2611f1eced80db74d07563e03bb99a146aa461b6':
  Copy over the scroll position for the scrolling layer
 2012-05-25 15:56:48 -07:00
Chet Haase
9d8933ec11 am a27551dd: Merge "Make Google search panel go away when receiving phone call" into jb-dev 
* commit 'a27551dde853733e89aa16b6fb096186b08c5d81':
  Make Google search panel go away when receiving phone call
 2012-05-25 15:52:01 -07:00
John Reck
2611f1eced am 7cbe6457: Merge "Copy over the scroll position for the scrolling layer" into jb-dev 
* commit '7cbe645730286eb7e5ff7339ce8c6a2ee181f2eb':
  Copy over the scroll position for the scrolling layer
 2012-05-25 15:51:58 -07:00
Chet Haase
a27551dde8 Merge "Make Google search panel go away when receiving phone call" into jb-dev 2012-05-25 15:49:47 -07:00
John Reck
7cbe645730 Merge "Copy over the scroll position for the scrolling layer" into jb-dev 2012-05-25 15:49:15 -07:00
Irfan Sheriff
f7fbb801c9 am 7d16bf40: am e2417b7a: Merge "Retain device during connecting state" into jb-dev 
* commit '7d16bf4085a2e5dce68f7a08a08ad91b4480d9d7':
  Retain device during connecting state
 2012-05-25 15:19:23 -07:00
Irfan Sheriff
7d16bf4085 am e2417b7a: Merge "Retain device during connecting state" into jb-dev 
* commit 'e2417b7a6ef2ba539be70574fe7c9e1af4810dd4':
  Retain device during connecting state
 2012-05-25 15:15:32 -07:00
Irfan Sheriff
e2417b7a6e Merge "Retain device during connecting state" into jb-dev 2012-05-25 15:13:27 -07:00
Brandon Keely
465fc7185f am c3750d06: am 3ef8dd2b: Merge "For 720dp devices, less motion during task-to-task transition." into jb-dev 
* commit 'c3750d068c0414766b46df4706b93ffced45b922':
  For 720dp devices, less motion during task-to-task transition.
 2012-05-25 14:46:03 -07:00
Brandon Keely
c3750d068c am 3ef8dd2b: Merge "For 720dp devices, less motion during task-to-task transition." into jb-dev 
* commit '3ef8dd2b399109c2c9b05ea24315bcc2e0ba8df2':
  For 720dp devices, less motion during task-to-task transition.
 2012-05-25 14:41:52 -07:00
Brandon Keely
3ef8dd2b39 Merge "For 720dp devices, less motion during task-to-task transition." into jb-dev 2012-05-25 14:38:47 -07:00
Eric Fischer
e63bf1d445 am edabf9c7: (-s ours) am dfaadf9d: Merge "Import translations. DO NOT MERGE" into jb-dev 
* commit 'edabf9c75eb56c46d242d4c799723e0851dc2976':
  Import translations. DO NOT MERGE
 2012-05-25 14:32:15 -07:00
Eric Fischer
edabf9c75e am dfaadf9d: Merge "Import translations. DO NOT MERGE" into jb-dev 
* commit 'dfaadf9dae65e4e3cee7430908c98614bb208d20':
  Import translations. DO NOT MERGE
 2012-05-25 14:28:07 -07:00
Eric Fischer
0e34493745 Merge "Import translations. DO NOT MERGE" 2012-05-25 14:26:59 -07:00
Eric Fischer
dfaadf9dae Merge "Import translations. DO NOT MERGE" into jb-dev 2012-05-25 14:24:44 -07:00
Eric Fischer
282538c7fd am 085e8796: (-s ours) am aed9b810: Merge "Import translations. DO NOT MERGE" into jb-dev 
* commit '085e879629a2ba1c37cfcff75205501c562287e1':
  Import translations. DO NOT MERGE
 2012-05-25 14:22:39 -07:00
Eric Fischer
085e879629 am aed9b810: Merge "Import translations. DO NOT MERGE" into jb-dev 
* commit 'aed9b810a538fa02cc5f104e29841c90977ebeaa':
  Import translations. DO NOT MERGE
 2012-05-25 14:18:47 -07:00
Eric Fischer
bc50b3858c Merge "Import translations. DO NOT MERGE" 2012-05-25 14:18:45 -07:00
Eric Fischer
2001858fc8 Merge "Import translations. DO NOT MERGE" 2012-05-25 14:15:10 -07:00
Eric Fischer
aed9b810a5 Merge "Import translations. DO NOT MERGE" into jb-dev 2012-05-25 14:14:55 -07:00
John Reck
ec1b71adc6 Copy over the scroll position for the scrolling layer 
Bug: 6557664

Change-Id: I9b1257ee0a4d75f5b445e9f72455d51e4add1c77
 2012-05-25 14:02:26 -07:00
Fabrice Di Meglio
447a02c645 am b354f987: am d5f3798d: Merge "Fix bug #6558264 Recent apps launcher is not getting dismissed after launching Google app using long press of Home key" into jb-dev 
* commit 'b354f987d366e5e04ed95c93d105404f884008ef':
  Fix bug #6558264 Recent apps launcher is not getting dismissed after launching Google app using long press of Home key
 2012-05-25 13:56:46 -07:00
Fabrice Di Meglio
b354f987d3 am d5f3798d: Merge "Fix bug #6558264 Recent apps launcher is not getting dismissed after launching Google app using long press of Home key" into jb-dev 
* commit 'd5f3798d6b5cc6404aa03396b440b56415f00ca8':
  Fix bug #6558264 Recent apps launcher is not getting dismissed after launching Google app using long press of Home key
 2012-05-25 13:52:46 -07:00
Fabrice Di Meglio
d5f3798d6b Merge "Fix bug #6558264 Recent apps launcher is not getting dismissed after launching Google app using long press of Home key" into jb-dev 2012-05-25 13:49:39 -07:00
Chet Haase
ff20b0c0ef Make Google search panel go away when receiving phone call 
Issue #6557847 "Google" launcher icon stuck in ring slider after getting incoming call

Change-Id: If77f66fd241af7fbfe6228498b07fd1cfcef36bd
 2012-05-25 13:38:10 -07:00
Eric Fischer
ca141604ca Import translations. DO NOT MERGE 
Change-Id: Ib0166ab9aa5cdf32c933c6a8a1b4ee740865d231
 2012-05-25 13:35:05 -07:00
Eric Fischer
b80d834ca0 Import translations. DO NOT MERGE 
Change-Id: I893c25a4fd206d9b0c018c44e4441ef36d12eed0
 2012-05-25 13:32:45 -07:00
Eric Fischer
2ace60c1d6 Import translations. DO NOT MERGE 
Change-Id: Ic32791829a4f220236aacfc5004471894db915a7
 2012-05-25 13:24:26 -07:00
Eric Fischer
31348a1155 Import translations. DO NOT MERGE 
Change-Id: I926f659bbac67bc948859874622904e97e8995e8
 2012-05-25 13:17:00 -07:00
Fabrice Di Meglio
4d0d38b9f4 Fix bug #6558264 Recent apps launcher is not getting dismissed after launching Google app using long press of Home key 
- close Recent Apps before launching the Assistant

Change-Id: I823dc254252fb3c1fde0a3adcfb895e368c7d77e
 2012-05-25 13:14:02 -07:00
Eric Fischer
02f03668f8 Import translations. DO NOT MERGE 
Change-Id: I3528164ed7d96f571cf31df0715100da5120b082
 2012-05-25 13:11:43 -07:00
Irfan Sheriff
9cb980422a Retain device during connecting state 
With join taking much longer, sometimes device can be lost from supplicant.
Retain device to complete connection.

Also, clear up stale peer data after find stops during inactive state.

Bug: 6557725
Change-Id: I15b92e50a837481f974034b1ea7b32c8abee969e
 2012-05-25 12:52:34 -07:00
Gilles Debunne
31d869ce07 am 1cf99631: am 18afc622: Merge "Fix for IOOB in SearchView" into jb-dev 
* commit '1cf99631ca6859785ef5716def75169f77b1bee3':
  Fix for IOOB in SearchView
 2012-05-25 12:50:14 -07:00
Gilles Debunne
1cf99631ca am 18afc622: Merge "Fix for IOOB in SearchView" into jb-dev 
* commit '18afc622c3d80713a6ffb91792cce399e1715bfb':
  Fix for IOOB in SearchView
 2012-05-25 12:46:09 -07:00
Gilles Debunne
18afc622c3 Merge "Fix for IOOB in SearchView" into jb-dev 2012-05-25 12:43:39 -07:00
Jean-Baptiste Queru
ad4514d2d2 am b5ac97c5: am 735470d2: (-s ours) am 23cad6eb: Merge "stagefright aacenc: Fix reading out of bounds in pow2_xy" 
* commit 'b5ac97c5a87fda7b5a1906ca92585c048aef5053':
  stagefright aacenc: Fix reading out of bounds in pow2_xy
 2012-05-25 12:31:18 -07:00
Jean-Baptiste Queru
b5ac97c5a8 am 735470d2: (-s ours) am 23cad6eb: Merge "stagefright aacenc: Fix reading out of bounds in pow2_xy" 
* commit '735470d202cd42fe8b65f0fb0d6c38aff2be967e':
  stagefright aacenc: Fix reading out of bounds in pow2_xy
 2012-05-25 12:27:05 -07:00
Romain Guy
8900e63194 Tale of status bar on crespo, part 3 
Bug #6541079

The vanished shall not be forgotten.

Change-Id: If01a53d8c203ef82e54d0b440063a8dbebe7b14a
 2012-05-25 12:08:39 -07:00