drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
40,955 Commits 1 Branch 0 Tags
Commit Graph

40955 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Adam Powell
dd9946e78a 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
Kenny Root
f09d63a52c Re-@hide some of the other StorageManager API 
Some StorageManager API was accidentally unhidden during a bad merge.
Re-@hide the API to fix it.

Bug: 3362407
Change-Id: I5ad6925d3b6c18c33230127b1318c150d028a010
 2011-01-17 12:10:48 -08:00
Scott Main
ab56c2ea67 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
9512d6aa20 Merge "Fix bug 3360954 - Text overlaid on menu icons" into honeycomb 2011-01-17 12:07:52 -08:00
Kenny Root
c05dc09d27 am 898954d7: am d37d6616: Merge "Add OBB size to PackageStats" into honeycomb 
* commit '898954d7469260c339eb776d0a3370b7dbcee720':
  Add OBB size to PackageStats
 2011-01-17 12:06:35 -08:00
Adam Powell
77769c7a91 Fix bug 3360954 - Text overlaid on menu icons 
Change-Id: Ie59a325b7037d93aeec01c862646f900d52e1d7c
 2011-01-17 12:06:14 -08:00
Scott Main
47cd4d521b 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
898954d746 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
d37d661669 Merge "Add OBB size to PackageStats" into honeycomb 2011-01-17 11:58:02 -08:00
Romain Guy
a552148cc4 am cdf44421: am bee8ec25: Merge "Prevent NPE when no indicator is specified. Bug #3362349" into honeycomb 
* commit 'cdf4442188158ac5c7e66b379c6d90b6e7459f5e':
  Prevent NPE when no indicator is specified. Bug #3362349
 2011-01-17 11:53:48 -08:00
Svetoslav Ganov
bfc1ffcd36 am 79b780e0: am 424300f3: Merge "Ensure that no callback is invoked while initializing DatePicker" into honeycomb 
* commit '79b780e011ad77c240dfc81e1d03e4b610c0d715':
  Ensure that no callback is invoked while initializing DatePicker
 2011-01-17 11:53:43 -08:00
Amith Yamasani
4a71eb0fa9 am a46c4ce9: am a3aaad1f: Merge "Add back legacy layout for preference framework for compatibility." into honeycomb 
* commit 'a46c4ce9815b128c0aafc96de36a4d331bc1c741':
  Add back legacy layout for preference framework for compatibility.
 2011-01-17 11:53:33 -08:00
Jeff Hamilton
b689c6dbea am d0dbee21: am b01856da: Merge "Delivering null cursor to loader callbacks." into honeycomb 
* commit 'd0dbee21505b7aaa05e65d41792a2b47249f0110':
  Delivering null cursor to loader callbacks.
 2011-01-17 11:53:29 -08:00
Dharmaray Kundargi
e8eca96193 am b7d33124: am 9ed99405: Merge "Video editor API update - rework for Patch Set 3" into honeycomb 
* commit 'b7d33124494f146e0a835c2862f6de96d0e379d8':
  Video editor API update - rework for Patch Set 3
 2011-01-17 11:53:22 -08:00
Dharmaray Kundargi
9db4aa09e9 am bf6ccb04: am 307003a8: Merge "integrate videoeditor preview player." into honeycomb 
* commit 'bf6ccb04b93f7a2738f29f2d96a69f32f7602f51':
  integrate videoeditor preview player.
 2011-01-17 11:53:15 -08:00
Dharmaray Kundargi
3b9b12b5f0 am f7465eb6: am 4e4f3d1d: Merge "videoeditor JNI files on honeycomb" into honeycomb 
* commit 'f7465eb652717d89193b0208a85edc8bd1ef0b4d':
  videoeditor JNI files on honeycomb
 2011-01-17 11:53:10 -08:00
Kenny Root
34d2b41e48 Revert "Add the {get,set}PackageObbPaths calls to API" 
This reverts commit 6c4d904851772313930f800ac7c323cf90c709bb.

