Commit Graph

38903 Commits

Author SHA1 Message Date
Alex Sakhartchouk
d6edfbbb78 Merge "Packing the struct to work around llvm bug." 2010-10-13 10:11:02 -07:00
Nick Pelly
aa29f86505 Add missing native methods to fix boot.
Change-Id: I02e158d7c287c886e218b7a57edd708f9e570695
2010-10-13 10:10:47 -07:00
Alex Sakhartchouk
c119493e01 Packing the struct to work around llvm bug.
Change-Id: If94d6659df7e00b70c39619b05732046233cb196
2010-10-13 10:02:28 -07:00
Andreas Huber
a127c07c42 am 312644cd: Merge "Support for writing to MPEG2 transport stream files." into gingerbread
Merge commit '312644cdbb39522fe9cac028b15b907ce0e8e0f7' into gingerbread-plus-aosp

* commit '312644cdbb39522fe9cac028b15b907ce0e8e0f7':
  Support for writing to MPEG2 transport stream files.
2010-10-13 09:19:28 -07:00
Andreas Huber
28b93967d0 am 165c6579: Merge "HTTP Live content that are tagged as complete are now seekable." into gingerbread
Merge commit '165c6579660c22edafb61fee2a0cf39334a2a905' into gingerbread-plus-aosp

* commit '165c6579660c22edafb61fee2a0cf39334a2a905':
  HTTP Live content that are tagged as complete are now seekable.
2010-10-13 09:17:13 -07:00
Andreas Huber
312644cdbb Merge "Support for writing to MPEG2 transport stream files." into gingerbread 2010-10-13 09:14:40 -07:00
Andreas Huber
165c657966 Merge "HTTP Live content that are tagged as complete are now seekable." into gingerbread 2010-10-13 09:14:13 -07:00
Kenny Root
70e4210ad9 Handle native library deletion in scanPackage
The deletion of native libraries was initially added to
FileInstallArgs.cleanUpResourcesLI() as a way to get rid of old native
libraries during an upgrade, but it runs well after scanPackage unpacks
the new native libraries. scanPackage now removes old libraries before
unpacking the new ones, so we don't need this code anymore.

Bug: 3087739
Change-Id: I54aca830ec34d6440ba22f117d55aa3107bf5b75
2010-10-13 08:49:24 -07:00
Bjorn Bringert
2b67ce7213 Merge "Make fields in WebAddress private, add getters/setters" 2010-10-13 08:31:48 -07:00
Bjorn Bringert
eb8be973c7 Make fields in WebAddress private, add getters/setters
Change-Id: Iceaf3d648289344e53c37273f7324a79676fbef7
2010-10-13 16:21:01 +01:00
Leon Scroggins
c7ee44cbe1 am dfc07279: Line up WebTextView text with the page.
Merge commit 'dfc07279fc6205c38f5f39cb5ba4f0aef6b593a4' into gingerbread-plus-aosp

* commit 'dfc07279fc6205c38f5f39cb5ba4f0aef6b593a4':
  Line up WebTextView text with the page.
2010-10-13 07:56:38 -07:00
Leon Scroggins
dfc07279fc Line up WebTextView text with the page.
Bug:3085564

Requires a change to external/webkit:
https://android-git.corp.google.com/g/#change,73568

Change-Id: I4c3fa1314bdac39cc071f583a418c433ea897de8
2010-10-13 10:08:59 -04:00
Mike Lockwood
1442818a10 am c792c2e9: Merge "GPS: Remove unnecessary and broken test in AgpsRilInterface updateNetworkState glue" into gingerbread
Merge commit 'c792c2e9edb3c785208560b6961ac6ed5b07eb4e' into gingerbread-plus-aosp

* commit 'c792c2e9edb3c785208560b6961ac6ed5b07eb4e':
  GPS: Remove unnecessary and broken test in AgpsRilInterface updateNetworkState glue
2010-10-13 05:52:51 -07:00
Mike Lockwood
c792c2e9ed Merge "GPS: Remove unnecessary and broken test in AgpsRilInterface updateNetworkState glue" into gingerbread 2010-10-13 05:46:15 -07:00
Ben Murdoch
ff4031bcb5 Merge "Sync autofill profile data to native WebKit" 2010-10-13 04:47:21 -07:00
Steve Block
7db7c5d60c Merge "Implement DeviceMotionEvent" 2010-10-13 04:18:37 -07:00
Hung-ying Tyan
4f8fd10f76 Make SipService listen to WIFI state change events.
+ Grab a WIFI lock if any account is opened to receive calls and WIFI is enabled
+ Release the WIFI lock if no account is opened to receive calls or WIFI is
  disabled
