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

50381 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jason Sams
edbfabdb98 Core to client fifo on sockets. 
Change-Id: I3b84a7d4c3c5fa0d764ad4db22dfd142d5cfa95b
 2011-05-17 15:01:29 -07:00
Dianne Hackborn
dffa4761c8 am 60e13114: (-s ours) am 1d340a3c: am 0eac0927: Merge "DO NOT MERGE. From main -- Start work on simulating landscape/portrait when orientation is locked." into honeycomb-mr2 
* commit '60e13114eb806d50b7b362d39051c5c775704bf6':
  DO NOT MERGE.  From main -- Start work on simulating landscape/portrait when orientation is locked.
 2011-05-16 13:18:54 -07:00
Dianne Hackborn
60e13114eb am 1d340a3c: am 0eac0927: Merge "DO NOT MERGE. From main -- Start work on simulating landscape/portrait when orientation is locked." into honeycomb-mr2 
* commit '1d340a3c24913d8750900355cd92ef5742eea11f':
  DO NOT MERGE.  From main -- Start work on simulating landscape/portrait when orientation is locked.
 2011-05-16 13:16:45 -07:00
Dianne Hackborn
1d340a3c24 am 0eac0927: Merge "DO NOT MERGE. From main -- Start work on simulating landscape/portrait when orientation is locked." into honeycomb-mr2 
* commit '0eac092766d7871b34927442ee0b6e27e7e1317b':
  DO NOT MERGE.  From main -- Start work on simulating landscape/portrait when orientation is locked.
 2011-05-16 13:13:00 -07:00
Dianne Hackborn
e5eb6a9e01 am 63446167: (-s ours) am fddd927f: am 9d0f2c6d: Merge "DO NOT MERGE: From master -- Fix bug in deciding which rotation to use for an orientation." into honeycomb-mr2 
* commit '63446167b9d6d9ed3410320d17e8fe816caf6c42':
  DO NOT MERGE: From master -- Fix bug in deciding which rotation to use for an orientation.
 2011-05-16 13:11:27 -07:00
Dianne Hackborn
b0acb1e890 am f97ed771: (-s ours) am d90a2c4d: am 1e662c32: Merge "DO NOT MERGE. Integrate from master: Rework display size access." into honeycomb-mr2 
* commit 'f97ed771979162c4a2a75959c57fb793438a3a8b':
  DO NOT MERGE.  Integrate from master: Rework display size access.
 2011-05-16 13:11:24 -07:00
Dianne Hackborn
0eac092766 Merge "DO NOT MERGE. From main -- Start work on simulating landscape/portrait when orientation is locked." into honeycomb-mr2 2011-05-16 13:10:23 -07:00
Mike Lockwood
e6f3f54e05 resolved conflicts for merge of b107f4de to master 
Change-Id: I0290c8517562bcbba7ac1f6ed358011c8e7e250e
 2011-05-16 16:08:12 -04:00
Dianne Hackborn
68066c2f38 DO NOT MERGE. From main -- Start work on simulating landscape/portrait when orientation is locked. 
Not yet working, so turned off.

Also fix a bug where the display size configuration became inconsistent
after a configuration change -- we now figure out everything about the
display size when computing a new configuration.

Change-Id: Id155f133c0bf108508a225ef64ed3ca398a90a58
 2011-05-16 13:08:07 -07:00
Dianne Hackborn
63446167b9 am fddd927f: am 9d0f2c6d: Merge "DO NOT MERGE: From master -- Fix bug in deciding which rotation to use for an orientation." into honeycomb-mr2 
* commit 'fddd927fb78bb206287203f4f447a416b525115a':
  DO NOT MERGE: From master -- Fix bug in deciding which rotation to use for an orientation.
 2011-05-16 13:04:49 -07:00
Wink Saville
c6aa9e8cc2 am 2ead69e1: am fe5b5d37: Merge "Implement incremental data stall recovery in GSM DCT" into honeycomb-LTE 
* commit '2ead69e11631b9bc2b12fe0cd8dbd27155559276':
  Implement incremental data stall recovery in GSM DCT
 2011-05-16 13:03:21 -07:00
