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

47286 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andreas Huber
c56e81c887 Merge "DO NOT MERGE: Properly construct the ESDS metadata even if sizeof(codec-specific-data) != 2" into honeycomb-mr2 2011-05-17 10:29:36 -07:00
Adam Powell
a7f52d4665 Merge "DO NOT MERGE Use action bar overflow menus on large configurations as well as xlarge." into honeycomb-mr2 2011-05-17 09:41:52 -07:00
Adam Powell
79411726d5 Merge "Turn fading edges back on for ScrollView and HorizontalScrollView." into honeycomb-mr2 2011-05-17 09:41:33 -07:00
Dianne Hackborn
7916ac65dc Add new command line option to change global screen size. 
For example:

adb shell am display-size 1024x600

Change-Id: I5df462acd3323bdaaaefa3126faea7dd8595b726
 2011-05-16 20:55:41 -07:00
Xavier Ducrohet
05b7b69c6c LayoutLib: support the new baseline/margin query API. 
Change-Id: I856489df655960820b8eaa4c6179515a5c069b00
 2011-05-16 16:29:03 -07:00
Roman Nurik
8f3dbe1c37 am ce6253d8: Merge "Add link to Speech Input article to resource browser, tweak outdated information in the article." into honeycomb-mr1 
* commit 'ce6253d8fda92a508fa1000b5d1110e6e7a5b539':
  Add link to Speech Input article to resource browser, tweak outdated information in the article.
 2011-05-16 16:01:27 -07:00
Roman Nurik
ce6253d8fd Merge "Add link to Speech Input article to resource browser, tweak outdated information in the article." into honeycomb-mr1 2011-05-16 15:58:08 -07:00
Adam Powell
aff08381a3 Turn fading edges back on for ScrollView and HorizontalScrollView. 
Change-Id: Iba880fef0083d36d105b387e4184c57a5fd62486
 2011-05-16 14:04:31 -07:00
Irfan Sheriff
cff1093fd2 Merge "Fix ISO country code of Slovenia." into honeycomb-mr2 2011-05-16 14:02:39 -07:00
Scott Main
8a29ffa3b0 am 7a701024: docs: add redirects to key legacy docs bug: 4439292 
* commit '7a701024be7e58f840ebf9636cdad62ee4606b72':
  docs: add redirects to key legacy docs bug: 4439292
 2011-05-16 14:01:30 -07:00
Roman Nurik
ecaf3f4f28 Add link to Speech Input article to resource browser, tweak outdated information in the article. 
Change-Id: I5715f8bf7f2f11e5005cc3e9541846ac06797ac6
 2011-05-16 14:00:13 -07:00
Robert Greenwalt
188b9e9ec0 Fix ISO country code of Slovenia. 
Misread an IBM site and thought it was sl-sl, but really it is sl-si.

fixes public bug 16021

Change-Id: Ibc9fa4d18fd66fc90f361674159a97e2acb1681d
 2011-05-16 13:58:37 -07:00
Scott Main
7a701024be docs: add redirects to key legacy docs 
bug: 4439292

Change-Id: Ifd8f590504507fe417aae102a757cb7eae5507a3
 2011-05-16 13:54:02 -07:00
Adam Powell
b07f943273 DO NOT MERGE Use action bar overflow menus on large configurations as 
well as xlarge.

ICS will have a more intelligent way of determining this.

Change-Id: I1ba6460dec09b8259db858c78a9157bb7742c85d
 2011-05-16 13:46:38 -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
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
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
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
15afd076d6 Merge "MTP: Have GetStorageInfo command return correct storage type for removable storage" into honeycomb-mr2 2011-05-16 12:34:35 -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
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
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
Dianne Hackborn
700ab1c758 Merge "DO NOT MERGE. Integrate from master: Improve activity manager debug dumps." into honeycomb-mr2 2011-05-16 11:02:29 -07:00
Dirk Dougherty
8b8bfc5d28 am babf844f: Merge "Doc change: typo fix" into honeycomb-mr1 
* commit 'babf844f4606f07de0e3349b5847faa2f8f208cc':
  Doc change: typo fix
 2011-05-16 11:01:44 -07:00
Scott Main
582c1361e8 am 5eba0e98: docs: update featured videos and increase the max results for each playlist 
* commit '5eba0e98d1f7ed8f9d04a44adb8d8a37ef7f4659':
  docs: update featured videos and increase the max results for each playlist
 2011-05-16 11:01:42 -07:00
Dirk Dougherty
babf844f46 Merge "Doc change: typo fix" into honeycomb-mr1 2011-05-16 10:59:00 -07:00
Scott Main
5eba0e98d1 docs: update featured videos and increase the max results for each playlist 
Change-Id: I8d7a547960ed5bae4ea2eec9e8bac14c421d3746
 2011-05-16 10:56:26 -07:00
Dirk Dougherty
58610ba382 Doc change: typo fix 
Change-Id: I078cb313c02b37571b573f4fb4e68e11c45cc271
 2011-05-16 10:41:34 -07:00
Scott Main
1ff0131e77 am fc0ea7ea: docs: add oem driver for alcatel 
* commit 'fc0ea7ea5de429d9eea7f13bca42b98081d38dc5':
  docs: add oem driver for alcatel
 2011-05-16 10:20:59 -07:00
Scott Main
fc0ea7ea5d docs: add oem driver for alcatel 
Change-Id: I429583a3f2f4f91a6ffa21367b474f537ad28c96
 2011-05-16 09:52:45 -07:00
