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

68739 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Glenn Kasten
67cb3126e8 threadLoop merge 
Change-Id: Id8e6330ac6be76f9c2debba94f856de87e2d98f7
 2012-03-05 11:01:10 -08:00
Robert Ly
0bf89b3052 am 4c7992e9: am d559bc79: am e5e11fd6: Merge "docs: fixing bug 5942573" into ics-mr1 
* commit '4c7992e9d2fc0c73c938cd3d06da27fc6a3efe00':
 2012-03-02 09:14:33 -08:00
Robert Ly
861d5ecc7c am b962b98b: am 67a15457: am e5e11fd6: Merge "docs: fixing bug 5942573" into ics-mr1 
* commit 'b962b98bef33eba634aec41cf9d84527ce9db3bb':
  docs: fixing bug 5942573
 2012-03-02 09:11:54 -08:00
Robert Ly
4c7992e9d2 am d559bc79: am e5e11fd6: Merge "docs: fixing bug 5942573" into ics-mr1 
* commit 'd559bc79d546f1b448cc43851de5f43babc81795':
 2012-03-02 09:10:22 -08:00
Robert Ly
b962b98bef am 67a15457: am e5e11fd6: Merge "docs: fixing bug 5942573" into ics-mr1 
* commit '67a15457d184f01fffe162a0983d0b507cb7b358':
  docs: fixing bug 5942573
 2012-03-02 09:09:30 -08:00
Robert Ly
d559bc79d5 am e5e11fd6: Merge "docs: fixing bug 5942573" into ics-mr1 
* commit 'e5e11fd666d242b099466017c6d9bd23e6d2896d':
  docs: fixing bug 5942573
 2012-03-02 09:06:44 -08:00
Robert Ly
67a15457d1 am e5e11fd6: Merge "docs: fixing bug 5942573" into ics-mr1 
* commit 'e5e11fd666d242b099466017c6d9bd23e6d2896d':
  docs: fixing bug 5942573
 2012-03-02 09:06:44 -08:00
Robert Ly
e5e11fd666 Merge "docs: fixing bug 5942573" into ics-mr1 2012-03-02 09:04:16 -08:00
George Mount
062d6d51f2 Merge "Quick fix for Monkey NPE." 2012-03-02 08:43:43 -08:00
Dianne Hackborn
6c9e5d4129 am d4202c9d: am 921e8303: am 0dd9ec14: Merge "Make ResolverActivity update dynamically." into ics-mr1 
* commit 'd4202c9d138459a60fde708ecda995f3b599d252':
 2012-03-02 08:42:22 -08:00
Dianne Hackborn
817d5fb864 am 5d87d51f: am f65951bf: am 0dd9ec14: Merge "Make ResolverActivity update dynamically." into ics-mr1 
* commit '5d87d51fab7e17793413c9095028963117e276b8':
  Make ResolverActivity update dynamically.
 2012-03-02 08:39:39 -08:00
Dianne Hackborn
d4202c9d13 am 921e8303: am 0dd9ec14: Merge "Make ResolverActivity update dynamically." into ics-mr1 
* commit '921e83039d266b6d288fd5e09160d878eccb9e23':
 2012-03-02 08:37:48 -08:00
Dianne Hackborn
5d87d51fab am f65951bf: am 0dd9ec14: Merge "Make ResolverActivity update dynamically." into ics-mr1 
* commit 'f65951bf5db7a248651cbfa89886d773f95c3e03':
  Make ResolverActivity update dynamically.
 2012-03-02 08:36:05 -08:00
Dianne Hackborn
f65951bf5d am 0dd9ec14: Merge "Make ResolverActivity update dynamically." into ics-mr1 
* commit '0dd9ec144b0da8df9d8900d78c8177e761de458d':
  Make ResolverActivity update dynamically.
 2012-03-02 08:33:22 -08:00
Dianne Hackborn
921e83039d am 0dd9ec14: Merge "Make ResolverActivity update dynamically." into ics-mr1 
* commit '0dd9ec144b0da8df9d8900d78c8177e761de458d':
  Make ResolverActivity update dynamically.
 2012-03-02 08:33:21 -08:00
Dianne Hackborn
0dd9ec144b Merge "Make ResolverActivity update dynamically." into ics-mr1 2012-03-02 08:30:36 -08:00
George Mount
9a676bfb5f Quick fix for Monkey NPE. 
Bug 6097462
 If paste window is shown before the insert thumb, an NPE
 would be thrown. This will be fixed fully later when the paste
 window is showing up only at the proper times rather than every
 time the insert thumb is shown.

