Jeff Brown
4e3ba25cc7
am 4bd89fb0: am 82e4373e: Merge "Use touch pad gestures to manipulate the pointer. (DO NOT MERGE)" into honeycomb-mr2
...
* commit '4bd89fb00f319c5d6d4f17b39fd4c0b3dc827ad1':
Use touch pad gestures to manipulate the pointer. (DO NOT MERGE)
2011-05-25 14:42:01 -07:00
Jeff Brown
4bd89fb00f
am 82e4373e: Merge "Use touch pad gestures to manipulate the pointer. (DO NOT MERGE)" into honeycomb-mr2
...
* commit '82e4373ed3775395a23d161e58c003e82511921a':
Use touch pad gestures to manipulate the pointer. (DO NOT MERGE)
2011-05-25 14:34:48 -07:00
Jeff Brown
82e4373ed3
Merge "Use touch pad gestures to manipulate the pointer. (DO NOT MERGE)" into honeycomb-mr2
2011-05-25 14:31:38 -07:00
Joe Onorato
cfb046dead
am 2c09a9c0: am 5520610c: Merge "Make adb shell am display-size persistent." into honeycomb-mr2
...
* commit '2c09a9c0e960163a16ad1d06055aa6ee9635c693':
Make adb shell am display-size persistent.
2011-05-25 11:46:28 -07:00
Joe Onorato
2c09a9c0e9
am 5520610c: Merge "Make adb shell am display-size persistent." into honeycomb-mr2
...
* commit '5520610cb2612054c5d0bcec9d031f7b71faa349':
Make adb shell am display-size persistent.
2011-05-25 11:43:06 -07:00
Joe Onorato
5520610cb2
Merge "Make adb shell am display-size persistent." into honeycomb-mr2
2011-05-25 11:40:59 -07:00
Joe Onorato
571ae90801
Make adb shell am display-size persistent.
...
Change-Id: If3d5d18729f4e89eb7e689994deadd996fd487e9
2011-05-25 11:40:21 -07:00
Dianne Hackborn
103e74d9b1
am d6f29cd8: am 2a15eb55: Merge "Fix issue #4445007 : DPM initializes some values to 1, instead of 0" into honeycomb-mr2
...
* commit 'd6f29cd8f92b098330818227428f5a42836097b7':
Fix issue #4445007 : DPM initializes some values to 1, instead of 0
2011-05-25 11:18:59 -07:00
Dianne Hackborn
d6f29cd8f9
am 2a15eb55: Merge "Fix issue #4445007 : DPM initializes some values to 1, instead of 0" into honeycomb-mr2
...
* commit '2a15eb559cfc18800b3e345995df76695a3ae4b2':
Fix issue #4445007 : DPM initializes some values to 1, instead of 0
2011-05-25 11:14:13 -07:00
Dianne Hackborn
d998acb349
Fix issue #4445007 : DPM initializes some values to 1, instead of 0
...
Also fix not writing the settings file when an admin is removed.
And take care of an old to-do about not removing an admin until
after it has received the broadcast about it being disabled.
Change-Id: I4ebe0ea0461222b65425b2c5438b646b572f18c8
2011-05-25 10:51:27 -07:00
Mike Lockwood
859443f2a4
am c0d9834a: am 5d78e0b8: Merge "GPS: Change NTP polling interval from 4 to 24 hours" into honeycomb-mr2
...
* commit 'c0d9834a1c6dd8d9cd0b7fe9b50495578c104405':
GPS: Change NTP polling interval from 4 to 24 hours
2011-05-23 18:45:17 -07:00
Mike Lockwood
c0d9834a1c
am 5d78e0b8: Merge "GPS: Change NTP polling interval from 4 to 24 hours" into honeycomb-mr2
...
* commit '5d78e0b8ea548da3fa88ae2190a9334297b992b6':
GPS: Change NTP polling interval from 4 to 24 hours
2011-05-23 18:04:44 -07:00
Mike Lockwood
5d78e0b8ea
Merge "GPS: Change NTP polling interval from 4 to 24 hours" into honeycomb-mr2
2011-05-23 18:01:50 -07:00
Mike Lockwood
4c12606852
GPS: Change NTP polling interval from 4 to 24 hours
...
4 hours is excessive, and we want to save bandwidth on the NTP servers
Change-Id: Ic5ac4f4a8e62167206f3f620ea51635a2ea771d6
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-05-23 20:57:43 -04:00
Jeff Brown
96ad3979f3
Use touch pad gestures to manipulate the pointer. (DO NOT MERGE)
...
1. Single finger tap performs a click.
2. Single finger movement moves the pointer (hovers).
3. Button press plus movement performs click or drag.
While dragging, the pointer follows the finger that is moving
fastest. This is important if there are additional fingers
down on the touch pad for the purpose of applying force
to an integrated button underneath.
4. Two fingers near each other moving in the same direction
are coalesced as a swipe gesture under the pointer.
5. Two or more fingers moving in arbitrary directions are
transformed into touches in the vicinity of the pointer.
This makes scale/zoom and rotate gestures possible.
Added a native VelocityTracker implementation to enable intelligent
switching of the active pointer during drags.
Change-Id: I7b7ddacc724fb1306e1590dbaebb740d3130d7cd
2011-05-23 17:19:38 -07:00
Mike Lockwood
49b9449b66
am d8d84708: am 988b6648: Merge "MountService: Add StorageVolume as extra in storage related broadcasts." into honeycomb-mr2
...
* commit 'd8d8470825a637843d45a3b436e80a3b85f1dd11':
MountService: Add StorageVolume as extra in storage related broadcasts.
2011-05-23 17:09:30 -07:00
Mike Lockwood
d8d8470825
am 988b6648: Merge "MountService: Add StorageVolume as extra in storage related broadcasts." into honeycomb-mr2
...
* commit '988b6648b0138fe1294228e17164b2f1d6a4042d':
MountService: Add StorageVolume as extra in storage related broadcasts.
2011-05-23 17:06:47 -07:00
Mike Lockwood
a5250c9392
MountService: Add StorageVolume as extra in storage related broadcasts.
...
Change-Id: I8e1a21ae233ba9812e58b363b59a66b260a01cbf
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-05-23 20:01:55 -04:00
Robert Greenwalt
5a6bec53e2
resolved conflicts for merge of dec3dda8 to honeycomb-plus-aosp
...
Change-Id: If14c7fc51c4549524c2f39797a902093582bae6d
2011-05-20 15:45:55 -07:00
Robert Greenwalt
599115894f
Simplfy getActive* calls in ConnectivityService
...
One had been simplified on GB, but somehow it didn't make it here.
bug: 4463770
Change-Id: Ica51e836b1a7a489526a223168910b8e06c99c2b
2011-05-20 12:23:41 -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
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
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
Dianne Hackborn
69cb87576b
Add new "-swNNNdp" resource qualifier.
...
Change-Id: I0101e88ca9d8d44138bdcaf571f24b0352f4f6ce
2011-05-19 18:23:29 -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
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
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
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
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