Dianne Hackborn
fddd927fb7 am 9d0f2c6d: Merge "DO NOT MERGE: From master -- Fix bug in deciding which rotation to use for an orientation." into honeycomb-mr2 
* commit '9d0f2c6d970a1d2c7f9de5c9e89737d7772f95d3':
  DO NOT MERGE: From master -- Fix bug in deciding which rotation to use for an orientation.
 2011-05-16 13:02:57 -07:00
Dianne Hackborn
f97ed77197 am d90a2c4d: am 1e662c32: Merge "DO NOT MERGE. Integrate from master: Rework display size access." into honeycomb-mr2 
* commit 'd90a2c4d4463085155444efb07eba2d6579b444a':
  DO NOT MERGE.  Integrate from master: Rework display size access.
 2011-05-16 13:01:38 -07:00
Dianne Hackborn
9d0f2c6d97 Merge "DO NOT MERGE: From master -- Fix bug in deciding which rotation to use for an orientation." into honeycomb-mr2 2011-05-16 13:01:07 -07:00
Dianne Hackborn
29735689ce DO NOT MERGE: From master -- Fix bug in deciding which rotation to use for an orientation. 
Change-Id: Ie271123271a662f3f753f381ce4c43ad7904dc4a
 2011-05-16 12:57:38 -07:00
Dianne Hackborn
d90a2c4d44 am 1e662c32: Merge "DO NOT MERGE. Integrate from master: Rework display size access." into honeycomb-mr2 
* commit '1e662c3294b740ff694ad98e4d9a366e1e4b5e62':
  DO NOT MERGE.  Integrate from master: Rework display size access.
 2011-05-16 12:57:00 -07:00
Dianne Hackborn
1e662c3294 Merge "DO NOT MERGE. Integrate from master: Rework display size access." into honeycomb-mr2 2011-05-16 12:54:22 -07:00
Mike Lockwood
8fa5b03c1b resolved conflicts for merge of fc4a3d37 to master 
Change-Id: I40f603ba9330c3e882f4d58398095f4094725b21
 2011-05-16 15:49:53 -04:00
Mike Lockwood
b107f4dec3 am e23639e0: am 15afd076: Merge "MTP: Have GetStorageInfo command return correct storage type for removable storage" into honeycomb-mr2 
* commit 'e23639e0386735df50ad208078f638c38f662d42':
  MTP: Have GetStorageInfo command return correct storage type for removable storage
 2011-05-16 12:41:25 -07:00
Wink Saville
2ead69e116 am fe5b5d37: Merge "Implement incremental data stall recovery in GSM DCT" into honeycomb-LTE 
* commit 'fe5b5d3700a5c67b5e8fcee324efe0fa24c4622c':
  Implement incremental data stall recovery in GSM DCT
 2011-05-16 12:41:16 -07:00
Mike Lockwood
fc4a3d37ef am b822d246: am 0a93d875: Merge "StorageManager: Clean up and generalize storage configuration resources" into honeycomb-mr2 
* commit 'b822d2464dc59056f736b0c49f0ac514c7cbb9d9':
  StorageManager:  Clean up and generalize storage configuration resources
 2011-05-16 12:38:36 -07:00
Mike Lockwood
e23639e038 am 15afd076: Merge "MTP: Have GetStorageInfo command return correct storage type for removable storage" into honeycomb-mr2 
* commit '15afd076d6070374cbb4f9dcbe28dda67caa0718':
  MTP: Have GetStorageInfo command return correct storage type for removable storage
 2011-05-16 12:38:18 -07:00
Wink Saville
fe5b5d3700 Merge "Implement incremental data stall recovery in GSM DCT" into honeycomb-LTE 2011-05-16 12:37:55 -07:00
Robert Ly
4cfa909c6d am 0c5ae3fc: am 1f2a335f: am 79d3f630: am 904f4810: doc change: added link to diydrones and a few small changes 
* commit '0c5ae3fc8892a06e3dd5192d24f0b46bb59c769b':
  doc change: added link to diydrones and a few small changes
 2011-05-16 12:37:46 -07:00