Change-Id: I91eec7c28fc64a2274f5c3cd36784fedcae055ca
 2012-03-02 07:40:38 -08:00
Jonathan Dixon
3c90952036 Refactor WebView to be a thin proxy class 
Splits interface and implementation; all client calls are forwarded
to an abstract WebViewProvider interface, and the existing implementation
moved into the WebViewClassic implementor of this interface.

Originally taken from a snapshot from the development branch, by:
git diff HEAD 9a4c328a54cc05e5 | git apply
- but then rebased to keep up to date with master

Interdepends on webkit and Browser changes:
https://android-git.corp.google.com/g/158979
https://android-git.corp.google.com/g/167911

Change-Id: I91403f32654ff308934e95c832d17b292a7d9b2e
 2012-03-02 11:17:47 +00:00
Jonathan Dixon
0dc0da67d9 change WebView to remove use of base class fields 
This is done as its own step to make follow up patches easier on the eye.
(mostly implemented with eclipse refactor magic)

Change-Id: I23a9c1cbc5bba9a492e7e2ef1ddd275d84bec057
 2012-03-02 11:15:24 +00:00
Jonathan Dixon
ded37ed9a5 Add new WebViewClassic files 
Done as its own step, to make the subsequent diff easier on the eye

Change-Id: Ib81eba5c7c26f2e0c9a60792bb0f7cd10e4c78bc
 2012-03-02 11:15:14 +00:00
Adam Powell
6435da6119 am d9760a81: am 25517fdc: am 637c50db: am c7e5a2fe: Merge "Fix dividers for LinearLayout (TabWidget)" 
* commit 'd9760a813e99670c5bdb05c95ae3bafb58abf897':
  Fix dividers for LinearLayout (TabWidget)
 2012-03-01 23:57:10 -08:00
Adam Powell
d9760a813e am 25517fdc: am 637c50db: am c7e5a2fe: Merge "Fix dividers for LinearLayout (TabWidget)" 
* commit '25517fdc53018ef676a1d340e2d5cbd780e5dc8b':
  Fix dividers for LinearLayout (TabWidget)
 2012-03-01 22:52:39 -08:00
Adam Powell
25517fdc53 am 637c50db: am c7e5a2fe: Merge "Fix dividers for LinearLayout (TabWidget)" 
* commit '637c50db476d9a6cec13551920f7c163fef02ab8':
  Fix dividers for LinearLayout (TabWidget)
 2012-03-01 22:49:46 -08:00
Adam Powell
637c50db47 am c7e5a2fe: Merge "Fix dividers for LinearLayout (TabWidget)" 
* commit 'c7e5a2fe3042014f78667228a92e41d0a19547fd':
  Fix dividers for LinearLayout (TabWidget)
 2012-03-01 22:46:26 -08:00
Mathias Agopian
7e5f1e8dc0 Merge "add more tracing for buffer allocation" 2012-03-01 21:22:35 -08:00
Mathias Agopian
a4ca78292c Merge "add more ATRACE" 2012-03-01 21:22:25 -08:00
Mathias Agopian
a362c769d4 add more ATRACE 
Change-Id: I6cc5759fb0a05427680488fd12ae797e77644f3d
 2012-03-01 20:16:39 -08:00
Craig Mautner
f8acebe4a5 Merge "Separate animation steps into start, step and finish phases. Fixes bug 6089126." 2012-03-01 19:29:46 -08:00
Dianne Hackborn
38addbe3ab Merge "Whoops forgot this change." 2012-03-01 19:21:40 -08:00
Dianne Hackborn
b132506e6e Merge "Fix issue where pm would clear preferred apps when updating an app." 2012-03-01 19:21:22 -08:00
Dianne Hackborn
e8f2c7ff5a Make ResolverActivity update dynamically. 
Watches for package changes so it can dynamically adjust
to reflect the actual list of available activities.

Change-Id: I3a2fef3dac4d13d1b2a7ed6fc117a7b814679669
 2012-03-01 19:14:36 -08:00
Craig Mautner
dbb7991b4e Separate animation steps into start, step and finish phases. 
Fixes bug 6089126.

Change-Id: Iafbde36ff719640335a7ecf762e1d991cf7915e4
 2012-03-01 19:06:07 -08:00