+ Remove screen on/off event receiver

http://b/issue?id=3077454

Change-Id: Ifdf60a850bcf4106c75ec1e7563b26d8b33d7e92
2010-10-13 17:11:58 +08:00
Justin Ho
27023cc5fe am e03471e1: Merge "Updated popup_ 9 patches and removing text_select_handle (hdpi)" into gingerbread
Merge commit 'e03471e12f1adcd818b5bfd9dcb894c75fe955c5' into gingerbread-plus-aosp

* commit 'e03471e12f1adcd818b5bfd9dcb894c75fe955c5':
  Updated popup_ 9 patches and removing text_select_handle (hdpi)
2010-10-12 20:32:56 -07:00
Justin Ho
e03471e12f Merge "Updated popup_ 9 patches and removing text_select_handle (hdpi)" into gingerbread 2010-10-12 20:30:36 -07:00
Justin Ho
c42d196f96 am 33bae9b8: Updated lockscreen asset (Hiroshi), new menu background
Merge commit '33bae9b826145677585a2171f4986d4c6433fd0d' into gingerbread-plus-aosp

* commit '33bae9b826145677585a2171f4986d4c6433fd0d':
  Updated lockscreen asset (Hiroshi), new menu background
2010-10-12 20:24:37 -07:00
Justin Ho
33bae9b826 Updated lockscreen asset (Hiroshi), new menu background
Change-Id: Ibe8c535bcdd35668c7aae87b6e8c1ef622f3e148
2010-10-12 20:19:14 -07:00
Hung-ying Tyan
8a3621866d am f1b1eec9: Merge "SipService: mScreenOn is flipped to wrong value." into gingerbread
Merge commit 'f1b1eec9de1ca27b660f6c00487de07a30eecf64' into gingerbread-plus-aosp

* commit 'f1b1eec9de1ca27b660f6c00487de07a30eecf64':
  SipService: mScreenOn is flipped to wrong value.
2010-10-12 19:46:14 -07:00
Hung-ying Tyan
f1b1eec9de Merge "SipService: mScreenOn is flipped to wrong value." into gingerbread 2010-10-12 19:44:17 -07:00
Nick Pelly
9fae3eccce am ab39f1ef: Merge "Fix build." into gingerbread
Merge commit 'ab39f1ef13a546e38b49bfc02dca2ec771c13831' into gingerbread-plus-aosp

* commit 'ab39f1ef13a546e38b49bfc02dca2ec771c13831':
  Fix build.
2010-10-12 19:25:57 -07:00
Hung-ying Tyan
d6fc979edb SipService: mScreenOn is flipped to wrong value.
http://b/issue?id=3077454

Change-Id: I23b6f70730074689b939e449c2c202ce8ffb586f
2010-10-13 10:25:07 +08:00
Nick Pelly
ab39f1ef13 Merge "Fix build." into gingerbread 2010-10-12 19:23:13 -07:00
Nick Pelly
d197f59ec9 Fix build.
I removed these by mistake, and incremental build failed to pick the failure.

Change-Id: I19496d62a1eb1dc738a3a0b88d22ca1d5dddba96
2010-10-12 19:21:07 -07:00
Justin Ho
cdbd8ab789 Updated popup_ 9 patches and removing text_select_handle (hdpi)
Change-Id: I101a4ad12e7e88621073f860e39dcb16730d7722
2010-10-12 19:14:10 -07:00
Dianne Hackborn
4ce930da99 am 259c8499: Merge "Fix issue #3089800: adb shell am -W causes ActivityManager crash" into gingerbread
Merge commit '259c849989ccd30b0bb4569d11f125ed2c0c1911' into gingerbread-plus-aosp

* commit '259c849989ccd30b0bb4569d11f125ed2c0c1911':
  Fix issue #3089800: adb shell am -W causes ActivityManager crash
2010-10-12 19:08:49 -07:00
Dianne Hackborn
259c849989 Merge "Fix issue #3089800: adb shell am -W causes ActivityManager crash" into gingerbread 2010-10-12 19:06:37 -07:00
Jaikumar Ganesh
373a69614e am 64f42803: Merge "Bluez doesn\'t handle disconnect while connecting well. Defer the message." into gingerbread
Merge commit '64f4280313c5b498a3238d174c4d14ca2187604b' into gingerbread-plus-aosp

