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

5989 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
Kenny Root
e6cd0c747e resolved conflicts for merge of 2433c443 to honeycomb-plus-aosp 
Change-Id: I3385f57e5761679e6700bcbe3c41deb3ecd43ba1
 2011-05-19 12:48:14 -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
Kenny Root
f2006f3123 Merge "Break apart queries to getInstalled* API" into gingerbread 2011-05-19 10:55:00 -07:00
Jean-Baptiste Queru
5c3816f2ff Merge c41aefe1 
Change-Id: I70fc4382f832d1a2bded8a5ee7d9b96fac77879b
 2011-05-19 07:54:53 -07:00
Dianne Hackborn
d37b84edf5 am ba8fc5b0: am 8416e5cf: am 6ad07db7: Merge "Fix fake display size when rotated." into honeycomb-mr2 
* commit 'ba8fc5b059228402afa965e175d5f6655e3fe555':
  Fix fake display size when rotated.
 2011-05-19 03:46:24 -07:00
Kazuhiro Ondo
8904c3d814 am b22a9fd9: am 01758e81: Linkproperties update via unsol data call state change. 
* commit 'b22a9fd9bb32133cbc7dc4fc7752dbf68e52dffe':
  Linkproperties update via unsol data call state change.
 2011-05-18 17:48:37 -07:00
Robert Greenwalt
c41aefe1d4 am 59b1a4ed: Switch to use netd to add/remove routes. 
* commit '59b1a4ede7032c1b4d897e13dd4ede09b5e14743':
  Switch to use netd to add/remove routes.
 2011-05-18 16:33:16 -07:00
Irfan Sheriff
ffcea7ae73 Move softap config handling to WifiConfigStore 
Move softap config to flat file and read/write on a seperate handler thread

Bug: 4391796

Change-Id: Iafe43200d7f829df7ced20a4e7b0ed451ad22a05
 2011-05-18 15:29:31 -07:00
Robert Greenwalt
59b1a4ede7 Switch to use netd to add/remove routes. 
Also adds support for v6 routes and for removing single routes.

Change-Id: I1c4f08c7938371090944d8d6f603e1e0d6d70c01
 2011-05-18 15:25:43 -07:00
Dianne Hackborn
ba8fc5b059 am 8416e5cf: am 6ad07db7: Merge "Fix fake display size when rotated." into honeycomb-mr2 
* commit '8416e5cf0a8439a3f605629068d3639f2a35e08b':
  Fix fake display size when rotated.
 2011-05-18 15:16:05 -07:00
Dianne Hackborn
8416e5cf0a am 6ad07db7: Merge "Fix fake display size when rotated." into honeycomb-mr2 
* commit '6ad07db7a2c289d036f081eb0c7a666cdb77b548':
  Fix fake display size when rotated.
 2011-05-18 15:12:07 -07:00
Dianne Hackborn
8f7c271ac9 Fix fake display size when rotated. 
Change-Id: Ic8a1dbe32cf0cb3c5cdc9b9294b98e810558f875
 2011-05-18 15:07:48 -07:00
Dianne Hackborn
fb03c4fafe am 4f9bb17f: am c2db2144: am a429d5df: Merge "Improve compat mode scaling implementation." into honeycomb-mr2 
* commit '4f9bb17f7e74746c4296100f2fbd47f0f6ead3a7':
  Improve compat mode scaling implementation.
 2011-05-18 10:36:14 -07:00
Mike Lockwood
fa1e5561cc am 53b988ba: am 5a79cfd7: am 27ac64ec: Merge "StorageVolume: Add getStorageId() accessor" into honeycomb-mr2 
* commit '53b988ba1842f40e595bb85f2ca055c24787e6dc':
  StorageVolume: Add getStorageId() accessor
 2011-05-18 09:23:35 -07:00
Kazuhiro Ondo
b22a9fd9bb am 01758e81: Linkproperties update via unsol data call state change. 
* commit '01758e81b3ad89934581885bb2fc7006510ec639':
  Linkproperties update via unsol data call state change.
 2011-05-18 00:02:31 -07:00
Kazuhiro Ondo
01758e81b3 Linkproperties update via unsol data call state change. 
Handles the scenario of radio technology handover with IP continuity.
Once RIL/Modem finished a handover operation, an unsol data call state
change will be send up to FW notifying all link propertes changes.
FW will then re-configure the device with new link properties
including iptable used by Tethering.

Change-Id: I05e29f66ac3db8ba4274d3662642607742ba1d12
 2011-05-17 20:53:40 -07:00