Mike Lockwood
b822d2464d am 0a93d875: Merge "StorageManager: Clean up and generalize storage configuration resources" into honeycomb-mr2 
* commit '0a93d875527c52183080b63a0b19d567856952af':
  StorageManager:  Clean up and generalize storage configuration resources
 2011-05-16 12:36:29 -07:00
Mike Lockwood
15afd076d6 Merge "MTP: Have GetStorageInfo command return correct storage type for removable storage" into honeycomb-mr2 2011-05-16 12:34:35 -07:00
Robert Ly
0c5ae3fc88 am 1f2a335f: am 79d3f630: am 904f4810: doc change: added link to diydrones and a few small changes 
* commit '1f2a335f98503bab178d1d868a9cba0451481b7d':
  doc change: added link to diydrones and a few small changes
 2011-05-16 12:34:26 -07:00
Mike Lockwood
0a93d87552 Merge "StorageManager: Clean up and generalize storage configuration resources" into honeycomb-mr2 2011-05-16 12:34:02 -07:00
Robert Ly
1f2a335f98 am 79d3f630: am 904f4810: doc change: added link to diydrones and a few small changes 
* commit '79d3f6305fc7dda68faf674e1c500f97cc4dd570':
  doc change: added link to diydrones and a few small changes
 2011-05-16 12:31:48 -07:00
Robert Ly
79d3f6305f am 904f4810: doc change: added link to diydrones and a few small changes 
* commit '904f48107e2843a1e255872afac8ddf8e9513ca4':
  doc change: added link to diydrones and a few small changes
 2011-05-16 12:29:17 -07:00
Robert Ly
904f48107e doc change: added link to diydrones and a few small changes 
Change-Id: I4ca757f3dfb60f442c34cfbb4e7145eacb42b395
 2011-05-16 12:19:24 -07:00
Dianne Hackborn
ac8dea12c1 DO NOT MERGE. Integrate from master: Rework display size access. 
Applications now get the display size from the window manager.  No
behavior should be changed yet, this is just prep for some real
changes.

Change-Id: I47bf8b55ecd4476c25ed6482494a7bcc5fae45d2
 2011-05-16 11:58:27 -07:00
Romain Guy
51d6eb7dcf Fix crash when using a SimpleCursorAdapter initialized with a null Cursor. 
Change-Id: Ia7d078db8ab941c830663e6af7cbb07d7bad24a8
 2011-05-16 11:55:08 -07:00
Romain Guy
0c0b768e15 Fix NPE when calling PopupWindow's default constructor. 
Change-Id: I5317b052236d758fd3b9055c9940fbb10ec7b123
 2011-05-16 11:54:09 -07:00
Romain Guy
02739a8eec Fix javadoc issues 
Change-Id: Ife66a8664955ac1a79b6ffd0080000c820f24632
 2011-05-16 11:53:31 -07:00
Kazuhiro Ondo
47e326c8ac Implement incremental data stall recovery in GSM DCT 
Change-Id: Ibc43845c618fd1bf0b5a697568ba475e78e9d58e
 2011-05-16 11:43:01 -07:00
Mike Lockwood
51690544aa MTP: Have GetStorageInfo command return correct storage type for removable storage 
Change-Id: I09b548483c12080e7d77970babcae2eef379f2f4
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-05-16 14:29:45 -04:00
Mike Lockwood
2f6a388553 StorageManager: Clean up and generalize storage configuration resources 
Replace config_emulateExternalStorage, config_externalStorageRemovable,
config_externalStoragePaths, config_externalStorageDescriptions and
config_mtpReserveSpaceMegabytes resources with an XML resource file
to describe the external storages that are available.

Add android.os.storage.StorageVolume class

StorageManager.getVolumeList() now returns an array of StorageVolume

