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

2433 Commits

Author SHA1 Message Date
Jack Palevich
1e686175a6 am 79f74eda: am a228e4f8: Merge "Unhide GLSurfaceView.get/setPreserveEGLContextOnPause" into honeycomb 
* commit '79f74eda8a6ba96519bb3a084f656fcacb1cd2e7':
  Unhide GLSurfaceView.get/setPreserveEGLContextOnPause
 2011-01-18 21:58:11 -08:00
Nick Pelly
5a6e65ed2e am b6b426ad: Merge "Change Tag.getTechnology(NfcAdapter, int) to NfcAdapter.getTechnology(Tag, int)" into honeycomb-plus-aosp 
* commit 'b6b426ad1c953555dd6393844c29be5c9a9cd700':
  Change Tag.getTechnology(NfcAdapter, int) to NfcAdapter.getTechnology(Tag, int)
 2011-01-18 21:57:31 -08:00
Dianne Hackborn
7fc5d4b8e7 am 2ec5a716: am 36c84403: Merge "Fix issue #3362484: Can\'t dismiss activity picker by tapping outside dialog" into honeycomb 
* commit '2ec5a7160b3d32887b2428edef7a751ee3700809':
  Fix issue #3362484: Can't dismiss activity picker by tapping outside dialog
 2011-01-18 21:56:45 -08:00
Brad Fitzpatrick
aef99bbc69 am 7adf8481: am b4f655d5: Merge "StrictMode class instance limit interface." into honeycomb 
* commit '7adf848183b39ac4d0b8b67435ace94909ca3076':
  StrictMode class instance limit interface.
 2011-01-18 21:50:45 -08:00
Christopher Tate
31cd02ade3 am 17ed60c3: API CHANGE: add a no-View ctor for DragShadowBuilder 
* commit '17ed60c3d2e480ab9788b445958a22b9ae7b6e96':
  API CHANGE: add a no-View ctor for DragShadowBuilder
 2011-01-18 18:36:06 -08:00
Jack Palevich
79f74eda8a am a228e4f8: Merge "Unhide GLSurfaceView.get/setPreserveEGLContextOnPause" into honeycomb 
* commit 'a228e4f833b96e0633571735c2363e30363e155c':
  Unhide GLSurfaceView.get/setPreserveEGLContextOnPause
 2011-01-18 18:35:42 -08:00
Nick Pelly
b6b426ad1c Merge "Change Tag.getTechnology(NfcAdapter, int) to NfcAdapter.getTechnology(Tag, int)" into honeycomb-plus-aosp 2011-01-18 16:10:48 -08:00
Christopher Tate
17ed60c3d2 API CHANGE: add a no-View ctor for DragShadowBuilder 
Cf conversation with the API council.  Also expand the javadoc
a bit.

Change-Id: I9d4edb1042e00492b3db5c6bb7c7d9648581efad
 2011-01-18 16:07:06 -08:00
Jack Palevich
a228e4f833 Merge "Unhide GLSurfaceView.get/setPreserveEGLContextOnPause" into honeycomb 2011-01-18 15:54:29 -08:00
Jack Palevich
75f2bc04df Unhide GLSurfaceView.get/setPreserveEGLContextOnPause 
Change-Id: I882b8fa7888e2baae41c81b75af7fc1f639d38d6
 2011-01-18 15:53:25 -08:00
Nick Pelly
06a00bd2d2 Change Tag.getTechnology(NfcAdapter, int) to NfcAdapter.getTechnology(Tag, int) 
The later feels less clumsy.

Change-Id: I1bad37031c5d57f51b04c8ea6e41805dcd2935ec
 2011-01-18 15:39:34 -08:00
Dianne Hackborn
2ec5a7160b am 36c84403: Merge "Fix issue #3362484: Can\'t dismiss activity picker by tapping outside dialog" into honeycomb 
* commit '36c84403ec07439d11ed284ac5f9a9db807fbf92':
  Fix issue #3362484: Can't dismiss activity picker by tapping outside dialog
 2011-01-18 15:32:44 -08:00
Dianne Hackborn
36c84403ec Merge "Fix issue #3362484: Can't dismiss activity picker by tapping outside dialog" into honeycomb 2011-01-18 15:31:21 -08:00
Dianne Hackborn
cfaf8878de Fix issue #3362484: Can't dismiss activity picker by tapping outside dialog 
Change-Id: Idc2fe5a86c61e8f94fe9d902a0087a05f6f7918e
 2011-01-18 15:28:41 -08:00
Brad Fitzpatrick
7adf848183 am b4f655d5: Merge "StrictMode class instance limit interface." into honeycomb 
* commit 'b4f655d5912869078cb7be29d108ebfea06019fc':
  StrictMode class instance limit interface.
 2011-01-18 13:13:07 -08:00
Brad Fitzpatrick
b4f655d591 Merge "StrictMode class instance limit interface." into honeycomb 2011-01-18 13:11:33 -08:00
John Reck
14ae0cb842 am 3977afe4: am d00207ff: Merge "WebStorage public API change" into honeycomb 
* commit '3977afe41679290fedbe661e53dcf360136f52d0':
  WebStorage public API change
 2011-01-18 12:10:22 -08:00
