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

50652 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
satok
0ca2fda0f7 am 33bdc3c9: (-s ours) am d9435bce: am b4788fdb: Do not merge. Backport two fixes for InputMethethodFramework 
* commit '33bdc3c9995cbef477cec756b65d767558e6b836':
  Do not merge. Backport two fixes for InputMethethodFramework
 2011-05-20 07:03:38 -07:00
satok
33bdc3c999 am d9435bce: am b4788fdb: Do not merge. Backport two fixes for InputMethethodFramework 
* commit 'd9435bcecc820c8715d8b6b920fd43042418a1e9':
  Do not merge. Backport two fixes for InputMethethodFramework
 2011-05-20 06:51:14 -07:00
satok
d9435bcecc am b4788fdb: Do not merge. Backport two fixes for InputMethethodFramework 
* commit 'b4788fdbfdda97bd9cfd0e483276934114d9c438':
  Do not merge. Backport two fixes for InputMethethodFramework
 2011-05-20 06:41:03 -07:00
satok
208d563404 Fix a bug on SwitchToLastInputMethod 
Change-Id: Iab7531e7436375941ec3df4fba943af24e2f1231
 2011-05-20 22:13:38 +09:00
satok
b4788fdbfd Do not merge. Backport two fixes for InputMethethodFramework 
Bug: 3420384

backport cl1: Iaf293cf6c6fb35a994f344b0afc30e9f523032f4
backport cl2: I29d2555aeb7d0e51205d9f1fe0da708df0890942

Change-Id: Ia71ba27957fa818dc4ef8ff05b5fdb120b9650e0
 2011-05-20 22:11:54 +09:00
satok
4fc87d61c2 Fix switchToLastInputMethod to fall back into the applicable keyboard if there is no candidate ime 
Change-Id: Iaf293cf6c6fb35a994f344b0afc30e9f523032f4
 2011-05-20 18:03:37 +09:00
Dianne Hackborn
fef966ae46 Fix another merge problem. 
Change-Id: I3a65f3f588dd84bf163502e9c7ab99c8a22bae26
 2011-05-19 22:02:22 -07:00
Dianne Hackborn
161e67ff3b resolved conflicts for merge of 06a8ceac to master 
Change-Id: Id51574c825affddfac14ad7214c5496d6a3d6e69
 2011-05-19 21:44:52 -07:00
Mathias Agopian
9e735541be Merge "Fix a race that could cause GL commands to be executed from the wrong thread." 2011-05-19 19:42:20 -07:00
Mathias Agopian
16fa5aae96 Merge "RefBase subclasses can now decide how they want to be destroyed." 2011-05-19 19:41:37 -07:00
Mathias Agopian
6960811d15 Fix a race that could cause GL commands to be executed from the wrong thread. 
Change-Id: Ia3d407f7bf2f5553f46cfdade70b7b0badb35beb
 2011-05-19 19:40:02 -07:00
Mathias Agopian
6db8c50539 RefBase subclasses can now decide how they want to be destroyed. 
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.
 2011-05-19 19:40:01 -07:00
Dianne Hackborn
06a8ceacb0 am c851ea56: am 69cb8757: Add new "-swNNNdp" resource qualifier. 
* commit 'c851ea5672f6e042c2e89b2a2ce4a2467e1fcd2a':
  Add new "-swNNNdp" resource qualifier.
 2011-05-19 19:34:21 -07:00
Dianne Hackborn
c851ea5672 am 69cb8757: Add new "-swNNNdp" resource qualifier. 
* commit '69cb87576ba163b61bb0e6477a3b7c57a9b11d40':
  Add new "-swNNNdp" resource qualifier.
 2011-05-19 19:30:32 -07:00
Svetoslav Ganov
e219b5452c Merge "TouchExplorer - refactoring and a couple of bug fixes" 2011-05-19 18:29:45 -07:00
Svetoslav Ganov
91feae3c59 TouchExplorer - refactoring and a couple of bug fixes 
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
 2011-05-19 18:29:01 -07:00
Dianne Hackborn
69cb87576b Add new "-swNNNdp" resource qualifier. 
Change-Id: I0101e88ca9d8d44138bdcaf571f24b0352f4f6ce
 2011-05-19 18:23:29 -07:00
