Scott Main
b860fd11e9
am 322e7e47: Merge "docs: fix markup error" into froyo
...
Merge commit '322e7e477d89aca18d65cbd289343e716c45a699' into froyo-plus-aosp
* commit '322e7e477d89aca18d65cbd289343e716c45a699':
docs: fix markup error
2010-06-15 10:45:50 -07:00
Scott Main
b102a5e8c2
docs: update dashboard
...
Change-Id: If8d1ad8aa99d93f707635631a44e6c359895302a
2010-06-15 10:42:10 -07:00
Jean-Baptiste Queru
879becf570
Merge "Fix that InputDeviceReaderThread that got killed during startup"
2010-06-15 10:40:51 -07:00
Scott Main
457738e628
Merge "docs: add information about known issues in resource matching for screen density and system version. Add section about providing compatibility for multiple devices" into froyo
2010-06-15 10:36:27 -07:00
Scott Main
322e7e477d
Merge "docs: fix markup error" into froyo
2010-06-15 10:36:14 -07:00
Szymon Jakubczak
9bf3bb21c0
- updates NetUtils to use new libnetutils headers
...
- updates WifiStateTracker to track net.XXX.dnsX properties for name servers
- removes dhcp from WifiNative (use NetworkUtils instead)
Change-Id: Ic69ff253e8784cad34e9291e7970ee38bfa235b9
2010-06-15 10:22:25 -07:00
The Android Open Source Project
a191eb013a
Fix build
...
This file was brought back to life by mistaken when merging from
a branch where it was modified into a branch where it had been
deleted
Change-Id: I406c6ced978abfdd59684f14bc9dd53ee7968aae
2010-06-15 09:59:15 -07:00
The Android Open Source Project
9629d42c19
merge from open-source master
...
Change-Id: I4d7b0ec9895d8b090e0cdf2efb6731358a5d087c
2010-06-15 09:32:37 -07:00
The Android Open Source Project
4138677a72
merge from open-source master
...
Change-Id: I405069e9495e43fdcdedc41efce77d43a291272c
2010-06-15 09:30:31 -07:00
The Android Open Source Project
fa804aa367
merge from open-source master
...
Change-Id: I227bf1b5f1de8f858df72d58a4463aed5cc09cbc
2010-06-15 09:27:48 -07:00
Jean-Baptiste Queru
77dcdc9cda
Merge "Use stride for source and target buffers when copybit is enabled."
2010-06-15 07:49:05 -07:00
Jean-Baptiste Queru
8942a31f13
Merge "Replaced deprecated String Constructor"
2010-06-14 16:23:58 -07:00
Christian Mehlmauer
e6af73e18e
Replaced deprecated Inten.toURI method
...
Change-Id: Iff3200294edbc1cac188502219bfe481133a5d8e
2010-06-14 15:47:15 -07:00
Kenny
baccb91ece
Fix the ssid display issue
...
Reproduce steps:
1. Set a special AP name that contains "=" (looks like "-=^-^=-");
2. Connect to this AP;
3. The display of ssid will be incorrect;
Change-Id: Idc7433a42cf59932f5fb147f5500e0175f745399
2010-06-14 14:51:26 -07:00
The Android Open Source Project
3149ad13e5
merge from open-source master
...
Change-Id: I381f1faaa26a7e52e9882976f32f703fc2aa9c75
2010-06-14 14:28:18 -07:00
The Android Open Source Project
c8e2cbd31a
merge from open-source master
...
Change-Id: Ia8a5ab84bb9957b4a3daf92a9a21905212867a95
2010-06-14 14:18:32 -07:00
Jean-Baptiste Queru
9451e71cf5
Merge "Fix data type of RIL_UNSOL_RESPONSE_NEW_BROADCAST_SMS in RIL."
2010-06-14 13:54:25 -07:00
Scott Main
7ef674b596
docs: add information about known issues in resource matching
...
for screen density and system version.
Add section about providing compatibility for multiple devices
bug: 2760561
Change-Id: I9b3a515a14d53923a15b1931f6dd24f295874362
2010-06-14 12:57:54 -07:00
Jean-Baptiste Queru
58424b59fa
Merge "Corrected SPN and PLMN name handling"
2010-06-14 12:47:49 -07:00
The Android Open Source Project
d7b814188d
merge from open-source master
...
Change-Id: Ica77cebdbb8880345faeb1ee819f51b0b7ff7a0c
2010-06-14 11:07:32 -07:00
The Android Open Source Project
51a9839ec6
merge from open-source master
...
Change-Id: I7a9f23192372fc6973d9f3eb399f895f4765f6b2
2010-06-14 11:06:33 -07:00
The Android Open Source Project
0d4dc714f9
merge from open-source master
...
Change-Id: Ic1ad1c55b5f4560b51c6b422b6f086c95a6fd69e
2010-06-14 11:02:30 -07:00
The Android Open Source Project
ea1647aff1
merge from open-source master
...
Change-Id: I5d19eb677dcfc7b73919d659fafb29fb85dc7f47
2010-06-14 10:57:53 -07:00
Jean-Baptiste Queru
4bd0073299
Merge "replaced deprecated getIntent with parseURI"
2010-06-14 10:28:23 -07:00
Jean-Baptiste Queru
5978bcc32b
Merge "Added an addAll to the ArrayAdapter"
2010-06-14 09:27:14 -07:00
Jean-Baptiste Queru
a2e2d20256
Merge "Should accept "application/vnd.wap.multipart.alternative" message."
2010-06-14 08:56:49 -07:00
Christian Mehlmauer
8c582ef859
Added an addAll to the ArrayAdapter
...
It behaves the same as ArrayList.addAll, since
the Object containing the Objects in the Adapter
is a List. Now you can add multiple Objects
at once, instead of looping over a Collection
and add all items one by one.
Unittests will be submitted to the cts project
Change-Id: I16f3286a8ca4cda7eb9f1a99c2aab1cc45b2550f
2010-06-12 10:51:06 +02:00
Dirk Dougherty
6eb9479134
am 1067e689: Merge "Doc change: remove pdf summary of guidelines from templates archive." into froyo
...
Merge commit '1067e6895e941f56edc7bc3d7c16a7122fb5259b' into froyo-plus-aosp
* commit '1067e6895e941f56edc7bc3d7c16a7122fb5259b':
Doc change: remove pdf summary of guidelines from templates archive.
2010-06-11 16:57:45 -07:00
Dirk Dougherty
1067e6895e
Merge "Doc change: remove pdf summary of guidelines from templates archive." into froyo
2010-06-11 16:49:14 -07:00
Dirk Dougherty
e6727df7a7
Doc change: remove pdf summary of guidelines from templates archive.
...
Change-Id: I5394d1f95013ddf7790beda1f33e212bfbaee641
2010-06-11 15:59:47 -07:00
Irfan Sheriff
0631c608b0
merge from open-source master
...
Change-Id: I8a950276787e9439420db396d0e32f88bd6e04cc
2010-06-11 15:14:29 -07:00
The Android Open Source Project
07d8140755
merge from open-source master
...
Change-Id: Ia668b322a02e220b74c222dbbcc5b4fdc3c59ab0
2010-06-11 13:08:02 -07:00
Jean-Baptiste Queru
fdedc52299
Merge "WLAN: Reset power save mode to startup value after DHCP response."
2010-06-11 11:12:15 -07:00
Scott Main
f10e6331e3
docs: fix markup error
...
Change-Id: Icea017095f58068c55dd3c1c18cecbdf06afb595
2010-06-11 09:03:22 -07:00
Irfan Sheriff
a97d959448
am 9f2a0115: Merge "Remove indefinite DHCP retries" into froyo
...
Merge commit '9f2a0115220c8e288c32d8cf90e235a2f2be115b' into froyo-plus-aosp
* commit '9f2a0115220c8e288c32d8cf90e235a2f2be115b':
Remove indefinite DHCP retries
2010-06-10 19:02:13 -07:00
Irfan Sheriff
9f2a011522
Merge "Remove indefinite DHCP retries" into froyo
2010-06-10 18:56:04 -07:00
Joe Onorato
f058057622
Use the droidcore goal with dist-for-goals.
...
Change-Id: Ie0042028c4a33a23a4eb9aed1d1015e580c3e168
2010-06-10 18:36:58 -07:00
Joe Onorato
74905e5b0a
The aapt and aidl tools are prebuilt when we're doing an apps-only build, so don't try to build them.
...
Change-Id: I9896b11a9b90cbbbe2170243c8bdbc40231dfbff
2010-06-10 18:36:57 -07:00
Irfan Sheriff
60d0d22c75
Remove indefinite DHCP retries
...
Replace indefinite DHCP retries
with a sufficiently large retry count
Bug: 2761057
Change-Id: I4570b74476aa78c71c73e06c2aafac33d924e867
2010-06-10 16:34:16 -07:00
Mike Lockwood
34502a84eb
am f4a502a2: Merge "Don\'t adjust lights if screen or button brightness is changed when the screen is off." into froyo
...
Merge commit 'f4a502a235e9f9ea0bcd2d5ca4981dc6e1a619c4' into froyo-plus-aosp
* commit 'f4a502a235e9f9ea0bcd2d5ca4981dc6e1a619c4':
Don't adjust lights if screen or button brightness is changed when the screen is off.
2010-06-10 15:30:33 -07:00
Mike Lockwood
f4a502a235
Merge "Don't adjust lights if screen or button brightness is changed when the screen is off." into froyo
2010-06-10 15:28:31 -07:00
Adam Powell
f1bb929bc5
am 8f2ca788: Merge "Fix bug 2757693 - Multi-touch coordinates can jump when a finger goes down." into froyo
...
Merge commit '8f2ca788f369892370477212cf9e7a67721a8c16' into froyo-plus-aosp
* commit '8f2ca788f369892370477212cf9e7a67721a8c16':
Fix bug 2757693 - Multi-touch coordinates can jump when a finger goes down.
2010-06-10 14:14:44 -07:00
Adam Powell
8f2ca788f3
Merge "Fix bug 2757693 - Multi-touch coordinates can jump when a finger goes down." into froyo
2010-06-10 14:09:50 -07:00
Nick Kralevich
321e815893
am a2c6d5bf: do not merge: cherry-picked 929b4855b8208d36272769e8eeaa6cd2823b94c0 from master branch
...
Merge commit 'a2c6d5bf308181c019ade0aac6d25fe33dc3d76c' into froyo-plus-aosp
* commit 'a2c6d5bf308181c019ade0aac6d25fe33dc3d76c':
do not merge: cherry-picked 929b4855b8208d36272769e8eeaa6cd2823b94c0 from master branch
2010-06-10 11:50:51 -07:00
Mike Lockwood
f527c715d7
Don't adjust lights if screen or button brightness is changed when the screen is off.
...
Change-Id: I798a240374c3a739e1f1eaf36fa9fdef8416f2a2
BUG: 2758292
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-06-10 14:14:00 -04:00
Nick Kralevich
a2c6d5bf30
do not merge: cherry-picked 929b4855b8208d36272769e8eeaa6cd2823b94c0 from master branch
...
Change-Id: Ie20371234a531f65f523682a0d0c27394dc30afa
2010-06-10 10:39:42 -07:00
Mikael Kanstrup
ea8bd1d167
WLAN: Reset power save mode to startup value after DHCP response.
...
When the driver was configured to run with power save mode disabled the
power save mode incorrectly got reverted back to AUTO mode right after
DHCP response. The power save mode value is now saved so that the device
properly reverts back to a previous mode after DHCP response.
Change-Id: I5035aad10146812ecef1be8ea4b22a03e230ccc9
2010-06-10 14:51:43 +02:00
Kenny Root
4817cfc71d
am b00854d4: Import revised translations
...
Merge commit 'b00854d4c07ee8c810d1e32984543297bfa80a8e' into froyo-plus-aosp
* commit 'b00854d4c07ee8c810d1e32984543297bfa80a8e':
Import revised translations
2010-06-09 22:32:01 -07:00
Kenny Root
b00854d4c0
Import revised translations
...
Change-Id: I25faf1ade5252fa29cf43aa13e99fef9fc31b418
2010-06-09 22:25:58 -07:00
Chih-Wei Huang
4e916ad8c9
Add PageUp and PageDown hot keys
...
Change-Id: I588f70d74bc5c02e1fb60c7a2821d8801f2333e0
2010-06-10 09:56:47 +08:00