ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity
13,328 Commits 2 Branches 0 Tags 54 MiB
ad50679130
Commit Graph

13328 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andy McFadden
fdb4c239a5 Merge "Tone down a log message." 2010-03-02 07:36:23 -08:00
Derek Sollenberger
a3c1e2fa90 am 717c6ae0: (-s ours) am 2705c8f0: Merge "DO NOT MERGE. force plugins to render on top of browser content." into eclair-mr2 
Merge commit '717c6ae0cf1f82168b18ba2ba248313bcad7ae3e'

* commit '717c6ae0cf1f82168b18ba2ba248313bcad7ae3e':
  DO NOT MERGE. force plugins to render on top of browser content.
 2010-03-02 07:00:21 -08:00
Derek Sollenberger
bebad542c0 am 2705c8f0: Merge "DO NOT MERGE. force plugins to render on top of browser content." into eclair-mr2 
Merge commit '2705c8f09975f1bf10c84af323a67c104a177129' into eclair-mr2-plus-aosp

* commit '2705c8f09975f1bf10c84af323a67c104a177129':
  DO NOT MERGE. force plugins to render on top of browser content.
 2010-03-02 06:44:47 -08:00
Derek Sollenberger
9f4411c5d3 Merge "DO NOT MERGE. force plugins to render on top of browser content." into eclair-mr2 2010-03-02 06:33:32 -08:00
Patrick Scott
ed52d3462e Merge "Store the LoadListener in the SslErrorHandler passed to the client." 2010-03-02 05:40:09 -08:00
Mike Lockwood
d308c9ddbb Merge "Don't poke user activity when unplugging unless screen is already on." 2010-03-02 04:29:04 -08:00
Ken Shirriff
b66bf0c499 Merge "Remove DateException and obsolete DateUtils functions." 2010-03-01 22:46:07 -08:00
Romain Guy
32fb630b99 Merge "Cleaning in ListWithEditTextHeaderTest." 2010-03-01 21:56:22 -08:00
Dianne Hackborn
1dd6a04f78 Move the pointer location thing out of common. 2010-03-01 21:42:15 -08:00
Dianne Hackborn
8eca036d24 Fix issue #2448075: aapt doesn't fix up activity-alias android:targetActivity links 
And related:

- The aapt tool now sets a resource configurations sdk level to match any configs
  that have been set (for example if you specify density your sdk level will be
  at least 4).
- New option to modify the targetPackage attribute of instrumentation.
- Clean up of aapt options help.
- Fix of UI type values to leave 0 for "unspecified".
- Make the UI mode config APIs public.
 2010-03-01 20:42:14 -08:00
Charles Chen
7a0f7e233a Merge "Fixing a bug with TTS that caused TTS to ignore the default settings unless the user had set the defaults to always override app settings." 2010-03-01 19:05:20 -08:00
Mathias Agopian
064e1e672e fix [2425395] portrait UI briefly shows in landscape 
the "freeze" timeout was not initialized properly which caused it
to kick-in immediately instead of after 5s
 2010-03-01 18:36:14 -08:00
Mathias Agopian
285dbde2e0 Added a name to Surface created by SurfaceFlinger 
Updated the window manager to use this new facility.
Surfaces name are now printed by "dumpsys".
 2010-03-01 18:34:50 -08:00
Daniel Sandler
46a26c63ed Merge "New vibrate/silent mode behavior." 2010-03-01 17:16:55 -08:00
Romain Guy
a2234e4ed0 Merge "Prevent crash in Dialog. Bug #2249637" 2010-03-01 16:41:27 -08:00
Ficus Kirkpatrick
ec890d307a Merge "Demote the famous ResourceTypes warning to LOGV." 2010-03-01 16:36:26 -08:00
Ficus Kirkpatrick
dc7caf18da Demote the famous ResourceTypes warning to LOGV. 
It is spamming the log bigtime and can be promoted back to LOGW
or worse by whoever decides to actually investigate the bug.

Change-Id: I72d950155378f641ebdfbacabae774f5736a52bc
 2010-03-01 16:33:53 -08:00
Grace Kloba
117aec7d07 am c0524d26: (-s ours) am 3ff7cecd: Merge "DO NOT MERGE" into eclair-mr2 
Merge commit 'c0524d26a6bcfa28a930f446717dffcd9ce3c3f5'

* commit 'c0524d26a6bcfa28a930f446717dffcd9ce3c3f5':
  DO NOT MERGE
 2010-03-01 16:27:44 -08:00
Marc Blank
dbb69c23cc Merge "Rename _SYNC_LOCAL_ID to _SYNC_DATA" 2010-03-01 16:18:27 -08:00
Grace Kloba
84a75e90b6 am 3ff7cecd: Merge "DO NOT MERGE" into eclair-mr2 
Merge commit '3ff7cecd3d9a1bb9485e32b0e6920f24022a5565' into eclair-mr2-plus-aosp

* commit '3ff7cecd3d9a1bb9485e32b0e6920f24022a5565':
  DO NOT MERGE
 2010-03-01 16:13:21 -08:00
