summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix a bug on SwitchToLastInputMethodsatok2011-05-201-1/+1
| | | | Change-Id: Iab7531e7436375941ec3df4fba943af24e2f1231
* Fix switchToLastInputMethod to fall back into the applicable keyboard if ↵satok2011-05-201-18/+57
| | | | | | there is no candidate ime Change-Id: Iaf293cf6c6fb35a994f344b0afc30e9f523032f4
* Fix another merge problem.Dianne Hackborn2011-05-191-3/+3
| | | | Change-Id: I3a65f3f588dd84bf163502e9c7ab99c8a22bae26
* resolved conflicts for merge of 06a8ceac to masterDianne Hackborn2011-05-1921-177/+466
|\ | | | | | | Change-Id: Id51574c825affddfac14ad7214c5496d6a3d6e69
| * am c851ea56: am 69cb8757: Add new "-swNNNdp" resource qualifier.Dianne Hackborn2011-05-1921-177/+495
| |\ | | | | | | | | | | | | * commit 'c851ea5672f6e042c2e89b2a2ce4a2467e1fcd2a': Add new "-swNNNdp" resource qualifier.
| | * am 69cb8757: Add new "-swNNNdp" resource qualifier.Dianne Hackborn2011-05-1921-177/+495
| | |\ | | | | | | | | | | | | | | | | * commit '69cb87576ba163b61bb0e6477a3b7c57a9b11d40': Add new "-swNNNdp" resource qualifier.
| | | * Add new "-swNNNdp" resource qualifier.Dianne Hackborn2011-05-1921-177/+495
| | | | | | | | | | | | | | | | Change-Id: I0101e88ca9d8d44138bdcaf571f24b0352f4f6ce
* | | | Merge "Fix a race that could cause GL commands to be executed from the wrong ↵Mathias Agopian2011-05-196-108/+79
|\ \ \ \ | | | | | | | | | | | | | | | thread."
| * | | | Fix a race that could cause GL commands to be executed from the wrong thread.Mathias Agopian2011-05-196-108/+79
| | | | | | | | | | | | | | | | | | | | Change-Id: Ia3d407f7bf2f5553f46cfdade70b7b0badb35beb
* | | | | Merge "RefBase subclasses can now decide how they want to be destroyed."Mathias Agopian2011-05-192-3/+13
|\ \ \ \ \ | |/ / / /
| * | | | RefBase subclasses can now decide how they want to be destroyed.Mathias Agopian2011-05-192-3/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds a destroy() virtual on RefBase which sublasses can implement. destroy() is called in lieu of the destructor whenthe last strong ref goes away.
* | | | | Merge "TouchExplorer - refactoring and a couple of bug fixes"Svetoslav Ganov2011-05-191-157/+76
|\ \ \ \ \
| * | | | | TouchExplorer - refactoring and a couple of bug fixesSvetoslav Ganov2011-05-191-157/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Refactored the code to avoid code duplication. 2. Fixed a bug in removing unused pointers from the event. 3. Fixed a bug that was crashing the explorer. 4. Sending hover exit immediately at the end of touch exploration gesture rather with a delay. Change-Id: Ie288cb8090d6fb5e5c715afa6ea5660b17c019e0
* | | | | | am 90177e59: (-s ours) am d40575eb: am b9537db8: Merge "DO NOT MERGE Action ↵Adam Powell2011-05-190-0/+0
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | bar config changes" into honeycomb-mr2 * commit '90177e59e5211dd9ab33761ce800e8a86a49d1e2': DO NOT MERGE Action bar config changes
| * | | | | am d40575eb: am b9537db8: Merge "DO NOT MERGE Action bar config changes" ↵Adam Powell2011-05-195-39/+52
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | into honeycomb-mr2 * commit 'd40575eb983eb7a1d383acc1f30f467374acd085': DO NOT MERGE Action bar config changes
| | * | | | am b9537db8: Merge "DO NOT MERGE Action bar config changes" into honeycomb-mr2Adam Powell2011-05-195-39/+52
| | |\ \ \ \ | | | | |_|/ | | | |/| | | | | | | | | | | | | | * commit 'b9537db8d9ee27efb4a98415ad2d6b50c1806e5d': DO NOT MERGE Action bar config changes
| | | * | | Merge "DO NOT MERGE Action bar config changes" into honeycomb-mr2Adam Powell2011-05-195-39/+52
| | | |\ \ \
| | | | * | | DO NOT MERGE Action bar config changesAdam Powell2011-05-195-39/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Handle action bar padding on configuration changes when the app handles these changes itself. Change-Id: I044da9253a0be6b4bbabdc12891b6d4786725afa
* | | | | | | Merge "Fix a crasher in SensorService"Mathias Agopian2011-05-191-2/+1
|\ \ \ \ \ \ \
| * | | | | | | Fix a crasher in SensorServiceMathias Agopian2011-05-191-2/+1
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SensorService main thread wasn't java-enabled. however, in some situations we end-up calling into the BatteryService from that thread which causes a crash. Change-Id: Iffba90e4c4b743dba84d62f1342001a9db31916d
* | | | | | | Merge "Code cleanup."Romain Guy2011-05-193-206/+13
|\ \ \ \ \ \ \
| * | | | | | | Code cleanup.Romain Guy2011-05-193-206/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia6ea04b83832db2f39e3168ef2596c24273a7ef3
* | | | | | | | Merge changes Id3a4a573,I7adf4ef0Mathias Agopian2011-05-1915-2105/+2468
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: eglTerminate() now actually frees up all active egl objects refactor EGL source code
| * | | | | | | | eglTerminate() now actually frees up all active egl objectsMathias Agopian2011-05-166-160/+176
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | as specified by the EGL specification, terminated objects's handles become invalid, the objects themselves are destroyed when they're not current to some thread. Change-Id: Id3a4a5736a5bbc3926a9ae8385d43772edb88eeb
| * | | | | | | | refactor EGL source codeMathias Agopian2011-05-1615-2074/+2421
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | no changes is functionality. split various objects into their own files. make egl_display objec's lock internal.
* | | | | | | | | Merge "expandGroup can now animate"John Reck2011-05-192-2/+26
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | expandGroup can now animateJohn Reck2011-05-192-2/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a boolean to have expandGroup animate the same as performItemClick does Change-Id: I652c6fa8f9a7b527572337b11900d653b5285352
* | | | | | | | | | am 5b9ceeba: am a4815c0e: am 9c9088a5: Merge "Move softap config handling to ↵Irfan Sheriff2011-05-195-82/+257
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WifiConfigStore" into honeycomb-mr2 * commit '5b9ceebafd36db4491a49c1f00750ce50c4d4433': Move softap config handling to WifiConfigStore
| * | | | | | | | | am a4815c0e: am 9c9088a5: Merge "Move softap config handling to ↵Irfan Sheriff2011-05-195-82/+257
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WifiConfigStore" into honeycomb-mr2 * commit 'a4815c0ec06c293ea9f50b2b925d5a98d11f1143': Move softap config handling to WifiConfigStore
| | * | | | | | | | am 9c9088a5: Merge "Move softap config handling to WifiConfigStore" into ↵Irfan Sheriff2011-05-195-82/+257
| | |\ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | honeycomb-mr2 * commit '9c9088a54f6dee7a13dcc7a12297137147b01baa': Move softap config handling to WifiConfigStore
| | | * | | | | | | Merge "Move softap config handling to WifiConfigStore" into honeycomb-mr2Irfan Sheriff2011-05-195-82/+257
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | Move softap config handling to WifiConfigStoreIrfan Sheriff2011-05-185-82/+257
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move softap config to flat file and read/write on a seperate handler thread Bug: 4391796 Change-Id: Iafe43200d7f829df7ced20a4e7b0ed451ad22a05
* | | | | | | | | | | am 7189d571: (-s ours) am f0c6ddd9: am 51fb9703: Merge "DO NOT MERGE: Add ↵Chet Haase2011-05-190-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | custom fragment anims for popping backstack" into honeycomb-mr2 * commit '7189d571e2748972e1599ead3d503a9b185fdd3c': DO NOT MERGE: Add custom fragment anims for popping backstack
| * | | | | | | | | | am f0c6ddd9: am 51fb9703: Merge "DO NOT MERGE: Add custom fragment anims for ↵Chet Haase2011-05-193-3/+60
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | popping backstack" into honeycomb-mr2 * commit 'f0c6ddd99b6770ee4de74ce42134f9f56b8ebc5d': DO NOT MERGE: Add custom fragment anims for popping backstack
| | * | | | | | | | | am 51fb9703: Merge "DO NOT MERGE: Add custom fragment anims for popping ↵Chet Haase2011-05-193-3/+60
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | backstack" into honeycomb-mr2 * commit '51fb97031f62b1181fc9eb6c636d09a68987d939': DO NOT MERGE: Add custom fragment anims for popping backstack
| | | * | | | | | | | Merge "DO NOT MERGE: Add custom fragment anims for popping backstack" into ↵Chet Haase2011-05-193-3/+60
| | | |\ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ / | | | |/| | | | | | | | | | | | | | | | | | honeycomb-mr2
| | | | * | | | | | | DO NOT MERGE: Add custom fragment anims for popping backstackChet Haase2011-05-193-3/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous fragment implementation allowed for animations during fragment transitions, but did not account for the different behavior of fragments when popping the back stack. In general, you probably don't want to run the same animation for putting a fragment on the stack as for popping it off, which is what happens now. For example, you might fade a fragment out when putting it on the stack. But when popping ot off, fading it out is probably not the behavior you want. The new API (setCustomAnimations() overload with two additional parameters) allows developers to specify animations to be run in the popping operation. Otherwise, the animations are null and the operation will not be animated. Change-Id: I53bbc6e6ec4e953b7ecdd99e2452d81857917de2
* | | | | | | | | | | resolved conflicts for merge of b2d0ee16 to masterKenny Root2011-05-196-47/+342
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4483a6d0ccecfea4a1e66bb6eba80d13e8b9a3a4
| * | | | | | | | | | Merge "resolved conflicts for merge of 2433c443 to honeycomb-plus-aosp" into ↵Kenny Root2011-05-196-51/+344
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | honeycomb-plus-aosp
| | * \ \ \ \ \ \ \ \ \ resolved conflicts for merge of 2433c443 to honeycomb-plus-aospKenny Root2011-05-196-51/+344
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3385f57e5761679e6700bcbe3c41deb3ecd43ba1
| | | * \ \ \ \ \ \ \ \ \ am f2006f31: Merge "Break apart queries to getInstalled* API" into gingerbreadKenny Root2011-05-196-51/+344
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f2006f3123dcdf598e052051041b49c89710b53e': Break apart queries to getInstalled* API
| | | | * \ \ \ \ \ \ \ \ \ Merge "Break apart queries to getInstalled* API" into gingerbreadKenny Root2011-05-196-51/+344
| | | | |\ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | Break apart queries to getInstalled* APIKenny Root2011-04-196-51/+344
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To avoid blowing past the Binder IPC limit, change the PackageManagerService to have a DB-like interaction where the client tells the service the last "row" that it read. The fact that we use a HashMap instead of a TreeMap makes this problematic. For now we're just making a new ArrayList for the keys and then sorting them for each call. This can make the API slower for callers of this, but it's probably greatly overshadowed by the cost of the data transfer itself. Bug: 4064282 Change-Id: Ic370fd148d4c3813ae4f2daffa1a7c28d63d5a09
* | | | | | | | | | | | | | | Merge "Move context and device creation out of the spec file."Jason Sams2011-05-194-62/+26
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Move context and device creation out of the spec file.Jason Sams2011-05-184-62/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I79470d4fb9317bcad9d68921ce0c414aa133f3cb
* | | | | | | | | | | | | | | | Merge "Publish setLocation() method as a public Java API"James Dong2011-05-192-5/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Publish setLocation() method as a public Java APIJames Dong2011-05-182-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | related-to-bug: 4260295 Change-Id: I91b923af8549127eb08f0d7e535cd53ad229e1f6
* | | | | | | | | | | | | | | | | am 09ded82b: am ab5baa1d: Merge "Reset connection while data state changed." ↵Wink Saville2011-05-195-114/+112
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into honeycomb-LTE * commit '09ded82b784b9f6e01d4cd4298097fd2b459560b': Reset connection while data state changed.
| * | | | | | | | | | | | | | | | am ab5baa1d: Merge "Reset connection while data state changed." into ↵Wink Saville2011-05-195-114/+112
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / / / | |/| | | | | | / / / / / / / / / | | | |_|_|_|_|/ / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | honeycomb-LTE * commit 'ab5baa1d5fbd433e4c391ea06d177aa6a6c1c736': Reset connection while data state changed.
| | * | | | | | | | | | | | | | Merge "Reset connection while data state changed." into honeycomb-LTEWink Saville2011-05-195-114/+112
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
generated by cgit v1.1 at 2025-03-24 11:08:28 +0000