Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
50,467 Commits 3 Branches 0 Tags
3badb0d0ca88421a44ed1d3be00a5eebbfa2fa19
Commit Graph

17521 Commits

Author SHA1 Message Date
Joe Onorato
c6cc0f8c19 Rename ViewRoot to ViewAncestor. 
ViewRoot is about to be a new public class for poking at ViewAncestor.

Change-Id: Ie95d707c6d8bbb48f78d093d7b2667851812a7d5
 2011-05-04 14:08:11 -07:00
Robert Greenwalt
b6f8bff109 am 9c7e6fc5: am f13eb830: Merge "Add auto-restore timeout for secondary networks." into honeycomb-LTE 
* commit '9c7e6fc50614cc1739d4bfbf6187893c27b01a67':
  Add auto-restore timeout for secondary networks.
 2011-05-04 12:47:30 -07:00
Jeff Sharkey
a62057496b Merge "Avoid throwing when forceRefresh() missing server." 2011-05-04 11:58:55 -07:00
Jeff Sharkey
f055829f35 Avoid throwing when forceRefresh() missing server. 
Bug: 4377651
Change-Id: Ia950a1e62d39ce9148827ebb4535f6441911b195
 2011-05-04 11:58:06 -07:00
Daniel Sandler
0c19aaaebb Merge "On-screen navigation bar (separate from the status bar)." 2011-05-04 11:26:38 -07:00
Gilles Debunne
6e222bcadb Off by one bug in TextView's suggestions popup. 
Change-Id: I39615bb75e1e2e24ba5c5a65f1b3e11f8fadd89f
 2011-05-04 10:25:04 -07:00
Robert Greenwalt
9c7e6fc506 am f13eb830: Merge "Add auto-restore timeout for secondary networks." into honeycomb-LTE 
* commit 'f13eb8301f4704179938e374129f2943c9c38d5f':
  Add auto-restore timeout for secondary networks.
 2011-05-04 10:02:16 -07:00
Robert Greenwalt
f13eb8301f Merge "Add auto-restore timeout for secondary networks." into honeycomb-LTE 2011-05-04 09:59:30 -07:00
Mike Lockwood
21c0800f71 am d3e4290c: DO NOT MERGE MTP and media provider support for multiple storage devices: 
* commit 'd3e4290c0442b6dcf24bcf642f4fc26d12d8e7aa':
  DO NOT MERGE MTP and media provider support for multiple storage devices:
 2011-05-04 08:57:23 -07:00
Mike Lockwood
a2a8419db8 am e3b498be: DO NOT MERGE StorageManager: Add getVolumeList() and getVolumeState() methods 
* commit 'e3b498be0ae05367e9b84f4fac2ac5cf57a6b091':
  DO NOT MERGE StorageManager: Add getVolumeList() and getVolumeState() methods
 2011-05-04 08:57:07 -07:00
Mike Lockwood
d3e4290c04 DO NOT MERGE MTP and media provider support for multiple storage devices: 
- MTP support for multiple storage units

- Add storage_id column to media database for MTP storage ID

- Add framework resource for defining mount points and user visible descriptions
for multiple volumes

- Clean up locking in MtpServer JNI code

Change-Id: I53d501fd4891ebe27408135fb598027e06b7e495
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-05-04 10:41:20 -04:00
Mike Lockwood
e3b498be0a DO NOT MERGE StorageManager: Add getVolumeList() and getVolumeState() methods 
Change-Id: I8ba7e56797b0106dafaa6388393e5c629f27e6e6
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-05-04 10:41:19 -04:00
Adam Powell
f3cd1d957c Bug 4269063 - Populate contentdescription in action bar 
home/up and action menu

Change-Id: Ia09d78d9d37848621e025b9af93a92cfd3bb8dc7
 2011-05-03 19:43:55 -07:00
Robert Greenwalt
f2102f7a1a Add auto-restore timeout for secondary networks. 
Settable per network so you can have not timeout for some and some for others.
If you set the old NETWORK_RESTORE_DELAY_PROP_NAME system property
(android.telephony.apn-restore) it will override this value.

Change-Id: Icca706fdc74245dce679209116660e5dc4b05d23
 2011-05-03 19:10:26 -07:00
Mike Lockwood
7ae938be1b DO NOT MERGE MTP and media provider support for multiple storage devices: 
- MTP support for multiple storage units