Going with a different tactic that doesn't dump stuff on
PackageManagerService.

Bug: 3214719
Change-Id: I0bbeccf3c21d264deda4256eb53713d2c98284f4
 2011-01-17 11:49:22 -08:00
Romain Guy
cdf4442188 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
79b780e011 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
a46c4ce981 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
d0dbee2150 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
b7d3312449 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
bf6ccb04b9 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
f7465eb652 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
875862e3ec Prevent NPE when no indicator is specified. 
Bug #3362349

Change-Id: Ie15ed9e31fdd4eb72a18471375d8937c50eb1802
 2011-01-17 11:37:24 -08:00
Romain Guy
bee8ec2538 Merge "Prevent NPE when no indicator is specified. Bug #3362349" into honeycomb 2011-01-17 11:35:55 -08:00
Svetoslav Ganov
424300f3e4 Merge "Ensure that no callback is invoked while initializing DatePicker" into honeycomb 2011-01-17 11:32:29 -08:00
Amith Yamasani
a3aaad1f7b Merge "Add back legacy layout for preference framework for compatibility." into honeycomb 2011-01-17 11:27:40 -08:00
Stephen Hines
a8b78174eb Clean up simple integer operations. 
Change-Id: I3bd11c54c49602e4f63310d50bd9b20fae234329
 2011-01-17 11:26:29 -08:00
Kenny Root
bcd6c96e75 Add OBB size to PackageStats 
Bug: 3356814
Change-Id: I4f871fb9fd0cb2f3177cc756631f95d928862571
 2011-01-17 11:21:52 -08:00
Svetoslav Ganov
3d20c846e4 Ensure that no callback is invoked while initializing DatePicker 
bug:3360821

1. While my previous change:I3baff68c has partially fixed this bug
   it was still possible for a callback to be invoked on init. If a
   callback was already regitsered and the init is called the
   callback is incorrectly notified.

Change-Id: I05c6cb78f4c7b7d2a00c52aef42c1698d9479be5
 2011-01-17 11:04:18 -08:00
Jeff Hamilton
b01856da54 Merge "Delivering null cursor to loader callbacks." into honeycomb 2011-01-17 11:03:40 -08:00
Eric Laurent
dac2a9f8e7 am 20fd4c8b: am 72b83b59: Merge "Fix issue 3354692." into honeycomb 
* commit '20fd4c8b9645b37e957a8e63a88316bb2b32af84':
  Fix issue 3354692.
 2011-01-17 10:55:45 -08:00
Romain Guy
4982d91ca4 am e99d5e6e: am cfe5dd01: Merge "Yet another fix for 9patch rendering. Bug #3362133" into honeycomb 
* commit 'e99d5e6eb8facb3e8dabfba68fffe0e0fd556000':
  Yet another fix for 9patch rendering. Bug #3362133
 2011-01-17 10:55:42 -08:00
Romain Guy
7444da5126 Yet another fix for 9patch rendering. 
Bug #3362133

Change-Id: Ia6521d31a8c208a2ad2506a23b6a01e5e442ad86
 2011-01-17 10:53:44 -08:00
Eric Laurent
20fd4c8b96 am 72b83b59: Merge "Fix issue 3354692." into honeycomb 
* commit '72b83b5938a997b4d69edcd09a46a06ac39102d4':
  Fix issue 3354692.
 2011-01-17 10:53:06 -08:00
Romain Guy
e99d5e6eb8 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
9ed99405ae Merge "Video editor API update - rework for Patch Set 3" into honeycomb 2011-01-17 10:52:29 -08:00
Dharmaray Kundargi
307003a844 Merge "integrate videoeditor preview player." into honeycomb 2011-01-17 10:52:23 -08:00
Dharmaray Kundargi
4e4f3d1df4 Merge "videoeditor JNI files on honeycomb" into honeycomb 2011-01-17 10:52:13 -08:00
Eric Laurent
72b83b5938 Merge "Fix issue 3354692." into honeycomb 2011-01-17 10:51:46 -08:00