Adam Powell
d36263fa3e am 90177e59: (-s ours) am d40575eb: am b9537db8: Merge "DO NOT MERGE Action bar config changes" into honeycomb-mr2 
* commit '90177e59e5211dd9ab33761ce800e8a86a49d1e2':
  DO NOT MERGE Action bar config changes
 2011-05-19 17:21:09 -07:00
Adam Powell
90177e59e5 am d40575eb: am b9537db8: Merge "DO NOT MERGE Action bar config changes" into honeycomb-mr2 
* commit 'd40575eb983eb7a1d383acc1f30f467374acd085':
  DO NOT MERGE Action bar config changes
 2011-05-19 17:17:30 -07:00
Adam Powell
d40575eb98 am b9537db8: Merge "DO NOT MERGE Action bar config changes" into honeycomb-mr2 
* commit 'b9537db8d9ee27efb4a98415ad2d6b50c1806e5d':
  DO NOT MERGE Action bar config changes
 2011-05-19 17:06:09 -07:00
Mathias Agopian
f74bf9a47d Merge "Fix a crasher in SensorService" 2011-05-19 16:23:25 -07:00
Mathias Agopian
057f625cd9 Fix a crasher in SensorService 
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
 2011-05-19 16:21:32 -07:00
Romain Guy
71fcc865e3 Merge "Code cleanup." 2011-05-19 16:16:43 -07:00
Romain Guy
88b4f153e2 Code cleanup. 
Change-Id: Ia6ea04b83832db2f39e3168ef2596c24273a7ef3
 2011-05-19 16:15:46 -07:00
Adam Powell
b9537db8d9 Merge "DO NOT MERGE Action bar config changes" into honeycomb-mr2 2011-05-19 15:48:38 -07:00
Mathias Agopian
c23774baad Merge changes Id3a4a573,I7adf4ef0 
* changes:
  eglTerminate() now actually frees up all active egl objects
  refactor EGL source code
 2011-05-19 15:47:43 -07:00
Adam Powell
dacbb746c9 DO NOT MERGE Action bar config changes 
Handle action bar padding on configuration changes when the app
handles these changes itself.

Change-Id: I044da9253a0be6b4bbabdc12891b6d4786725afa
 2011-05-19 15:38:27 -07:00
John Reck
9414b04178 Merge "expandGroup can now animate" 2011-05-19 15:23:58 -07:00
Irfan Sheriff
e526cfb490 am 5b9ceeba: am a4815c0e: am 9c9088a5: Merge "Move softap config handling to WifiConfigStore" into honeycomb-mr2 
* commit '5b9ceebafd36db4491a49c1f00750ce50c4d4433':
  Move softap config handling to WifiConfigStore
 2011-05-19 15:17:33 -07:00
Chet Haase
ead8b50da6 am 7189d571: (-s ours) am f0c6ddd9: am 51fb9703: Merge "DO NOT MERGE: Add custom fragment anims for popping backstack" into honeycomb-mr2 
* commit '7189d571e2748972e1599ead3d503a9b185fdd3c':
  DO NOT MERGE: Add custom fragment anims for popping backstack
 2011-05-19 15:17:14 -07:00
Kenny Root
a51b6fd6f8 resolved conflicts for merge of b2d0ee16 to master 
Change-Id: I4483a6d0ccecfea4a1e66bb6eba80d13e8b9a3a4
 2011-05-19 15:02:18 -07:00
Irfan Sheriff
5b9ceebafd am a4815c0e: am 9c9088a5: Merge "Move softap config handling to WifiConfigStore" into honeycomb-mr2 
* commit 'a4815c0ec06c293ea9f50b2b925d5a98d11f1143':
  Move softap config handling to WifiConfigStore
 2011-05-19 15:01:48 -07:00
Irfan Sheriff
a4815c0ec0 am 9c9088a5: Merge "Move softap config handling to WifiConfigStore" into honeycomb-mr2 
* commit '9c9088a54f6dee7a13dcc7a12297137147b01baa':
  Move softap config handling to WifiConfigStore
 2011-05-19 14:57:54 -07:00
Irfan Sheriff
9c9088a54f Merge "Move softap config handling to WifiConfigStore" into honeycomb-mr2 2011-05-19 14:54:25 -07:00
Chet Haase
7189d571e2 am f0c6ddd9: am 51fb9703: Merge "DO NOT MERGE: Add custom fragment anims for popping backstack" into honeycomb-mr2 
* commit 'f0c6ddd99b6770ee4de74ce42134f9f56b8ebc5d':
  DO NOT MERGE: Add custom fragment anims for popping backstack
 2011-05-19 14:03:04 -07:00