Scott Main
084d3490a5 am f73dcad3: Merge "docs: update homepage I/O announcement" into honeycomb-mr1 
* commit 'f73dcad35d031afc8e4db767d9b8bc40f389e4fc':
  docs: update homepage I/O announcement
 2011-05-13 20:29:45 -07:00
Scott Main
f73dcad35d Merge "docs: update homepage I/O announcement" into honeycomb-mr1 2011-05-13 20:26:56 -07:00
Dianne Hackborn
9a84983a9f DO NOT MERGE. Integrate from master: Improve activity manager debug dumps. 
Activity manager now does all dump requests into apps
asynchronously, so it can nicely timeout if there is an
app problem.  Also lots of general cleanup of the am
dump output.

Change-Id: I99447b87f77a701af52aeca984d93dfe931f065d
 2011-05-13 18:38:19 -07:00
Dianne Hackborn
f9dd34f4d3 DO NOT MERGE: Integrate from main - Deprecate a bunch of APIs. 
And clean up some documentation.

Change-Id: I8f06e2fc3bb6c552581b64657e82ba690d524232
 2011-05-13 18:31:04 -07:00
Xavier Ducrohet
738c5e6072 am 2fae858d: LayoutLib: implement data binding for most AdapterView 
* commit '2fae858db55fc6984ef923a6226b9408c37c72cb':
  LayoutLib: implement data binding for most AdapterView
 2011-05-13 16:30:44 -07:00
Dianne Hackborn
6121f06ed5 Merge "Fix a bug where an action bar could be created when it should not be." into honeycomb-mr2 2011-05-13 16:24:32 -07:00
Xavier Ducrohet
2fae858db5 LayoutLib: implement data binding for most AdapterView 
Change-Id: I27be96ed2c37573eb22cfbb391d96b6137b3df8c
 2011-05-13 15:55:49 -07:00
Dianne Hackborn
f3f2d731e1 Merge "DO NOT MERGE. Integrate fragment work from master" into honeycomb-mr2 2011-05-13 15:33:21 -07:00
Gloria Wang
331de5dd58 DO NOT MERGE 
For bug 4422428
Squashed commit of the following:

commit ae2e13783db2284f40d3891e70e152dab941edfc
Author: Gloria Wang <gwang@google.com>
Date:   Fri May 13 11:43:11 2011 -0700

    Add one more DRM error code. For bug 4422428.

    Change-Id: I4e333f474c96c0e0f162dde4013ad32b336bebd6

commit 0f88249d0cb5221f622cf1d1ac3cdccefb8f58a2
Author: Gloria Wang <gwang@google.com>
Date:   Fri Apr 29 10:44:46 2011 -0700

    Add DRM errors in the DRM frameworks to MediaErrors also.
    For bug 4350156.

    Change-Id: Ib5711ec642178a49203a448b7f5114e675d49394

Change-Id: Ia02de462159400eef8c015d28531bf1dd6796a18
 2011-05-13 15:09:24 -07:00
Adam Powell
a593d9852f Fix a bug where an action bar could be created when it should not be. 
Change-Id: I9ca1038accdb6d0a539750ed8ab068a41612f6ae
 2011-05-13 14:09:54 -07:00
Jeff Brown
4fb76253f2 Fix bounds check. 
Bug: 4413945

Also remove dead code from header file.

Change-Id: I4e9fc9d7f8612fedb436e62649d308bd737ed138
 2011-05-13 12:51:12 -07:00
Dianne Hackborn
16f6e89c2a DO NOT MERGE. Integrate fragment work from master 
Back-port new fragment detach APIs from support lib.

This allow a much cleaner implementation of things like the
fragment pager class.

Integrate from support lib: fix restore of list state.

The FragmentManager/ListFragment impl was restoring the list
state before setting its adapter.  This caused the list view to
lose the state, since it gets cleared as part of setting the
adapter.  Now the fragment manager waits on restoring the view
hierarchy state until after it has done onActivityCreated(),
at which point we have set the adapter.

It would be nice to make list view less fragile in this regard,
but that is for a different change.

Change-Id: I38606ef7d0b06478995f3fb7726aead67420e172
 2011-05-13 12:42:22 -07:00
Scott Main
78987e0322 docs: update homepage I/O announcement 
Change-Id: If61bfdf40c3b1d0c95b9a2694a849edf5e53bb54
 2011-05-13 11:27:53 -07:00
Dianne Hackborn
0ed2e845db Merge "DO NOT MERGE. Integrate add new screen width/height in "dp" configs." into honeycomb-mr2 2011-05-13 11:16:42 -07:00
Scott Main
78b875e7e6 am edab852f: Merge "docs: update uses-feature doc with USB features, add TOC at the top and revise some other stuff" into honeycomb-mr1 
* commit 'edab852fe11f12ad5a0a66f79462ed7474ba9e5a':
  docs: update uses-feature doc with USB features, add TOC at the top and revise some other stuff
 2011-05-13 10:56:52 -07:00
Scott Main
d32aeafc41 am 432fbcc5: docs: enforce alphanumeric strings for video id to prevent XSS bug 4399806 
* commit '432fbcc55ff3e0900a50b70b9d5dbdab77a276f7':
  docs: enforce alphanumeric strings for video id to prevent XSS bug 4399806
 2011-05-13 10:55:09 -07:00