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

49164 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Irfan Sheriff
5e4d020648 am b400184a: Merge "Handle AsyncChannel disconnect in WifiService" into honeycomb-LTE 
* commit 'b400184ad6277676048a30b042ed0667de662ad8':
  Handle AsyncChannel disconnect in WifiService
 2011-06-06 20:34:35 -07:00
Jeff Brown
c3709f2509 am 277bfd7c: am c1830a77: Merge "Improve browser scrolling when using the mouse wheel." into honeycomb-mr2 
* commit '277bfd7cdd889e4f59e57925b90d1899f7312c4e':
  Improve browser scrolling when using the mouse wheel.
 2011-06-06 20:32:02 -07:00
Irfan Sheriff
b400184ad6 Merge "Handle AsyncChannel disconnect in WifiService" into honeycomb-LTE 2011-06-06 20:31:55 -07:00
Jeff Brown
277bfd7cdd am c1830a77: Merge "Improve browser scrolling when using the mouse wheel." into honeycomb-mr2 
* commit 'c1830a77a7fe0f1ccd52f405cb076d40fe085e2f':
  Improve browser scrolling when using the mouse wheel.
 2011-06-06 20:29:08 -07:00
Jeff Brown
c1830a77a7 Merge "Improve browser scrolling when using the mouse wheel." into honeycomb-mr2 2011-06-06 20:27:28 -07:00
Jeff Brown
7f5b99676f Improve browser scrolling when using the mouse wheel. 
The way that smooth scrolling is implemented in the Browser,
repeated requests to scroll by a certain amount do not add up
to one large scroll by the cumulative amount.  This makes
the mouse wheel unusable on large pages because the Browser
will scroll at a more or less constant rate no matter how often
the wheel is turned.

The fix is to not animate scrolls when using the mouse wheel.

Change-Id: I23c05cdd2383944b8730deb225b7f3f57f1729df
 2011-06-06 18:59:41 -07:00
Dianne Hackborn
4bd505883d am fc3fa5dc: am 1b405592: Merge "Fix issue #4539687: At least one compatibility-mode app (Androminion)..." into honeycomb-mr2 
* commit 'fc3fa5dc1045a8f25fc1982443e05873edf028df':
  Fix issue #4539687: At least one compatibility-mode app (Androminion)...
 2011-06-06 18:18:34 -07:00
Xavier Ducrohet
abc8387168 am f6e47999: am 2a6dc7f1: Merge "Import the Layoutlib from hc-mr1." into honeycomb-mr2 
* commit 'f6e479993e7c85265692829990ceb3879fbce424':
  Import the Layoutlib from hc-mr1.
 2011-06-06 18:11:33 -07:00
Dianne Hackborn
fc3fa5dc10 am 1b405592: Merge "Fix issue #4539687: At least one compatibility-mode app (Androminion)..." into honeycomb-mr2 
* commit '1b405592550c719aa5dd93178705ae08b4e84a2f':
  Fix issue #4539687: At least one compatibility-mode app (Androminion)...
 2011-06-06 17:33:59 -07:00
Dianne Hackborn
1b40559255 Merge "Fix issue #4539687: At least one compatibility-mode app (Androminion)..." into honeycomb-mr2 2011-06-06 17:30:50 -07:00
Dianne Hackborn
bc7386c261 Fix issue #4539687: At least one compatibility-mode app (Androminion)... 
...will only launch when held in portrait mode.

There was a bug in the window manager that caused all of the careful code to
update the configuration in sync with movements between activities to break.
Now it is fixed, so this app works, and we no longer see the bad slow orientation
changes when switching between activities that want to be in different
orientations.

Change-Id: I5d93f99649849bdaca2e8bebade6b91b8b6cf645
 2011-06-06 17:29:10 -07:00
Xavier Ducrohet
f6e479993e am 2a6dc7f1: Merge "Import the Layoutlib from hc-mr1." into honeycomb-mr2 
* commit '2a6dc7f19d463c7c9f7aacd12eca5263afd25a90':
  Import the Layoutlib from hc-mr1.
 2011-06-06 16:20:16 -07:00
Xavier Ducrohet
2a6dc7f19d Merge "Import the Layoutlib from hc-mr1." into honeycomb-mr2 2011-06-06 16:17:44 -07:00
Mathias Agopian
cf3036ebef am c1cbf452: am 24855c09: merge various SF fixes from gingerbread to honeycomb-mr2 (DO NOT MERGE) 
* commit 'c1cbf4525b4d12b6cb7908072d36c8f6ca819f5b':
  merge various SF fixes from gingerbread to honeycomb-mr2 (DO NOT MERGE)
 2011-06-06 15:25:32 -07:00
Mathias Agopian
c1cbf4525b am 24855c09: merge various SF fixes from gingerbread to honeycomb-mr2 (DO NOT MERGE) 
* commit '24855c09173a6caaec7dcedd0c2d7ce15121d39b':
  merge various SF fixes from gingerbread to honeycomb-mr2 (DO NOT MERGE)
 2011-06-06 15:21:44 -07:00
