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

40823 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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