- Add storage_id column to media database for MTP storage ID

- Add framework resource for defining mount points and user visible descriptions
for multiple volumes

- Clean up locking in MtpServer JNI code

Change-Id: Ide6d47bd9aa1698ed2a13d695613e03f2a9b29e3
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-05-03 21:03:56 -04:00
Mike Lockwood
d967f4664f DO NOT MERGE StorageManager: Add getVolumeList() and getVolumeState() methods 
Change-Id: I43d5c1730b340f1288b58012234b38f801001b71
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-05-03 21:03:55 -04:00
Adam Powell
e409851954 Merge "Fix bug 4355335 - android.app.cts.DialogTest.testContextMenu failing on IRJ28" 2011-05-03 17:33:02 -07:00
Adam Powell
d1f4207ba5 Fix bug 4355335 - android.app.cts.DialogTest.testContextMenu failing on IRJ28 
Change-Id: Icfcd8c2aadd0fb9e49296b8318858317407e1b7f
 2011-05-03 17:30:48 -07:00
Conley Owens
1c6afcbf1f am 2d40bf91: am eac835e5: am 9c4ba258: Merge "Removing dead store; it was likely a relict of debuging code." 
* commit '2d40bf91e6ad71505ec84743c5ad0b854ecf5928':
  Removing dead store; it was likely a relict of debuging code.
 2011-05-03 16:19:53 -07:00
Conley Owens
2d40bf91e6 am eac835e5: am 9c4ba258: Merge "Removing dead store; it was likely a relict of debuging code." 
* commit 'eac835e52e8378b33a2b34b7edb803290154588d':
  Removing dead store; it was likely a relict of debuging code.
 2011-05-03 16:14:31 -07:00
Mathias Agopian
9d216f7b0e Merge "improve documentation for the ROTATION_VECTOR sensor" 2011-05-03 15:36:23 -07:00
Mathias Agopian
557975c2b5 Merge "Add documentation for Sensor.TYPE_PRESSURE" 2011-05-03 15:25:42 -07:00
Adam Powell
0d42f17f5e Merge "Fix bug 4345702 - update action bar tab views when the Tab object is updated" 2011-05-03 14:55:54 -07:00
Adam Powell
0d8ec1d739 Fix bug 4345702 - update action bar tab views when the Tab object is 
updated

Also fix a bug with visibility of split action bar views.

Change-Id: Iadd63d5e9b6cb9debab0f7a777e424e4c4807a13
 2011-05-03 14:50:08 -07:00
Eino-Ville Talvala
3723396c7a Merge "Add an auto-exposure lock feature to the Camera API." 2011-05-03 11:07:33 -07:00
Wink Saville
f45f13bd15 am 3165f1a8: am d0d44c4e: Merge "Make DataConnection asynchronous." into honeycomb-LTE 
* commit '3165f1a8eb707b36a6b2c66379c3fde85d9cc2fd':
  Make DataConnection asynchronous.
 2011-05-02 23:46:03 -07:00
Wink Saville
3165f1a8eb am d0d44c4e: Merge "Make DataConnection asynchronous." into honeycomb-LTE 
* commit 'd0d44c4e988ecdea86c2bb04e29d8f6d20c1c631':
  Make DataConnection asynchronous.
 2011-05-02 23:44:16 -07:00
Wink Saville
d0d44c4e98 Merge "Make DataConnection asynchronous." into honeycomb-LTE 2011-05-02 23:41:29 -07:00
Adam Powell
e42b189f36 Remove debug logging 
Change-Id: If1a8ef5461b98239d8f55f842e1043b6b3d0f070
 2011-05-02 22:45:59 -07:00
Adam Powell
04748befb8 Merge "Refactoring of action bar internals" 2011-05-02 22:17:24 -07:00
Adam Powell
640a66eac6 Refactoring of action bar internals 
Split action bar implementation details. Factor out common components
into AbsActionBar. Layout rules for the lower half of split action
bars.

Change-Id: I6bc39ba6c343055597880a7d4663dd8f30aa4999
 2011-05-02 22:12:44 -07:00
Wink Saville
0b80114a2d Make DataConnection asynchronous. 
Change-Id: Ic0e01dded25ba1fdb3b2c6d0f95a1193f608a0e0
 2011-05-02 21:55:04 -07:00
Mathias Agopian
d84d2b7b1e improve documentation for the ROTATION_VECTOR sensor 
the documentation didn't specify which reference coordinate
system was used.