Jim Miller
14700016e9 Merge "Fix 6028595: Fix reboot loop in AccountUnlock due to null callback" 2012-03-01 19:02:19 -08:00
Fabrice Di Meglio
3fd29d908a Unhide BiDiTests app 
- unhide its makefile so that now it is part of the standard build process

Change-Id: Ied86c252975e30da8e3e75180869835f00a5969d
 2012-03-01 18:15:25 -08:00
Fabrice Di Meglio
7d3c690e72 Merge "Improve RTL APIs" 2012-03-01 17:44:19 -08:00
Romain Guy
2900116e85 Merge "Remove stray log" 2012-03-01 17:35:25 -08:00
Fabrice Di Meglio
dd3ef2c573 Improve RTL APIs 
- follow changed / reset pattern

Change-Id: I1c5e9b39196029bd78add2ab13b984da124822ca
 2012-03-01 17:34:56 -08:00
Romain Guy
ad1daaa87b Remove stray log 
Change-Id: I0c1979aab395098651c8a63d0bae0198ebc3746b
 2012-03-01 17:33:42 -08:00
Tsu Chiang Chuang
ddb9d0bedf am 8f0c03b7: am 673a66e3: am 3e701270: Merge "extend timeout to allow for more time for the device to connect." into ics-mr1 
* commit '8f0c03b7833c719c29198be0e4fecbdfb4013e64':
 2012-03-01 17:15:32 -08:00
Tsu Chiang Chuang
756fe38d08 am 6053b195: am bb69bde5: am 3e701270: Merge "extend timeout to allow for more time for the device to connect." into ics-mr1 
* commit '6053b195bcd49676b46b2257f6e1da04d0b4d9a5':
  extend timeout to allow for more time for the device to connect.
 2012-03-01 17:12:55 -08:00
Tsu Chiang Chuang
8f0c03b783 am 673a66e3: am 3e701270: Merge "extend timeout to allow for more time for the device to connect." into ics-mr1 
* commit '673a66e357f49f939cf8e7f603ff14b8474c9032':
 2012-03-01 17:11:22 -08:00
Tsu Chiang Chuang
6053b195bc am bb69bde5: am 3e701270: Merge "extend timeout to allow for more time for the device to connect." into ics-mr1 
* commit 'bb69bde593bc0ba58c744b19c43619d4eb0866b7':
  extend timeout to allow for more time for the device to connect.
 2012-03-01 17:10:23 -08:00
Tsu Chiang Chuang
673a66e357 am 3e701270: Merge "extend timeout to allow for more time for the device to connect." into ics-mr1 
* commit '3e70127021f5d5940edfdefd7e33fd65d4ec0449':
  extend timeout to allow for more time for the device to connect.
 2012-03-01 17:07:43 -08:00
Tsu Chiang Chuang
bb69bde593 am 3e701270: Merge "extend timeout to allow for more time for the device to connect." into ics-mr1 
* commit '3e70127021f5d5940edfdefd7e33fd65d4ec0449':
  extend timeout to allow for more time for the device to connect.
 2012-03-01 17:07:25 -08:00
Tsu Chiang Chuang
3e70127021 Merge "extend timeout to allow for more time for the device to connect." into ics-mr1 2012-03-01 17:05:43 -08:00
Wink Saville
7eed139cdf Merge "Telephony: Remove SimCard and RuimCard" 2012-03-01 17:03:47 -08:00
Robert Ly
f64a6d5346 am 37f9360a: am 3c78e101: am 941ff38d: Merge "fix bug 5942522" into ics-mr1 
* commit '37f9360a21985b2627d7069160d2950edf31c021':
 2012-03-01 16:47:06 -08:00
Robert Ly
dea05e9010 am ca7d7541: am d70eaff4: am 941ff38d: Merge "fix bug 5942522" into ics-mr1 
* commit 'ca7d7541c4cad188eb643113e3c3e91e63d21a5e':
  fix bug 5942522
 2012-03-01 16:47:04 -08:00
Robert Ly
f183dda0ad am a2310712: am 9d36dcc0: am dcc910ea: Merge "docs: fix bug 5878445" into ics-mr1 
* commit 'a231071249f03f7b10e1991c9988476d2b15a9f7':
 2012-03-01 16:46:58 -08:00
Robert Ly
24ed1b2fb5 am b4afb9a8: am 8125b0b4: am dcc910ea: Merge "docs: fix bug 5878445" into ics-mr1 
* commit 'b4afb9a89e1a2131ac273f0452fa89b83090b05a':
  docs: fix bug 5878445
 2012-03-01 16:46:55 -08:00