Change-Id: I06ce1451ebf08b82f0ee825d56d59ebf72eacd3d
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-05-16 14:29:23 -04:00
Guang Zhu
8083419cee Merge "change how test sets timeout for webkit dump" 2011-05-16 11:28:17 -07:00
Gilles Debunne
056054f7c5 Merge "Links in Environment javadoc" 2011-05-16 11:14:41 -07:00
Dianne Hackborn
5ad5c37ebf am fbdf9df0: (-s ours) am 2a20583a: am 700ab1c7: Merge "DO NOT MERGE. Integrate from master: Improve activity manager debug dumps." into honeycomb-mr2 
* commit 'fbdf9df053800afb25453630d11bd48cbc068271':
  DO NOT MERGE.  Integrate from master: Improve activity manager debug dumps.
 2011-05-16 11:12:45 -07:00
Dirk Dougherty
37fefbbd9e am b131d288: am 4bfc1cc0: am 8b8bfc5d: am babf844f: Merge "Doc change: typo fix" into honeycomb-mr1 
* commit 'b131d288f2c90daf95c678ad12c9708082a2977a':
  Doc change: typo fix
 2011-05-16 11:10:18 -07:00
Scott Main
d0f77476fb am 833b325f: am 81dd428d: am 582c1361: am 5eba0e98: docs: update featured videos and increase the max results for each playlist 
* commit '833b325f5a22f88c1ab84eef5b8caf79cd292036':
  docs: update featured videos and increase the max results for each playlist
 2011-05-16 11:10:15 -07:00
Dianne Hackborn
fbdf9df053 am 2a20583a: am 700ab1c7: Merge "DO NOT MERGE. Integrate from master: Improve activity manager debug dumps." into honeycomb-mr2 
* commit '2a20583a5f436d66ab73cd6c0fdc73e59a3cecad':
  DO NOT MERGE.  Integrate from master: Improve activity manager debug dumps.
 2011-05-16 11:09:31 -07:00
Dirk Dougherty
b131d288f2 am 4bfc1cc0: am 8b8bfc5d: am babf844f: Merge "Doc change: typo fix" into honeycomb-mr1 
* commit '4bfc1cc0a9bea7d7529b6c92daeb65660961b7d4':
  Doc change: typo fix
 2011-05-16 11:07:02 -07:00
Scott Main
833b325f5a am 81dd428d: am 582c1361: am 5eba0e98: docs: update featured videos and increase the max results for each playlist 
* commit '81dd428d70ae14dcceae3bab5271d726abf2f324':
  docs: update featured videos and increase the max results for each playlist
 2011-05-16 11:06:59 -07:00
Guang Zhu
97499df874 change how test sets timeout for webkit dump 
there are cases where webkit dump timed out, but a RuntimeException
was not thrown (as it should have) after the timeout limit was
reached. It's probably because the Looper message to invoke time
out is obtained after the message to dump webview. This change
adjusts the order of obtaining the message so hopefully it can make
the timeout work for real.

Change-Id: I4197699f5aad765c88dc81123d052e4c49d7c53d
 2011-05-16 11:06:53 -07:00
Dianne Hackborn
2a20583a5f am 700ab1c7: Merge "DO NOT MERGE. Integrate from master: Improve activity manager debug dumps." into honeycomb-mr2 
* commit '700ab1c75862babba90f54e02bdc877becd4f4fc':
  DO NOT MERGE.  Integrate from master: Improve activity manager debug dumps.
 2011-05-16 11:06:28 -07:00
Dirk Dougherty
4bfc1cc0a9 am 8b8bfc5d: am babf844f: Merge "Doc change: typo fix" into honeycomb-mr1 
* commit '8b8bfc5d28d9746bf30b2de45f879d9481b07d6f':
  Doc change: typo fix
 2011-05-16 11:03:56 -07:00
Scott Main
81dd428d70 am 582c1361: am 5eba0e98: docs: update featured videos and increase the max results for each playlist 
* commit '582c1361e8a6443812a97f18094be1f8279645a0':
  docs: update featured videos and increase the max results for each playlist
 2011-05-16 11:03:53 -07:00