40895 Commits

Author SHA1 Message Date
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
David 'Digit' Turner
a881c44e77 am 0e8280cc: am fed70229: Merge "UsbService: Remove stack-trace message during boot." into honeycomb
* commit '0e8280cc6e5d553066d5f09892c12c2a8a846791':
  UsbService: Remove stack-trace message during boot.
2011-01-17 13:30:21 -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
e649e74ef6 am 4c9b3f63: am 849dc24f: (-s ours) am 524133cc: Remove API that snuck into MockPackageManager
* commit '4c9b3f6330faf99e343d9ad79f0d6b621454ba67':
  Remove API that snuck into MockPackageManager
2011-01-17 13:21:11 -08:00
Kenny Root
b67d85009a am b4317e77: am e8a534d8: Remove API that snuck into MockPackageManager
* commit 'b4317e7782248dad0e374f6791e0e85686cdb79f':
  Remove API that snuck into MockPackageManager
2011-01-17 13:19:07 -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
Romain Guy
9a068f9b30 am dc6b2db0: am 73fddbae: Merge "Don\'t break the build... update to 11.xml." into honeycomb
* commit 'dc6b2db0f28f31a9ec077a6ce39cbb89484bb80d':
  Don't break the build... update to 11.xml.
2011-01-17 13:11:11 -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
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
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
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
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
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
Dianne Hackborn
db7f38673c Merge "Start renaming FragmentTransaction.openTransaction() to beginTransaction()." into honeycomb 2011-01-17 12:33:50 -08:00
Kenny Root
909cd087e2 am 5f44e012: am e26aa3f7: (-s ours) am 34d2b41e: Revert "Add the {get,set}PackageObbPaths calls to API"
* commit '5f44e01265a59c55af4ca026d9104643f0c730e4':
  Revert "Add the {get,set}PackageObbPaths calls to API"
2011-01-17 12:33:12 -08:00
Kenny Root
3048abffae am f09d63a5: Re-@hide some of the other StorageManager API
* commit 'f09d63a52c84386a7b3539eab5b43f020f194c77':
  Re-@hide some of the other StorageManager API
2011-01-17 12:31:49 -08:00
Kenny Root
5f44e01265 am e26aa3f7: (-s ours) am 34d2b41e: Revert "Add the {get,set}PackageObbPaths calls to API"
* commit 'e26aa3f78a33af5720e141e98a1ab0c77ef0456d':
  Revert "Add the {get,set}PackageObbPaths calls to API"
2011-01-17 12:30:24 -08:00
Dianne Hackborn
48e7b45869 Start renaming FragmentTransaction.openTransaction() to beginTransaction().
Change-Id: Ib4a6d824b33cca699b7b25159c491fb610d5f5da
2011-01-17 12:28:35 -08:00
Kenny Root
e26aa3f78a am 34d2b41e: Revert "Add the {get,set}PackageObbPaths calls to API"
* commit '34d2b41e48281d1df2c844e004740f008e699093':
  Revert "Add the {get,set}PackageObbPaths calls to API"
2011-01-17 12:23:43 -08:00
Adam Powell
562ce90ffd am dd9946e7: am 9512d6aa: Merge "Fix bug 3360954 - Text overlaid on menu icons" into honeycomb
* commit 'dd9946e78ae3884047efe875920ab0d5c38c3467':
  Fix bug 3360954 - Text overlaid on menu icons
2011-01-17 12:13:03 -08:00
Scott Main
5c4f5f8873 am ab56c2ea: am 47cd4d52: Merge "docs: update fragment docs with revised APIs, add sample code from ApiDemos, and polish it up" into honeycomb
* commit 'ab56c2ea674bb35c23e4a44a54fdc5976afdea72':
  docs: update fragment docs with revised APIs, add sample code from ApiDemos, and polish it up
2011-01-17 12:10:57 -08:00