Irfan Sheriff
6da83d5868 Handle AsyncChannel disconnect in WifiService 
Backport change I928544a0 to LTE branch and also handle
disconnect on WifiStateMachine channel

Bug: 4473750
Change-Id: I556330c10243a1805555f6bf6dcc7e43b78e3bfd
 2011-06-06 15:17:58 -07:00
Mathias Agopian
24855c0917 merge various SF fixes from gingerbread to honeycomb-mr2 (DO NOT MERGE) 
Fix a race that could cause GL commands to be executed from the wrong thread.
  RefBase subclasses can now decide how they want to be destroyed.
  Fix a race in SurfaceFlinger that could cause layers to be leaked forever.
  Fix a race-condtion in SurfaceFlinger that could lead to a crash.

initial cherry-pick:
resolved conflicts for merge of b9783b49 to honeycomb-plus-aosp

Change-Id: I2a335e03fff219e35c18a7b0089b3a11d636576f
 2011-06-06 15:14:25 -07:00
Nick Pelly
92279c0fa1 Merge branch 'honeycomb-plus-aosp' of ssh://android-git:29418/platform/frameworks/base into honeycomb-plus-aosp 2011-06-06 11:52:21 -07:00
TK MUN
51704fc9c2 am cecb710a: am 94260caf: Allow control over search order for tethering upstream interface selection 
* commit 'cecb710a6de249a3847da2f07464a1aecf9459ac':
  Allow control over search order for tethering upstream interface selection
 2011-06-06 11:51:22 -07:00
Eric Fischer
e34ed24f4d am e9d32283: am b16b020d: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2 
* commit 'e9d32283e4eca1ee27218ed66f754a694678ac6d':
  Import revised translations.  DO NOT MERGE
 2011-06-06 11:50:16 -07:00
Jaikumar Ganesh
5aaed0970b am 58ada2f3: am 94062517: Merge "Require bonding and encryption for PBAP server" 
* commit '58ada2f3bbab749fb5a813fb8f82eee347080405':
  Require bonding and encryption for PBAP server
 2011-06-06 11:34:11 -07:00
Jean-Baptiste Queru
59242cf65e am 54ab72e1: am 038e8f99: Merge "Adding support for parsing of SMS-CB pdus in UMTS format." 
* commit '54ab72e1c389905adb074bd7c799a33b4f513679':
  Adding support for parsing of SMS-CB pdus in UMTS format.
 2011-06-06 11:33:52 -07:00
Eric Fischer
e9d32283e4 am b16b020d: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2 
* commit 'b16b020dd32147fbaaf7de47d5de16bfee10967a':
  Import revised translations.  DO NOT MERGE
 2011-06-06 10:54:41 -07:00
Eric Fischer
b16b020dd3 Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2 2011-06-06 10:38:42 -07:00
Marco Nelissen
b2fd84ad1d resolved conflicts for merge of b9783b49 to honeycomb-plus-aosp 
Change-Id: I1d86ea56b3d1d1b69f6671e5b0df0ca3f0c79643
 2011-06-06 09:55:15 -07:00
Wink Saville
fc51aaec82 am 6ff5ba00: Merge "Add FileUtils.checksumCrc32" into honeycomb-LTE 
* commit '6ff5ba00b07b32f3c82bce2c412e5e8f30c202bc':
  Add FileUtils.checksumCrc32
 2011-06-04 06:24:40 -07:00
Wink Saville
6ff5ba00b0 Merge "Add FileUtils.checksumCrc32" into honeycomb-LTE 2011-06-04 06:15:21 -07:00
Xavier Ducrohet
fb93ce9684 Import the Layoutlib from hc-mr1. 
This is squash commit of all the missing patches.

Change-Id: Ie081c46a173290646deddbde503a720d50c4400f
 2011-06-03 19:38:14 -07:00
Dianne Hackborn
7e5ca5781b am b4815f47: am bd754205: Merge "Fix to not lose state when saving a deactivated fragment." into honeycomb-mr2 
* commit 'b4815f47e6d612da6e2d0650a2d8f103626e3ec7':
  Fix to not lose state when saving a deactivated fragment.
 2011-06-03 17:57:33 -07:00
Dianne Hackborn
b4815f47e6 am bd754205: Merge "Fix to not lose state when saving a deactivated fragment." into honeycomb-mr2 
* commit 'bd754205d0b59315582855329649dad925a04b82':
  Fix to not lose state when saving a deactivated fragment.
 2011-06-03 17:54:28 -07:00
Dianne Hackborn
bd754205d0 Merge "Fix to not lose state when saving a deactivated fragment." into honeycomb-mr2 2011-06-03 17:52:23 -07:00
Roman Nurik
16475a3a40 am 07613835: am e7d60078: Add old blog posts as articles, batch 1 
* commit '076138357027189f1bb90caf8c2e1a09497d78ac':
  Add old blog posts as articles, batch 1
 2011-06-03 17:40:11 -07:00
Dianne Hackborn
1333276c7a Fix to not lose state when saving a deactivated fragment. 
Also deactivating a fragment shouldn't put it in the exiting state.

