Scott Main
b61cdf0231
am 9ef6ec98: am 7ef461d2: Merge "docs: update sidenav for honeycomb preview" into honeycomb
...
* commit '9ef6ec98769b6d9a1d7aaa68dde7d4cf66285998':
docs: update sidenav for honeycomb preview
2011-01-17 23:31:16 -08:00
Jason Sams
93196f5e2f
am e0c127a4: am 3240339c: Merge "Add error checks to the copyFrom functions." into honeycomb
...
* commit 'e0c127a4a7cb499246eb8dbc966ca421919786ec':
Add error checks to the copyFrom functions.
2011-01-17 23:31:05 -08:00
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
Scott Main
9ef6ec9876
am 7ef461d2: Merge "docs: update sidenav for honeycomb preview" into honeycomb
...
* commit '7ef461d2a203b79a768ddc5c292a9b58bf6ee734':
docs: update sidenav for honeycomb preview
2011-01-17 17:03:44 -08:00
Jason Sams
e0c127a4a7
am 3240339c: Merge "Add error checks to the copyFrom functions." into honeycomb
...
* commit '3240339cfe25b95c04871bb78b09d666ad0e7010':
Add error checks to the copyFrom functions.
2011-01-17 17:03:38 -08:00
Jeff Brown
0f6226b9f4
Merge "Add joystick support to framework."
2011-01-17 15:57:44 -08:00
Scott Main
7ef461d2a2
Merge "docs: update sidenav for honeycomb preview" into honeycomb
2011-01-17 15:53:13 -08:00
Scott Main
b3180bc263
docs: update sidenav for honeycomb preview
...
Change-Id: Ifaf93335159ed36c15c9639e7b3d8f77438614af
2011-01-17 15:51:42 -08:00
Jason Sams
3240339cfe
Merge "Add error checks to the copyFrom functions." into honeycomb
2011-01-17 15:48:00 -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
f5a3f10e52
am 40f956bd: am 168a0e90: Merge "docs: revise offline homepage; delete developing index redirect page" into honeycomb
...
* commit '40f956bd3a732d7563e589ed9857f472f5a6911d':
docs: revise offline homepage; delete developing index redirect page
2011-01-17 15:14:15 -08:00
Scott Main
40f956bd3a
am 168a0e90: Merge "docs: revise offline homepage; delete developing index redirect page" into honeycomb
...
* commit '168a0e907d06a151678295585f063456d7bf01e5':
docs: revise offline homepage; delete developing index redirect page
2011-01-17 15:11:45 -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
168a0e907d
Merge "docs: revise offline homepage; delete developing index redirect page" into honeycomb
2011-01-17 15:09:24 -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
Scott Main
e158413543
docs: revise offline homepage; delete developing index redirect page
...
Change-Id: If73a0811721fa61c6924ac4aeaaa92c81c5fe439
2011-01-17 14:48:15 -08:00
Xavier Ducrohet
516dc23bd3
am 9d8ac829: am c1080392: Merge "LayoutLib: Update to use the new RenderResources API." into honeycomb
...
* commit '9d8ac829955dfae3042b3cf27021098ca89aa5b6':
LayoutLib: Update to use the new RenderResources API.
2011-01-17 14:47:46 -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
Stephen Hines
6c4241bdaf
am 83382d8e: am 00d0aaf9: Merge "Clean up simple integer operations." into honeycomb
...
* commit '83382d8e050790d7f73d4c5d3032ea490b573aff':
Clean up simple integer operations.
2011-01-17 14:47:37 -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
Michael Jurka
b7a945afdf
am fee75cb7: am 5401c5a2: Merge "Using full-resolution default activity icon in Recent Apps" into honeycomb
...
* commit 'fee75cb7e4fcb3f7fa95314d06962ecf7b82971a':
Using full-resolution default activity icon in Recent Apps
2011-01-17 14:47:27 -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
Xavier Ducrohet
9d8ac82995
am c1080392: Merge "LayoutLib: Update to use the new RenderResources API." into honeycomb
...
* commit 'c10803924e45e9a607b3c5bb74316c0a84d78cd8':
LayoutLib: Update to use the new RenderResources API.
2011-01-17 14:43:07 -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
Stephen Hines
83382d8e05
am 00d0aaf9: Merge "Clean up simple integer operations." into honeycomb
...
* commit '00d0aaf9b9befafd63e4bf0d0e2a34b0e4f1428d':
Clean up simple integer operations.
2011-01-17 14:42:41 -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
Michael Jurka
fee75cb7e4
am 5401c5a2: Merge "Using full-resolution default activity icon in Recent Apps" into honeycomb
...
* commit '5401c5a25687a6e6e97f59fee76aa0ae1feac807':
Using full-resolution default activity icon in Recent Apps
2011-01-17 14:42:11 -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
Eric Laurent
54dc55a676
am 2b30e051: resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp
...
* commit '2b30e051b625df4b08ee520cd86c23919a9622f1':
Fix omission in NOTICE file.
2011-01-17 14:40:41 -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
Xavier Ducrohet
c10803924e
Merge "LayoutLib: Update to use the new RenderResources API." into honeycomb
2011-01-17 14:21:12 -08:00
Eric Laurent
2b30e051b6
resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp
...
Change-Id: I0d52f183f2a37b31b0d69c3846e94ea8d2cca09b
2011-01-17 14:17:12 -08:00
Irfan Sheriff
326feb8965
Merge "Pick an upstream interface with valid IP config" into honeycomb
2011-01-17 14:14:07 -08:00
Stephen Hines
00d0aaf9b9
Merge "Clean up simple integer operations." into honeycomb
2011-01-17 14:09:49 -08:00
Adam Cohen
3d8e353512
Merge "Adding instance check to RemoteViewsAdapter getViewAt" into honeycomb
2011-01-17 14:07:39 -08:00
Adam Cohen
181d2e3172
Adding instance check to RemoteViewsAdapter getViewAt
...
Change-Id: Ie99d5aeef6e963c89b62cfd435d1c5cbb1fb6bfa
2011-01-17 14:06:46 -08:00
Xavier Ducrohet
70552fb92d
LayoutLib: Update to use the new RenderResources API.
...
Change-Id: Ic64eff3f324c4519da89bab10e6d59f0a9341a04
2011-01-17 14:00:29 -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
Michael Jurka
5401c5a256
Merge "Using full-resolution default activity icon in Recent Apps" into honeycomb
2011-01-17 13:40:51 -08:00