Dmitri Plotnikov
016c6daff0 am b92d08a7: am 48395385: Merge "Hiding the AsyncTaskLoader.waitForLoader method" into honeycomb 
* commit 'b92d08a7385f241722b2299a988ab7a55053f6ea':
  Hiding the AsyncTaskLoader.waitForLoader method
 2011-01-18 12:10:07 -08:00
Brad Fitzpatrick
758035757f StrictMode class instance limit interface. 
Change-Id: Ic5eea539586e5d4965d83364bf9f623d1d89f2b1
 2011-01-18 11:38:37 -08:00
John Reck
3977afe416 am d00207ff: Merge "WebStorage public API change" into honeycomb 
* commit 'd00207ff87fa3e2d5430ea5c0980041c44738efe':
  WebStorage public API change
 2011-01-18 11:18:59 -08:00
Dmitri Plotnikov
b92d08a738 am 48395385: Merge "Hiding the AsyncTaskLoader.waitForLoader method" into honeycomb 
* commit '48395385039a0c845bba8913c8d0c76981425aa4':
  Hiding the AsyncTaskLoader.waitForLoader method
 2011-01-18 11:18:37 -08:00
John Reck
d00207ff87 Merge "WebStorage public API change" into honeycomb 2011-01-18 11:10:26 -08:00
Dmitri Plotnikov
4afde4fda3 Hiding the AsyncTaskLoader.waitForLoader method 
I introduced this method a couple of weeks ago,
but then we had a chat with Dianne and she made
a good point that rather than having this behavior
on AsyncTaskLoader, we should have it on LoaderManager
and then it will cover all kinds of loaders,
not just the ones inheriting from AsyncTaskLoader.
She suggested that we postpone that work until
after Honeycomb.

Change-Id: I1939956296cddb678791ba652ab5f4a0dd45eea1
 2011-01-18 09:41:29 -08:00
Dianne Hackborn
44b628d2f6 am ad81f4ff: am f4c4b666: Merge "Remove old APIs." into honeycomb 
* commit 'ad81f4ffb8b8c32afea1a742dbb9bbc734b7a8a1':
  Remove old APIs.
 2011-01-18 07:52:19 -08:00
Dianne Hackborn
ad81f4ffb8 am f4c4b666: Merge "Remove old APIs." into honeycomb 
* commit 'f4c4b666234d0e5c510c846b13382b77175f10e1':
  Remove old APIs.
 2011-01-18 07:34:09 -08:00
Dianne Hackborn
3c3a7f55bb am 2d6dae2f: am 80ad0b0a: Merge "Fix a bunch of API review bugs." into honeycomb 
* commit '2d6dae2f4d2ce98adcb6fe83bcaa91a506805859':
  Fix a bunch of API review bugs.
 2011-01-17 23:32:02 -08:00
Dianne Hackborn
2d6dae2f4d am 80ad0b0a: Merge "Fix a bunch of API review bugs." into honeycomb 
* commit '80ad0b0aeb5a55d2e62aaaf18863253501b87b60':
  Fix a bunch of API review bugs.
 2011-01-17 20:00:20 -08:00
Dianne Hackborn
17b9b81418 Remove old APIs. 
Change-Id: If676e4e7886ad71c4959d4253db99639b49218b8
 2011-01-17 17:16:02 -08:00
Dianne Hackborn
327fbd2c8f Fix a bunch of API review bugs. 
3362464 API REVIEW: android.content potpourri
3362445 API REVIEW: Fragment transaction stuff
3362428 API REVIEW: Fragment stuff
3362418 API REVIEW: Loader stuff
3362414 API REVIEW: android.content.pm.ActivityInfo

Change-Id: I6475421a4735759b458acb67df4380cc6234f147
 2011-01-17 16:23:42 -08:00
Jeff Brown
0f6226b9f4 Merge "Add joystick support to framework." 2011-01-17 15:57:44 -08:00
Vasu Nori
2e3720f1e0 am 58f765a4: am 376fedf6: Merge "bug:3362635 add new public API to downloadmanager to get mxbytesovermobile" into honeycomb 
* commit '58f765a45e99a8342f5429102efd02df5a6a729d':
  bug:3362635 add new public API to downloadmanager to get mxbytesovermobile
 2011-01-17 15:38:40 -08:00
Vasu Nori
58f765a45e am 376fedf6: Merge "bug:3362635 add new public API to downloadmanager to get mxbytesovermobile" into honeycomb 
* commit '376fedf6595188ad714022b5d1ab012dc8689c3e':
  bug:3362635 add new public API to downloadmanager to get mxbytesovermobile
 2011-01-17 15:36:45 -08:00
Vasu Nori
0abbf809bf bug:3362635 add new public API to downloadmanager to get mxbytesovermobile 
bug:3362635
Change-Id: I7380964c6098d5ca6396b17980f78457c23d1a87
 2011-01-17 15:14:53 -08:00
Jeff Brown
cb1404e456 Add joystick support to framework. 
Change-Id: I95374436708752e1a9cff3f85c5b9bc3e0987961
 2011-01-17 13:51:00 -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
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
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