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
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
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
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
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
Michael Jurka
573068cb4a
Using full-resolution default activity icon in Recent Apps
2011-01-17 13:29:53 -08:00
Eric Laurent
adee6b3559
Merge "Fix omission in NOTICE file." into honeycomb
2011-01-17 13:29:45 -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
David 'Digit' Turner
0e8280cc6e
am fed70229: Merge "UsbService: Remove stack-trace message during boot." into honeycomb
...
* commit 'fed702295210cfab30e1be0166eac0523a332540':
UsbService: Remove stack-trace message during boot.
2011-01-17 13:26:52 -08:00
Adam Powell
a1487347f5
Merge "Fix bug 3362446 - NPE in legacy menus" into honeycomb
2011-01-17 13:26:50 -08:00
David 'Digit' Turner
fed7022952
Merge "UsbService: Remove stack-trace message during boot." into honeycomb
2011-01-17 13:24:26 -08:00
Kenny Root
4c9b3f6330
am 849dc24f: (-s ours) am 524133cc: Remove API that snuck into MockPackageManager
...
* commit '849dc24fa6a2bb6e1e5496c4710ee60c32abdb7f':
Remove API that snuck into MockPackageManager
2011-01-17 13:17:37 -08:00
Adam Powell
4192e38827
Fix bug 3362446 - NPE in legacy menus
...
Change-Id: Icf9a0bec46c74ace3acbc85eea45d1d769b699d1
2011-01-17 13:16:54 -08:00
Kenny Root
b4317e7782
am e8a534d8: Remove API that snuck into MockPackageManager
...
* commit 'e8a534d8f0008e27f24016c5978ca0a5f0ecbce2':
Remove API that snuck into MockPackageManager
2011-01-17 13:16:53 -08:00
Kenny Root
e8a534d8f0
Remove API that snuck into MockPackageManager
...
We didn't release the get/setPackageObbPath API, but it snuck into
MockPackageManager. However, it is not usable as a developer anyway.
Removing it so it doesn't stay in the API forever.
Cherry-pick from gingerbread
Change-Id: I2083a8f398d983d53661c33270854442e34f9bc9
2011-01-17 13:13:37 -08:00
David 'Digit' Turner
49db853513
UsbService: Remove stack-trace message during boot.
...
This removes a stack trace message during the boot under emulation.
The observers tried to access a null reference when no USB configuration
is supported by the emulated device. So do not start them in this case.
+ Change a Slog.w into a Slog.i since this is an acceptable condition.
Change-Id: I126b7f05c9648e39a060eb0974cc6f4ac7533791
2011-01-17 22:09:10 +01:00
Romain Guy
dc6b2db0f2
am 73fddbae: Merge "Don\'t break the build... update to 11.xml." into honeycomb
...
* commit '73fddbae964ee41895c8218454d0ed7fd71d6913':
Don't break the build... update to 11.xml.
2011-01-17 13:08:42 -08:00
Romain Guy
73fddbae96
Merge "Don't break the build... update to 11.xml." into honeycomb
2011-01-17 13:07:24 -08:00
Romain Guy
07457acf75
Don't break the build... update to 11.xml.
...
Change-Id: I45482da4ffa5a9024d5284e0d2f6f41f4b38e8df
2011-01-17 13:08:50 -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
849dc24fa6
am 524133cc: Remove API that snuck into MockPackageManager
...
* commit '524133cc793b5e372cc97c62653281605f57b5b3':
Remove API that snuck into MockPackageManager
2011-01-17 13:05:24 -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
2361098da3
Add BitmapFactory.Options.inMutable to load mutable bitmaps.
...
Change-Id: Iaa222127520f3aa55072d44af12ee3477908b876
2011-01-17 13:04:12 -08:00
Romain Guy
1689c3459b
Merge "Add BitmapFactory.Options.inMutable to load mutable bitmaps." into honeycomb
2011-01-17 13:03:16 -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
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
Eric Laurent
ed2d6b78f6
Fix omission in NOTICE file.
...
Added copyright notice for audio effects source files under
media/libeffects/lvm.
Change-Id: I5ac961000f7bbbfa1f95523712d8517844b1e5f9
2011-01-17 12:50:15 -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
Kenny Root
524133cc79
Remove API that snuck into MockPackageManager
...
We didn't release the get/setPackageObbPath API, but it snuck into
MockPackageManager. However, it is not usable as a developer anyway.
Removing it so it doesn't stay in the API forever.
Change-Id: Ia569754691dc3a9f2672c1f25e4e08d780db6028
2011-01-17 12:40:57 -08:00