Chet Haase
f0c6ddd99b am 51fb9703: Merge "DO NOT MERGE: Add custom fragment anims for popping backstack" into honeycomb-mr2 
* commit '51fb97031f62b1181fc9eb6c636d09a68987d939':
  DO NOT MERGE: Add custom fragment anims for popping backstack
 2011-05-19 13:59:06 -07:00
Chet Haase
51fb97031f Merge "DO NOT MERGE: Add custom fragment anims for popping backstack" into honeycomb-mr2 2011-05-19 13:57:03 -07:00
Chet Haase
19e748a3d1 DO NOT MERGE: Add custom fragment anims for popping backstack 
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
 2011-05-19 13:44:40 -07:00
Kenny Root
b2d0ee164a Merge "resolved conflicts for merge of 2433c443 to honeycomb-plus-aosp" into honeycomb-plus-aosp 2011-05-19 12:48:41 -07:00
Kenny Root
e6cd0c747e resolved conflicts for merge of 2433c443 to honeycomb-plus-aosp 
Change-Id: I3385f57e5761679e6700bcbe3c41deb3ecd43ba1
 2011-05-19 12:48:14 -07:00
Jason Sams
3a9e712aca Merge "Move context and device creation out of the spec file." 2011-05-19 12:27:22 -07:00
James Dong
3c707256cf Merge "Publish setLocation() method as a public Java API" 2011-05-19 11:51:37 -07:00
Wink Saville
b568b51255 am 09ded82b: am ab5baa1d: Merge "Reset connection while data state changed." into honeycomb-LTE 
* commit '09ded82b784b9f6e01d4cd4298097fd2b459560b':
  Reset connection while data state changed.
 2011-05-19 11:32:27 -07:00
Wink Saville
09ded82b78 am ab5baa1d: Merge "Reset connection while data state changed." into honeycomb-LTE 
* commit 'ab5baa1d5fbd433e4c391ea06d177aa6a6c1c736':
  Reset connection while data state changed.
 2011-05-19 11:28:36 -07:00
Wink Saville
ab5baa1d5f Merge "Reset connection while data state changed." into honeycomb-LTE 2011-05-19 11:25:45 -07:00
Gloria Wang
612956c914 Merge "Add one more MIME type (audio/aac-adts) for aac file. Fix for bug 4463059." 2011-05-19 11:15:16 -07:00
Joe Fernandez
36cca79ca7 am 0a36cec6: am 605be31c: am 146a0b45: am fde9ac72: Merge "docs: Cherrypicking change from honeycomb Change-Id: I6b62a5c608d3f17f5ff3c81773dc3055d0428d74" into honeycomb-mr1 
* commit '0a36cec642fb58e295d0608026890d95d0ae3cc0':
  docs: Cherrypicking change from honeycomb Change-Id: I6b62a5c608d3f17f5ff3c81773dc3055d0428d74
 2011-05-19 11:13:41 -07:00
Joe Fernandez
0a36cec642 am 605be31c: am 146a0b45: am fde9ac72: Merge "docs: Cherrypicking change from honeycomb Change-Id: I6b62a5c608d3f17f5ff3c81773dc3055d0428d74" into honeycomb-mr1 
* commit '605be31c4a80e03dc0af76a73aaa33316ca4a635':
  docs: Cherrypicking change from honeycomb Change-Id: I6b62a5c608d3f17f5ff3c81773dc3055d0428d74
 2011-05-19 11:06:04 -07:00
Kenny Root
2433c443bb am f2006f31: Merge "Break apart queries to getInstalled* API" into gingerbread 
* commit 'f2006f3123dcdf598e052051041b49c89710b53e':
  Break apart queries to getInstalled* API
 2011-05-19 11:04:01 -07:00
Joe Fernandez
605be31c4a am 146a0b45: am fde9ac72: Merge "docs: Cherrypicking change from honeycomb Change-Id: I6b62a5c608d3f17f5ff3c81773dc3055d0428d74" into honeycomb-mr1 
* commit '146a0b4522db2d782953a464fe63adcd7e1569c2':
  docs: Cherrypicking change from honeycomb Change-Id: I6b62a5c608d3f17f5ff3c81773dc3055d0428d74
 2011-05-19 10:59:16 -07:00