Change-Id: I514f3589ee7bbbee131cd7b4a48803e99b212bd0
 2011-06-03 17:34:45 -07:00
Roman Nurik
0761383570 am e7d60078: Add old blog posts as articles, batch 1 
* commit 'e7d6007872af7f27b62bfb46aadf2b7a07c0eac0':
  Add old blog posts as articles, batch 1
 2011-06-03 17:27:03 -07:00
Eric Fischer
b5c6212de1 Import revised translations. DO NOT MERGE 
Change-Id: I4bfd9ec60da3b224c71406851f0a7f8bbf0c1120
 2011-06-03 17:24:55 -07:00
Wink Saville
6d25a990af Add FileUtils.checksumCrc32 
Change-Id: Ic6bffcb66554d7af38cea68648d9431fda8ef10d
 2011-06-03 17:03:51 -07:00
Roman Nurik
e7d6007872 Add old blog posts as articles, batch 1 
Change-Id: Ibe1bcf1ceef2eb1a1b4bc0c1b2451ed69838ee3a
 2011-06-03 16:45:00 -07:00
Dianne Hackborn
e826feb66c am dddd6b15: am 185e3e24: Fix when managed cursors are required. 
* commit 'dddd6b15d5274a6138facec9f553336fac5f6de6':
  Fix when managed cursors are required.
 2011-06-03 16:27:36 -07:00
Dianne Hackborn
dddd6b15d5 am 185e3e24: Fix when managed cursors are required. 
* commit '185e3e243ee1da136bcace854026b8abaf0c4c86':
  Fix when managed cursors are required.
 2011-06-03 16:23:15 -07:00
Robert Greenwalt
89c1eb8edc am 80a19e67: Merge "Promote Telephony\'s isDataPossible." into honeycomb-LTE 
* commit '80a19e67d1cd3710dbbfa52767a994512d20f694':
  Promote Telephony's isDataPossible.
 2011-06-03 15:46:08 -07:00
Robert Greenwalt
80a19e67d1 Merge "Promote Telephony's isDataPossible." into honeycomb-LTE 2011-06-03 15:42:48 -07:00
Dianne Hackborn
185e3e243e Fix when managed cursors are required. 
Only do this when we are actually restarting, not when we
are just resuming after a pause.

Change-Id: I32fd263917b03776efca8e096d0343107721398d
 2011-06-03 15:26:40 -07:00
John Wang
0b1923ce51 am 3b71239a: Merge "Add supplyPuk to do SIM puk unlock." into honeycomb-LTE 
* commit '3b71239aca01fb029d9acd2c606b7be9b8f32d66':
  Add supplyPuk to do SIM puk unlock.
 2011-06-03 14:09:13 -07:00
John Wang
3b71239aca Merge "Add supplyPuk to do SIM puk unlock." into honeycomb-LTE 2011-06-03 14:01:59 -07:00
Kazuhiro Ondo
76273dd16d am 77c94113: Data recovery failure due to apn/dc state stuck in "disconnecting" 
* commit '77c9411306b6b3d210d22214d596272c9728cf5e':
  Data recovery failure due to apn/dc state stuck in "disconnecting"
 2011-06-03 12:19:23 -07:00
Kazuhiro Ondo
77c9411306 Data recovery failure due to apn/dc state stuck in "disconnecting" 
If rild is reset while RIL_DEACTIVATE_DATA_CALL is pending
response, the ApnContext is not force cleaned up since
link to DCAC is cleared in the begining of release.

This patch fixes:
1) Hold DCAC reference until the DC is disconnected. This is
   to ensure DC won't be stuck in DcDisconnectingState so force
   reset can kick in.
2) In "clearCleanUpConnection", make sure the status of ApnContext
   can be reset to IDLE even if no reference to DCAC.

Change-Id: Ic69271da7c6bc9dcb2c38ec53a9bd2e8ce785adc
 2011-06-03 11:42:48 -07:00
Daniel Sandler
58f48edd21 am f5699b82: am b4b44bd3: DO NOT MERGE. Restore status bar on phones. 
* commit 'f5699b82adef34b0b6bd88554c6a017f8662985e':
  DO NOT MERGE. Restore status bar on phones.
 2011-06-03 11:26:17 -07:00
Daniel Sandler
f5699b82ad am b4b44bd3: DO NOT MERGE. Restore status bar on phones. 
* commit 'b4b44bd32983e154f2ad61b99809ed6cedd46d47':
  DO NOT MERGE. Restore status bar on phones.
 2011-06-03 11:22:49 -07:00
Daniel Sandler
b4b44bd329 DO NOT MERGE. Restore status bar on phones. 
Bug: 4529373
Change-Id: Ie08522dbf762e80ac077ce403ff83312cec907f7
 2011-06-03 11:11:10 -07:00
Gilles Debunne
955e8d79b1 am 00afa11c: am 0538e621: Merge "Tap timeout removed on paste. Relying on position only." into honeycomb-mr2 
* commit '00afa11c1565da7ad6721db08a4da7c2ec1eacc0':
  Tap timeout removed on paste. Relying on position only.
 2011-06-03 10:35:58 -07:00