Vasu Nori
26023b8347
am be21eebb: am 2fd90e92: Merge "bug:3362394 better documentation for DefaultDatabaseErrorHandler class" into honeycomb
...
* commit 'be21eebb486a6c033851df8a9748b24a49e0e03e':
bug:3362394 better documentation for DefaultDatabaseErrorHandler class
2011-01-17 23:30:53 -08:00
Jeff Brown
0f6226b9f4
Merge "Add joystick support to framework."
2011-01-17 15:57:44 -08:00
Vasu Nori
be21eebb48
am 2fd90e92: Merge "bug:3362394 better documentation for DefaultDatabaseErrorHandler class" into honeycomb
...
* commit '2fd90e92ee0731fd77c2b113706c07083b9673ec':
bug:3362394 better documentation for DefaultDatabaseErrorHandler class
2011-01-17 15:40:56 -08:00
Vasu Nori
2e3720f1e0
am 58f765a4: am 376fedf6: Merge "bug:3362635 add new public API to downloadmanager to get mxbytesovermobile" into honeycomb
...
* commit '58f765a45e99a8342f5429102efd02df5a6a729d':
bug:3362635 add new public API to downloadmanager to get mxbytesovermobile
2011-01-17 15:38:40 -08:00
Vasu Nori
2fd90e92ee
Merge "bug:3362394 better documentation for DefaultDatabaseErrorHandler class" into honeycomb
2011-01-17 15:37:09 -08:00
Vasu Nori
58f765a45e
am 376fedf6: Merge "bug:3362635 add new public API to downloadmanager to get mxbytesovermobile" into honeycomb
...
* commit '376fedf6595188ad714022b5d1ab012dc8689c3e':
bug:3362635 add new public API to downloadmanager to get mxbytesovermobile
2011-01-17 15:36:45 -08:00
Vasu Nori
4caaf2aeca
bug:3362394 better documentation for DefaultDatabaseErrorHandler class
...
Change-Id: I85a278183eda297f72a740c9d23efa4aca58d2d3
2011-01-17 15:35:28 -08:00
Vasu Nori
376fedf659
Merge "bug:3362635 add new public API to downloadmanager to get mxbytesovermobile" into honeycomb
2011-01-17 15:34:06 -08:00
Vasu Nori
0abbf809bf
bug:3362635 add new public API to downloadmanager to get mxbytesovermobile
...
bug:3362635
Change-Id: I7380964c6098d5ca6396b17980f78457c23d1a87
2011-01-17 15:14:53 -08:00
Scott Main
8f4e284c6f
am 36578e30: am 662cc7a4: add javadoc for getView method
...
* commit '36578e308cb3178659596a1a1dedb06521420259':
add javadoc for getView method
2011-01-17 15:11:06 -08:00
Scott Main
36578e308c
am 662cc7a4: add javadoc for getView method
...
* commit '662cc7a46a44af782a1f697d16b0613498312e1f':
add javadoc for getView method
2011-01-17 15:09:43 -08:00
Scott Main
662cc7a46a
add javadoc for getView method
...
Change-Id: Ia8d9516c4017319f8bcaedb3e4c451c5c3825857
2011-01-17 15:02:07 -08:00
Romain Guy
ef1b612ebe
am d80d81bb: am a43cfd29: Merge "Improve hardware layers rendering speed when setting a View\'s alpha." into honeycomb
...
* commit 'd80d81bb65a1e60c0cc1a70959f6a67f55bdd5f0':
Improve hardware layers rendering speed when setting a View's alpha.
2011-01-17 14:48:15 -08:00
Irfan Sheriff
ff017477f8
am fc6ef518: am 326feb89: Merge "Pick an upstream interface with valid IP config" into honeycomb
...
* commit 'fc6ef518e0696ca45608ca07803aa50081f9f72f':
Pick an upstream interface with valid IP config
2011-01-17 14:47:41 -08:00
Adam Cohen
4af50d103c
am dc4567d9: am 3d8e3535: Merge "Adding instance check to RemoteViewsAdapter getViewAt" into honeycomb
...
* commit 'dc4567d9706ec91a964a684b3d688014764ed609':
Adding instance check to RemoteViewsAdapter getViewAt
2011-01-17 14:47:31 -08:00
Chris Yerga
4efd77c84c
am 825c29d7: am e2364b09: Merge "Fix content width calculation for Spinner control. The width of the dropdown was only taking into account the width of the items and not background padding." into honeycomb
...
* commit '825c29d72f12308c7f3daced4a0611939bbbba99':
Fix content width calculation for Spinner control. The width of the dropdown was only taking into account the width of the items and not background padding.
2011-01-17 14:47:23 -08:00
Romain Guy
d80d81bb65
am a43cfd29: Merge "Improve hardware layers rendering speed when setting a View\'s alpha." into honeycomb
...
* commit 'a43cfd2940d7c887a8130c0e972a1b398a887819':
Improve hardware layers rendering speed when setting a View's alpha.
2011-01-17 14:45:32 -08:00
Irfan Sheriff
fc6ef518e0
am 326feb89: Merge "Pick an upstream interface with valid IP config" into honeycomb
...
* commit '326feb8965e0bbd5b22479285f6d88cc840b5eed':
Pick an upstream interface with valid IP config
2011-01-17 14:42:52 -08:00
Adam Cohen
dc4567d970
am 3d8e3535: Merge "Adding instance check to RemoteViewsAdapter getViewAt" into honeycomb
...
* commit '3d8e353512bedbc44e0e8c3254320ab0a76edc47':
Adding instance check to RemoteViewsAdapter getViewAt
2011-01-17 14:42:28 -08:00
Chris Yerga
825c29d72f
am e2364b09: Merge "Fix content width calculation for Spinner control. The width of the dropdown was only taking into account the width of the items and not background padding." into honeycomb
...
* commit 'e2364b098f00577aa90e63f8bb9b55a99021a5b2':
Fix content width calculation for Spinner control. The width of the dropdown was only taking into account the width of the items and not background padding.
2011-01-17 14:42:04 -08:00
Romain Guy
a43cfd2940
Merge "Improve hardware layers rendering speed when setting a View's alpha." into honeycomb
2011-01-17 14:40:35 -08:00
Romain Guy
d6cd572df8
Improve hardware layers rendering speed when setting a View's alpha.
...
Change-Id: Ib1275677f531c60d9919978c5538c663fdb823b5
2011-01-17 14:42:41 -08:00
Irfan Sheriff
326feb8965
Merge "Pick an upstream interface with valid IP config" into honeycomb
2011-01-17 14:14:07 -08:00
Adam Cohen
181d2e3172
Adding instance check to RemoteViewsAdapter getViewAt
...
Change-Id: Ie99d5aeef6e963c89b62cfd435d1c5cbb1fb6bfa
2011-01-17 14:06:46 -08:00
Jeff Brown
cb1404e456
Add joystick support to framework.
...
Change-Id: I95374436708752e1a9cff3f85c5b9bc3e0987961
2011-01-17 13:51:00 -08:00
Irfan Sheriff
29552095e1
Pick an upstream interface with valid IP config
...
As a work around for the issue of picking
the wrong interface, add a check for selecting
an upstream interface that has a valid IP configuration
Bug: 3362306
Change-Id: I01084517cff756c97660b2cfbfa8e9bf26673148
2011-01-17 13:50:48 -08:00
Chris Yerga
e2364b098f
Merge "Fix content width calculation for Spinner control. The width of the dropdown was only taking into account the width of the items and not background padding." into honeycomb
2011-01-17 13:30:53 -08:00
Adam Powell
e1ff5149bb
am dc494e1e: am a1487347: Merge "Fix bug 3362446 - NPE in legacy menus" into honeycomb
...
* commit 'dc494e1e48b499ee1e56210fc82d3c489a6f5922':
Fix bug 3362446 - NPE in legacy menus
2011-01-17 13:30:30 -08:00
Adam Powell
dc494e1e48
am a1487347: Merge "Fix bug 3362446 - NPE in legacy menus" into honeycomb
...
* commit 'a1487347f5ba24648303bf8c9e455ca2ef0de7ea':
Fix bug 3362446 - NPE in legacy menus
2011-01-17 13:29:03 -08:00
Adam Powell
a1487347f5
Merge "Fix bug 3362446 - NPE in legacy menus" into honeycomb
2011-01-17 13:26:50 -08:00
Adam Powell
4192e38827
Fix bug 3362446 - NPE in legacy menus
...
Change-Id: Icf9a0bec46c74ace3acbc85eea45d1d769b699d1
2011-01-17 13:16:54 -08:00
Romain Guy
8267ebd61c
am dba4981f: am 1689c345: Merge "Add BitmapFactory.Options.inMutable to load mutable bitmaps." into honeycomb
...
* commit 'dba4981f5f3524a64d6766eb24dd7f5416293fce':
Add BitmapFactory.Options.inMutable to load mutable bitmaps.
2011-01-17 13:07:57 -08:00
Kenny Root
9b4320f9db
am a33dd09b: am d6c54d97: Merge "Revert "Add the {get,set}PackageObbPaths calls to API"" into honeycomb
...
* commit 'a33dd09b5cc62b50afc3a15cd8b67b5344756f1e':
Revert "Add the {get,set}PackageObbPaths calls to API"
2011-01-17 13:07:47 -08:00
Romain Guy
dba4981f5f
am 1689c345: Merge "Add BitmapFactory.Options.inMutable to load mutable bitmaps." into honeycomb
...
* commit '1689c3459b27657b6900429ae64ac5323c584ce3':
Add BitmapFactory.Options.inMutable to load mutable bitmaps.
2011-01-17 13:05:32 -08:00
Kenny Root
a33dd09b5c
am d6c54d97: Merge "Revert "Add the {get,set}PackageObbPaths calls to API"" into honeycomb
...
* commit 'd6c54d97867edd566700c535f3edf57dd4396350':
Revert "Add the {get,set}PackageObbPaths calls to API"
2011-01-17 13:05:22 -08:00
Romain Guy
1689c3459b
Merge "Add BitmapFactory.Options.inMutable to load mutable bitmaps." into honeycomb
2011-01-17 13:03:16 -08:00
Romain Guy
2361098da3
Add BitmapFactory.Options.inMutable to load mutable bitmaps.
...
Change-Id: Iaa222127520f3aa55072d44af12ee3477908b876
2011-01-17 13:04:12 -08:00
Kenny Root
d6c54d9786
Merge "Revert "Add the {get,set}PackageObbPaths calls to API"" into honeycomb
2011-01-17 13:02:48 -08:00
Kenny Root
a1cbb94dbc
Revert "Add the {get,set}PackageObbPaths calls to API"
...
This reverts commit 5d40fe9c6846ba765072e50ed1254293cb9195e4.
Change-Id: Ie41010c92fb860b19a12bcf63f6fe95ffa68da81
2011-01-17 13:00:47 -08:00
Andy Stadler
c2e16f0cbd
am d9bc2b5e: am 2c12c708: Merge "Add internal plumbing to DPM for encryption" into honeycomb
...
* commit 'd9bc2b5e9ef462c9fa4ac821e9d8d27ecff1dfaf':
Add internal plumbing to DPM for encryption
2011-01-17 12:56:40 -08:00
Svetoslav Ganov
9419f2626c
am be0a092c: am 59cce94e: Merge "Catching some edge cases while flinging/scrolling in NumberPicker" into honeycomb
...
* commit 'be0a092c876ce62c0683be921372e20435ad96d3':
Catching some edge cases while flinging/scrolling in NumberPicker
2011-01-17 12:56:37 -08:00
Andy Stadler
d9bc2b5e9e
am 2c12c708: Merge "Add internal plumbing to DPM for encryption" into honeycomb
...
* commit '2c12c708bfb62464e75dcde292547b2d778dafce':
Add internal plumbing to DPM for encryption
2011-01-17 12:54:17 -08:00
Svetoslav Ganov
be0a092c87
am 59cce94e: Merge "Catching some edge cases while flinging/scrolling in NumberPicker" into honeycomb
...
* commit '59cce94eb8cecd484b467d7b855817116e4b13fc':
Catching some edge cases while flinging/scrolling in NumberPicker
2011-01-17 12:54:14 -08:00
Andy Stadler
2c12c708bf
Merge "Add internal plumbing to DPM for encryption" into honeycomb
2011-01-17 12:52:41 -08:00
Svetoslav Ganov
59cce94eb8
Merge "Catching some edge cases while flinging/scrolling in NumberPicker" into honeycomb
2011-01-17 12:52:18 -08:00
Andy Stadler
22dbfda976
Add internal plumbing to DPM for encryption
...
* Add code to persist per-admin setting
* Add hooks for OS-level tie-in (is supported, get / set status)
* Add 3rd API call to get OS status (irrespective of admin settings)
* Remove "REQUESTED" status, no longer relevant with 3rd API
* Fixed bug that impacted global proxy settings
* Update api/11.xml to match current.xml
Bug: 3346770
Change-Id: I56bdf9a7894f6ca4842402c7b82ddb3caf4b37b9
2011-01-17 12:47:31 -08:00
Svetoslav Ganov
6c742f1e95
Catching some edge cases while flinging/scrolling in NumberPicker
...
1. If the scroll is exactly divisible by the scroll item height
the selector wheell is one off from the current value/text input.
Change-Id: I12721e85a99f6a5b51f5ad6f13c3836cb156c9a4
2011-01-17 12:46:21 -08:00
Dianne Hackborn
f5245ddad2
am 74871f9c: am db7f3867: Merge "Start renaming FragmentTransaction.openTransaction() to beginTransaction()." into honeycomb
...
* commit '74871f9c370c6ec520820c0da606afbd77af6b4f':
Start renaming FragmentTransaction.openTransaction() to beginTransaction().
2011-01-17 12:39:20 -08:00
Dianne Hackborn
74871f9c37
am db7f3867: Merge "Start renaming FragmentTransaction.openTransaction() to beginTransaction()." into honeycomb
...
* commit 'db7f38673c33ba55801019007ff18fa4c57f75e0':
Start renaming FragmentTransaction.openTransaction() to beginTransaction().
2011-01-17 12:35:59 -08:00
Kenny Root
7a50f1c753
am 3048abff: am f09d63a5: Re-@hide some of the other StorageManager API
...
* commit '3048abffae72cd66ad2c8d440998dd4994ba7a8f':
Re-@hide some of the other StorageManager API
2011-01-17 12:35:13 -08:00