Change-Id: I5ff5d1041b59de365863db6ee34cc9d823801d34
 2011-05-02 19:08:53 -07:00
Mathias Agopian
1260a89b54 Add documentation for Sensor.TYPE_PRESSURE 
Change-Id: I634722a9a22946a1ae96c0b868af0c66d467a3a6
 2011-05-02 18:59:07 -07:00
Romain Guy
df0a7fbdcf Merge "Allows to render with an OpenGL context inside a TextureView." 2011-05-02 18:33:26 -07:00
Romain Guy
8f0095cd33 Allows to render with an OpenGL context inside a TextureView. 
Change-Id: I59453f7fc3997f0502a1c5d325d37fed376fabc7
 2011-05-02 18:32:29 -07:00
Robert Greenwalt
f32330cf17 Merge "resolved conflicts for merge of db46fa25 to master" 2011-05-02 15:24:09 -07:00
Romain Guy
2542d0cd53 Merge "Remove unnecessary code." 2011-05-02 15:16:25 -07:00
Romain Guy
e91a9c7ab0 Remove unnecessary code. 
Change-Id: I0352bf861192df51fe78873d439e8d7ff887118e
 2011-05-02 14:53:30 -07:00
Robert Greenwalt
a8e0dfae06 resolved conflicts for merge of db46fa25 to master 
Change-Id: I8df9d5d07588fbd70e417dae567be26f645b74b6
 2011-05-02 14:41:57 -07:00
Irfan Sheriff
d713683f9f am d369d64e: am 8ab6a6d4: Merge "Add DhcpStateMachine for interation with dhcpcd" into honeycomb-LTE 
* commit 'd369d64ee7931726d479e60e64d76a31fdba4a8f':
  Add DhcpStateMachine for interation with dhcpcd
 2011-05-02 13:29:36 -07:00
Robert Greenwalt
db46fa25be am a47c4019: Merge "Add RouteInfo objects for tracking routes." into honeycomb-LTE 
* commit 'a47c40193fcbe9ca07facea78b2828afdae5e025':
  Add RouteInfo objects for tracking routes.
 2011-05-02 13:29:22 -07:00
Robert Greenwalt
a47c40193f Merge "Add RouteInfo objects for tracking routes." into honeycomb-LTE 2011-05-02 13:26:52 -07:00
Irfan Sheriff
d369d64ee7 am 8ab6a6d4: Merge "Add DhcpStateMachine for interation with dhcpcd" into honeycomb-LTE 
* commit '8ab6a6d415156bb543a735612fbbdecfbff6c3a4':
  Add DhcpStateMachine for interation with dhcpcd
 2011-05-02 12:26:52 -07:00
Wink Saville
a0449f03eb Resolve merge conflicts for merge of 21083066 to master. 
Change-Id: Ief83f7abdd3396af965fb86ad6815e16ce36ff5c
 2011-05-02 12:13:44 -07:00
Wink Saville
210830664d am 7e74c60d: Merge "Enhance AsyncChannel." into honeycomb-LTE 
* commit '7e74c60db5261ea137c8f6672f8573873eb5814e':
  Enhance AsyncChannel.
 2011-05-02 11:51:36 -07:00
Irfan Sheriff
8ab6a6d415 Merge "Add DhcpStateMachine for interation with dhcpcd" into honeycomb-LTE 2011-05-02 11:49:46 -07:00
Robert Greenwalt
aa70f101e0 Add RouteInfo objects for tracking routes. 
Used to have list of gateways for default routes, but general static routes
should be supported.

Change-Id: I01730142c6139f2b833b9d48f5381d2d320b69f6
 2011-05-02 11:17:30 -07:00
Wink Saville
0246bbc8d7 Enhance AsyncChannel. 
- Use  Protocol for BASE of CMD's.
- Add synchronous connect methods.
- Back port sha1 c23971b3e4 from master

Change-Id: If0b3f6cbbb8d4268cad6ca19d26ab2ee42390d86
 2011-05-02 10:44:56 -07:00
Conley Owens
e8141854dc am dddaa56f: Merge commit \'b737647d\' (Scrolling using arrow keys with padding) into m 
* commit 'dddaa56f793ad9ecb4e20df746f562ac7f24d158':
  Scolling using arrow keys with padding
 2011-05-02 10:28:26 -07:00