Kenny Root
|
14fd9c61c4
|
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 |
Kenny Root
|
0f89c33a67
|
Merge "Revert "Add the {get,set}PackageObbPaths calls to API"" into honeycomb
|
2011-01-17 13:02:48 -08:00 |
Andy Stadler
|
00b97efd47
|
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
|
13e20c18d6
|
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
|
5721b3acc3
|
Merge "Add internal plumbing to DPM for encryption" into honeycomb
|
2011-01-17 12:52:41 -08:00 |
Svetoslav Ganov
|
3e24015871
|
Merge "Catching some edge cases while flinging/scrolling in NumberPicker" into honeycomb
|
2011-01-17 12:52:18 -08:00 |
Dianne Hackborn
|
a16aba7268
|
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 |
Dianne Hackborn
|
66217a7e5b
|
Merge "Start renaming FragmentTransaction.openTransaction() to beginTransaction()." into honeycomb
|
2011-01-17 12:33:50 -08:00 |
Kenny Root
|
21d507d320
|
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
|
ce3a38e5a2
|
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 |
Kenny Root
|
52858bb537
|
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
|
a98280fdd6
|
am 9512d6aa: Merge "Fix bug 3360954 - Text overlaid on menu icons" into honeycomb
* commit '9512d6aa206f8bb44ab52b6dfe5ee8cb5c2960ea':
Fix bug 3360954 - Text overlaid on menu icons
|
2011-01-17 12:10:53 -08:00 |
Scott Main
|
a19af5d4a0
|
am 47cd4d52: Merge "docs: update fragment docs with revised APIs, add sample code from ApiDemos, and polish it up" into honeycomb
* commit '47cd4d521bf440042562b5cd1527facc4416b8dc':
docs: update fragment docs with revised APIs, add sample code from ApiDemos, and polish it up
|
2011-01-17 12:08:50 -08:00 |
Adam Powell
|
a0e8e5a5fa
|
Merge "Fix bug 3360954 - Text overlaid on menu icons" into honeycomb
|
2011-01-17 12:07:52 -08:00 |
Scott Main
|
220cbd5a07
|
Merge "docs: update fragment docs with revised APIs, add sample code from ApiDemos, and polish it up" into honeycomb
|
2011-01-17 12:05:15 -08:00 |
Kenny Root
|
7fa7a25298
|
am d37d6616: Merge "Add OBB size to PackageStats" into honeycomb
* commit 'd37d661669cc019faa93177aee9c6143eebe490f':
Add OBB size to PackageStats
|
2011-01-17 12:03:18 -08:00 |
Kenny Root
|
2eb165455e
|
Merge "Add OBB size to PackageStats" into honeycomb
|
2011-01-17 11:58:02 -08:00 |
Romain Guy
|
06b83f7907
|
am bee8ec25: Merge "Prevent NPE when no indicator is specified. Bug #3362349" into honeycomb
* commit 'bee8ec2538c75797d9704617411f831945c8da54':
Prevent NPE when no indicator is specified. Bug #3362349
|
2011-01-17 11:41:36 -08:00 |
Svetoslav Ganov
|
1eb08fd2ca
|
am 424300f3: Merge "Ensure that no callback is invoked while initializing DatePicker" into honeycomb
* commit '424300f3e4840bd06a1dbc22a25350c0589e3f89':
Ensure that no callback is invoked while initializing DatePicker
|
2011-01-17 11:41:28 -08:00 |
Amith Yamasani
|
b71f5a76a0
|
am a3aaad1f: Merge "Add back legacy layout for preference framework for compatibility." into honeycomb
* commit 'a3aaad1f7b4430cb7449767bb13fc1f43d688480':
Add back legacy layout for preference framework for compatibility.
|
2011-01-17 11:41:17 -08:00 |
Jeff Hamilton
|
5c0b1c9720
|
am b01856da: Merge "Delivering null cursor to loader callbacks." into honeycomb
* commit 'b01856da54892647afed260d017352d58648acc3':
Delivering null cursor to loader callbacks.
|
2011-01-17 11:40:52 -08:00 |
Dharmaray Kundargi
|
6835443f7a
|
am 9ed99405: Merge "Video editor API update - rework for Patch Set 3" into honeycomb
* commit '9ed99405ae8cdd9038071a872e7d92cf256f2165':
Video editor API update - rework for Patch Set 3
|
2011-01-17 11:40:27 -08:00 |
Dharmaray Kundargi
|
b610bb8ea5
|
am 307003a8: Merge "integrate videoeditor preview player." into honeycomb
* commit '307003a844c90458bcfd7398c44bbae734936238':
integrate videoeditor preview player.
|
2011-01-17 11:40:16 -08:00 |
Dharmaray Kundargi
|
35421c75c8
|
am 4e4f3d1d: Merge "videoeditor JNI files on honeycomb" into honeycomb
* commit '4e4f3d1df475b03a1a49954d2b3b4530e39778ab':
videoeditor JNI files on honeycomb
|
2011-01-17 11:40:11 -08:00 |
Romain Guy
|
fa5b198ce8
|
Merge "Prevent NPE when no indicator is specified. Bug #3362349" into honeycomb
|
2011-01-17 11:35:55 -08:00 |
Svetoslav Ganov
|
a66e459da3
|
Merge "Ensure that no callback is invoked while initializing DatePicker" into honeycomb
|
2011-01-17 11:32:29 -08:00 |
Amith Yamasani
|
5b48d46ae8
|
Merge "Add back legacy layout for preference framework for compatibility." into honeycomb
|
2011-01-17 11:27:40 -08:00 |
Jeff Hamilton
|
127b4d6464
|
Merge "Delivering null cursor to loader callbacks." into honeycomb
|
2011-01-17 11:03:40 -08:00 |
Eric Laurent
|
2d95b96164
|
am 72b83b59: Merge "Fix issue 3354692." into honeycomb
* commit '72b83b5938a997b4d69edcd09a46a06ac39102d4':
Fix issue 3354692.
|
2011-01-17 10:53:06 -08:00 |
Romain Guy
|
40d6a4b256
|
am cfe5dd01: Merge "Yet another fix for 9patch rendering. Bug #3362133" into honeycomb
* commit 'cfe5dd01f29acbb7393ffa91bb4b2a8ad43414f2':
Yet another fix for 9patch rendering. Bug #3362133
|
2011-01-17 10:53:02 -08:00 |
Dharmaray Kundargi
|
abf0a99b5b
|
Merge "Video editor API update - rework for Patch Set 3" into honeycomb
|
2011-01-17 10:52:29 -08:00 |
Dharmaray Kundargi
|
f47c93b79c
|
Merge "integrate videoeditor preview player." into honeycomb
|
2011-01-17 10:52:23 -08:00 |
Dharmaray Kundargi
|
6449492fb2
|
Merge "videoeditor JNI files on honeycomb" into honeycomb
|
2011-01-17 10:52:13 -08:00 |
Eric Laurent
|
6bb959d8ba
|
Merge "Fix issue 3354692." into honeycomb
|
2011-01-17 10:51:46 -08:00 |
Romain Guy
|
c6199a29ff
|
Merge "Yet another fix for 9patch rendering. Bug #3362133" into honeycomb
|
2011-01-17 10:51:32 -08:00 |
Kenny Root
|
0c064758b9
|
am ec7c9ff0: Hide USB mass storage APIs in StorageManager
* commit 'ec7c9ff0bb1c98cb8bec3ec7bdacbae3a434fa53':
Hide USB mass storage APIs in StorageManager
|
2011-01-17 09:55:31 -08:00 |
Shih-wei Liao
|
2dbe1cdaf1
|
am 38f79d01: Merge "Make ImageProcessing work." into honeycomb
* commit '38f79d01db07f7cc3d3b49d594b675adfa8959d5':
Make ImageProcessing work.
|
2011-01-17 01:20:42 -08:00 |
Shih-wei Liao
|
8cb90181ba
|
Merge "Make ImageProcessing work." into honeycomb
|
2011-01-17 01:18:32 -08:00 |
satok
|
1fbd9f7cdc
|
am 5a1473ba: Merge "Implicitly/Explicitly subtypes bug." into honeycomb
* commit '5a1473bae0467693445b31454e4f736763276de8':
Implicitly/Explicitly subtypes bug.
|
2011-01-16 23:50:06 -08:00 |
satok
|
ada6606f5e
|
Merge "Implicitly/Explicitly subtypes bug." into honeycomb
|
2011-01-16 23:48:24 -08:00 |
Adam Powell
|
9cda29cfdf
|
am 92cd4d02: Merge "Fix bug 3360882 - Allow FEATURE_CUSTOM_TITLE and FEATURE_ACTION_MODE_OVERLAY to coexist." into honeycomb
* commit '92cd4d0296cc8936fcccd97cdbc7a13b724efab4':
Fix bug 3360882 - Allow FEATURE_CUSTOM_TITLE and FEATURE_ACTION_MODE_OVERLAY to coexist.
|
2011-01-16 20:00:17 -08:00 |
Adam Powell
|
6deb6ba9a5
|
Merge "Fix bug 3360882 - Allow FEATURE_CUSTOM_TITLE and FEATURE_ACTION_MODE_OVERLAY to coexist." into honeycomb
|
2011-01-16 19:58:51 -08:00 |
Adam Cohen
|
a60faa123f
|
am d110889c: Fixing bug related to collisions with AppWidget view ids and AppWidgetHost view ids
* commit 'd110889cbca4d40f8cdeddfe6eb2f498f470ae4b':
Fixing bug related to collisions with AppWidget view ids and AppWidgetHost view ids
|
2011-01-16 19:48:02 -08:00 |
Xavier Ducrohet
|
fc7c5341c9
|
am 87ab45c0: Merge "LayoutLib: extract resource resolution into its own class." into honeycomb
* commit '87ab45c0fe4db814a7364fce3b88be3a49507e90':
LayoutLib: extract resource resolution into its own class.
|
2011-01-16 19:40:42 -08:00 |
Xavier Ducrohet
|
38952f39f8
|
Merge "LayoutLib: extract resource resolution into its own class." into honeycomb
|
2011-01-16 19:38:33 -08:00 |
Jim Miller
|
9ffe3d6d98
|
am bdac9e0f: Merge "Fix 3005526: Properly update StatusView from Password/PIN unlock" into honeycomb
* commit 'bdac9e0fbe874cf7414228624bd0d3af4f715ccc':
Fix 3005526: Properly update StatusView from Password/PIN unlock
|
2011-01-16 19:28:25 -08:00 |
David 'Digit' Turner
|
bc69eb5e71
|
am 3612f087: Merge "SystemServer: Do not register null BlueTooth service in the emulator" into honeycomb
* commit '3612f0870c4252a60b93332eadde780dc122a05b':
SystemServer: Do not register null BlueTooth service in the emulator
|
2011-01-16 19:26:22 -08:00 |
Jim Miller
|
6b2336a486
|
Merge "Fix 3005526: Properly update StatusView from Password/PIN unlock" into honeycomb
|
2011-01-16 19:25:45 -08:00 |
David 'Digit' Turner
|
1b3a60949a
|
Merge "SystemServer: Do not register null BlueTooth service in the emulator" into honeycomb
|
2011-01-16 19:25:01 -08:00 |
Jeff Brown
|
aeef56492e
|
am 5cdf0752: Merge "Support non-rectangular input regions." into honeycomb
* commit '5cdf07524132722e0db69db1ca8dcaf3f0073265':
Support non-rectangular input regions.
|
2011-01-16 19:24:17 -08:00 |