* commit '64f4280313c5b498a3238d174c4d14ca2187604b':
  Bluez doesn't handle disconnect while connecting well.
2010-10-12 19:06:13 -07:00
Jaikumar Ganesh
64f4280313 Merge "Bluez doesn't handle disconnect while connecting well. Defer the message." into gingerbread 2010-10-12 19:02:46 -07:00
Dianne Hackborn
ba0492d5ed Fix issue #3089800: adb shell am -W causes ActivityManager crash
Change-Id: I5508afeb523d84e552117f94c8b70e2bae2c33fa
2010-10-12 19:01:46 -07:00
Nick Pelly
6066da89a4 am 590b73bc: NFC API revision round 2.
Merge commit '590b73bc5b8e5f7b59bff1d9264a52388a5162e6' into gingerbread-plus-aosp

* commit '590b73bc5b8e5f7b59bff1d9264a52388a5162e6':
  NFC API revision round 2.
2010-10-12 19:00:54 -07:00
Gilles Debunne
78996c9376 Changed Cut/Copy/Paste assets.
New assets, in dark/light version.

Made public attributes of the Theme, so that they can be customized.

Select_all was not included in that change. It is supposed to be represented
as text instead of an icon. Waiting for a CL that enables this feature.

Change-Id: Icc912b2eb582295c60c0a409760d2c3d65989fc6
2010-10-12 18:58:46 -07:00
Adam Powell
4388ecbf94 Merge "Holo fixes and refinements" 2010-10-12 18:49:08 -07:00
Adam Powell
ccb013ffac Holo fixes and refinements
* Fix Holo.Light dialog text color for system-created dialogs
* Use the correct text anchor assets for selection mode
* Temp fix for small holo light button metrics

Change-Id: I974528418b69354961ea43abf8249c8caada8e17
2010-10-12 18:45:38 -07:00
Romain Guy
63eadbce77 Merge "Optimize layer clears." 2010-10-12 18:44:18 -07:00
Romain Guy
eb07af6873 Optimize layer clears.
Don't clear the entire texture when we use textures that are bigger
than the layer itself. This will save time during the glClear() calls.

Change-Id: I06f3259ba62affb3708ba69ea41418832c7e1a65
2010-10-12 18:40:36 -07:00
Nick Pelly
590b73bc5b NFC API revision round 2.
- Add the second half of the new NFC API: NfcAdapter, Tag, NdefTag,
  RawTagConnection, NdefTagConnection.
- Add implementations for all of the new NFC API.

Change-Id: I8da9fd1d2971ed2c8b76f2a93f207fa9e305b0f6
Signed-off-by: Nick Pelly <npelly@google.com>
2010-10-12 18:37:26 -07:00
Gil Dobjanschi
2fd0c94a11 Merge "Test implementation bug fix." 2010-10-12 18:34:03 -07:00
Winson Chung
a0a312225a Merge "Extracting default loading view definition into XML resource." 2010-10-12 18:25:25 -07:00
Jeff Brown
1b48063317 Merge "resolved conflicts for merge of f2e0681a to master" 2010-10-12 18:20:26 -07:00
Romain Guy
8cbda423d0 Merge "Tweak layers caching for better performance in Launcher." 2010-10-12 18:20:06 -07:00
Jeff Brown
c2ea2ec85e resolved conflicts for merge of f2e0681a to master
Change-Id: I5ba9b1f16a29f73444123bcead4c53f09a79b0f6
2010-10-12 18:19:08 -07:00
Romain Guy
e91080581f Tweak layers caching for better performance in Launcher.
Change-Id: Ia6e67699d98f69c8a93385b3ecbdd814c7b16921
2010-10-12 18:15:42 -07:00
Joe Onorato
e165de7685 am d965724f: (-s ours) am 44104df1: Merge "Fix status bar flashing after orientation change" into gingerbread
Merge commit 'd965724fdcc63a070657518542559a8b1a35a70d'

* commit 'd965724fdcc63a070657518542559a8b1a35a70d':
  Fix status bar flashing after orientation change
2010-10-12 18:05:09 -07:00
Romain Guy
290dcfb4e6 Merge "Remove logging." 2010-10-12 17:50:32 -07:00
Romain Guy
1f114a55b5 Remove logging.
Change-Id: Ibcb11d704653d8875e22629ea39e4ee2ebce3c22
2010-10-12 17:47:34 -07:00
Chris Tate
06cbb47bca Merge "Don't stomp on the drag-focus bookkeeping inadvertently." 2010-10-12 17:42:15 -07:00