Grace Kloba
416f1d9b9a Merge "DO NOT MERGE" into eclair-mr2 2010-03-01 16:02:12 -08:00
Vasu Nori
2d5c31e0f9 Merge "revert due to the sqlite build problem on Mac.." 2010-03-01 15:54:34 -08:00
Jason Sams
f9ce46435b Merge "Add support for linking to a skia bitmap rather than always copying the data from the bitmap." 2010-03-01 15:42:47 -08:00
Jason Sams
78bf238fd8 Merge "Support defered generation of mipmaps. With this change we support mipmap generation when the texture is uploaded to GL without requiring RS to retain the full chain." 2010-03-01 15:42:03 -08:00
Jason Sams
d95f2426cf Merge "Begin implementation of generated java files from RS files." 2010-03-01 15:40:37 -08:00
Andreas Huber
d8f28fe15c Merge "Ensure that the audio codec instance is actually going away before we attempt to instantiate another one, otherwise we might end up with the software codec even though the hardware codec would have been available shortly." 2010-03-01 15:07:34 -08:00
Fred Quintana
7fe21a393c Merge "fix a system crash that occurs when ChooseAccountActivity is restarted from the icicle" 2010-03-01 14:47:22 -08:00
Vasu Nori
d3914628f7 Merge "register a logging func with sqlite, to get extra info on errors" 2010-03-01 14:22:08 -08:00
Ken Shirriff
741278d971 Remove DateException and obsolete DateUtils functions. 
These functions are deprecated and no longer used.
 2010-03-01 14:21:13 -08:00
Paul Westbrook
a0fc5d763c Merge "Bug 2464063" 2010-03-01 14:21:03 -08:00
Grace Kloba
9d1a35ceeb am 3ca122df: am cfb50c66: Merge "If we get TOUCH_UP before getting the WebCore\'s response for TOUCH_DOWN, remove the pending TOUCH_EVENT before proceeding to fling." into eclair-mr2 
Merge commit '3ca122df9e9a25f7ed1c39ef18c5c4ba2e316fe8'

* commit '3ca122df9e9a25f7ed1c39ef18c5c4ba2e316fe8':
  If we get TOUCH_UP before getting the WebCore's
 2010-03-01 13:16:46 -08:00
Grace Kloba
f9ae233be1 am cfb50c66: Merge "If we get TOUCH_UP before getting the WebCore\'s response for TOUCH_DOWN, remove the pending TOUCH_EVENT before proceeding to fling." into eclair-mr2 
Merge commit 'cfb50c66faf4ff8a6f76884fdaf2dcb48d4d63a3' into eclair-mr2-plus-aosp

* commit 'cfb50c66faf4ff8a6f76884fdaf2dcb48d4d63a3':
  If we get TOUCH_UP before getting the WebCore's
 2010-03-01 13:11:55 -08:00
Joe Onorato
0f6b41c6a1 Merge "Switch the services library to using the new Slog" 2010-03-01 13:08:31 -08:00
Grace Kloba
11e78d48b0 Merge "If we get TOUCH_UP before getting the WebCore's response for TOUCH_DOWN, remove the pending TOUCH_EVENT before proceeding to fling." into eclair-mr2 2010-03-01 13:07:06 -08:00
Grace Kloba
598836cff0 Merge "If zoom scale is set to minimum, treat it as in overview mode." 2010-03-01 13:06:58 -08:00
Joe Onorato
d76e820bd5 Merge "Add new Slog class." 2010-03-01 13:03:52 -08:00
Fred Quintana
bfb14e360d Merge "fix a bug where if a syncmanager gets back a SyncAlreadyInProgress error it immediately reschedules another sync, thus burning up the battery if the sync is in progress for a while." 2010-03-01 13:00:26 -08:00
Derek Sollenberger
fcaa899a0c am a630dcdb: am ecde72fe: Ensure the IME is rendered above the surface when we z-order the surface to be on top. 
Merge commit 'a630dcdb956f9acb028dd03bc63b28874f100f8a'

* commit 'a630dcdb956f9acb028dd03bc63b28874f100f8a':
  Ensure the IME is rendered above the surface when we z-order the surface to be on top.
 2010-03-01 12:23:27 -08:00
Derek Sollenberger
2a0d882c4d am ecde72fe: Ensure the IME is rendered above the surface when we z-order the surface to be on top. 
Merge commit 'ecde72fe411811ca02a2565bf73b86e6e8ddc76b' into eclair-mr2-plus-aosp

* commit 'ecde72fe411811ca02a2565bf73b86e6e8ddc76b':
  Ensure the IME is rendered above the surface when we z-order the surface to be on top.
 2010-03-01 12:09:10 -08:00
Gilles Debunne
6b554fc818 Merge "Take headers into account when expanding a ExpListView group." 2010-03-01 11:55:25 -08:00
Dianne Hackborn
5aa7efa748 Merge "resolved conflicts for merge of 4dcd2ee8 to master" 2010-03-01 11:33:15 -08:00
Dianne Hackborn
664e53dd23 resolved conflicts for merge of 4dcd2ee8 to master 2010-03-01 11:30:02 -08:00
Wei Huang
e88da1cfbc Merge "define the "seen" column for sms and pdu tables." 2010-03-01 11:25:45 -08:00
Dianne Hackborn
ffead1e216 Merge "cleanup Exit car mode in UI." 2010-03-01 11:12:27 -08:00
Grace Kloba
55a8bbb271 Merge "Add a new WebCoreWorker thread to handle the tasks which should not block either UI or WebKit. It handles local file access, cache access and trim cache." 2010-03-01 10:58:01 -08:00
Mark Wagner
ecaff33574 Merge "check offset and don't crash" 2010-03-01 10:56:19 -08:00
Steve Block
7a8d85c2e2 Merge "Removes a Geolocation test from the DumpRenderTree skipped list" 2010-03-01 10:54:30 -08:00
Steve Block
1d99b98d5b Merge "Adds to DumpRenderTree the ability to look for Android-specific results" 2010-03-01 10:53:22 -08:00
Wei Huang
99a418cabe define the "seen" column for sms and pdu tables. 2010-03-01 10:26:31 -08:00
Paul Westbrook
e26f4a308f Merge "Bug 2306842" 2010-03-01 09:41:49 -08:00