Dianne Hackborn
4f9bb17f7e am c2db2144: am a429d5df: Merge "Improve compat mode scaling implementation." into honeycomb-mr2 
* commit 'c2db21445ddd4327e949b38edcf1ab9fd18f94f0':
  Improve compat mode scaling implementation.
 2011-05-17 18:42:23 -07:00
Dianne Hackborn
c2db21445d am a429d5df: Merge "Improve compat mode scaling implementation." into honeycomb-mr2 
* commit 'a429d5df1aa59d817d694b96a07351224cc5d146':
  Improve compat mode scaling implementation.
 2011-05-17 18:40:12 -07:00
Dianne Hackborn
a429d5df1a Merge "Improve compat mode scaling implementation." into honeycomb-mr2 2011-05-17 18:38:37 -07:00
Dianne Hackborn
ffb3d939cc Improve compat mode scaling implementation. 
Rip out the old funky code for trying to restrict the app window
sizes to be within the compat mode range.  Instead, we know rely
entirely on scaling -- we deal with windows always with the scaling
applied so that the window manager doesn't have to deal with them
specially.  Instead, we just apply the inverse scale at the few
points we need to do something the app sees.

Change-Id: I785409dd4513b5f738684e1635dc8f770c249651
 2011-05-17 18:29:51 -07:00
Mike Lockwood
53b988ba18 am 5a79cfd7: am 27ac64ec: Merge "StorageVolume: Add getStorageId() accessor" into honeycomb-mr2 
* commit '5a79cfd7518defdce1911cecbc2441bb0a057e54':
  StorageVolume: Add getStorageId() accessor
 2011-05-17 16:49:40 -07:00
Mike Lockwood
5a79cfd751 am 27ac64ec: Merge "StorageVolume: Add getStorageId() accessor" into honeycomb-mr2 
* commit '27ac64eceee8d4e392983861c6bc6bd620e4c6f7':
  StorageVolume: Add getStorageId() accessor
 2011-05-17 16:44:51 -07:00
Jamie Gennis
433060a152 Merge "SurfaceFlinger: unfreeze windows for fixed size buffers." 2011-05-17 15:13:35 -07:00
Mike Lockwood
fbfe555125 StorageVolume: Add getStorageId() accessor 
This ID is used for MTP as well as per volume querying in the media provider.

Change-Id: Ic4fc986d972bd477730643f7e9450c390c0b3a4b
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-05-17 17:19:37 -04:00
Jeff Sharkey
78ae81efa9 Merge "First pass at NetworkPolicy and activity tracking." 2011-05-17 12:27:01 -07:00
Dianne Hackborn
9d31154d0b am b68c768d: am 41744836: am 7916ac65: Add new command line option to change global screen size. 
* commit 'b68c768ddb57407bc253230c677056329c9e4bae':
  Add new command line option to change global screen size.
 2011-05-16 21:39:47 -07:00
Dianne Hackborn
b68c768ddb am 41744836: am 7916ac65: Add new command line option to change global screen size. 
* commit '417448369c170a34d76c477aa19c5293e3caa1df':
  Add new command line option to change global screen size.
 2011-05-16 21:29:32 -07:00
Dianne Hackborn
417448369c am 7916ac65: Add new command line option to change global screen size. 
* commit '7916ac65dc492e4e1431879875c77d7121fbf82e':
  Add new command line option to change global screen size.
 2011-05-16 21:21:24 -07:00
Dianne Hackborn
7916ac65dc Add new command line option to change global screen size. 
For example:

adb shell am display-size 1024x600

Change-Id: I5df462acd3323bdaaaefa3126faea7dd8595b726
 2011-05-16 20:55:41 -07:00
Jamie Gennis
e69b2634d2 SurfaceFlinger: unfreeze windows for fixed size buffers. 
This change makes SurfaceFlinger unfreeze a window if it ever gets a
buffer that is fixed-size.  Normally the window would not be frozen if
its in fixed-size mode, but if the window was frozen before entering
fixed-size mode then it should be unfrozen.

Change-Id: I6bc822d4b02ae51fa8914c1f60f5d24b2002b38d
 2011-05-16 16:59:04 -07:00
Dianne Hackborn
60e13114eb am 1d340a3c: am 0eac0927: Merge "DO NOT MERGE. From main -- Start work on simulating landscape/portrait when orientation is locked." into honeycomb-mr2 
* commit '1d340a3c24913d8750900355cd92ef5742eea11f':
  DO NOT MERGE.  From main -- Start work on simulating landscape/portrait when orientation is locked.
 2011-05-16 13:16:45 -07:00