OSDN Git Service
Xavier Ducrohet [Tue, 7 Feb 2012 00:46:46 +0000 (16:46 -0800)]
am
c9bcd33a: (-s ours) am
b1f95c6a: (-s ours) am
331bb0c3: Setup ActionBars in layoutlib the same way the platform does it. do not merge.
* commit '
c9bcd33afa5c34e0a49955c30aa875ac8205b65f':
Setup ActionBars in layoutlib the same way the platform does it. do not merge.
Xavier Ducrohet [Tue, 7 Feb 2012 00:44:32 +0000 (16:44 -0800)]
am
b1f95c6a: (-s ours) am
331bb0c3: Setup ActionBars in layoutlib the same way the platform does it. do not merge.
* commit '
b1f95c6a938f6eaaa7a3fd28574a14647178059b':
Setup ActionBars in layoutlib the same way the platform does it. do not merge.
Xavier Ducrohet [Tue, 7 Feb 2012 00:42:56 +0000 (16:42 -0800)]
am
331bb0c3: Setup ActionBars in layoutlib the same way the platform does it. do not merge.
* commit '
331bb0c393d5e2ea2485102dcddbb8c2d42654d2':
Setup ActionBars in layoutlib the same way the platform does it. do not merge.
James Dong [Tue, 7 Feb 2012 00:21:24 +0000 (16:21 -0800)]
Merge "Don't call virtual function in destructor of SurfaceMediaSource"
Xavier Ducrohet [Tue, 7 Feb 2012 00:17:42 +0000 (16:17 -0800)]
Merge "Setup ActionBars in layoutlib the same way the platform does it. do not merge."
Xavier Ducrohet [Mon, 6 Feb 2012 23:52:58 +0000 (15:52 -0800)]
Merge "Setup ActionBars in layoutlib the same way the platform does it."
Amith Yamasani [Mon, 6 Feb 2012 23:39:40 +0000 (15:39 -0800)]
Merge "Check for null ActivityInfo."
Mangesh Ghiware [Mon, 6 Feb 2012 23:27:08 +0000 (15:27 -0800)]
Merge "Use WebKit hit testing result for centering on double-tap zoom."
Scott Main [Mon, 6 Feb 2012 22:45:41 +0000 (14:45 -0800)]
am
f9bb376b: am
afaec576: am
a9d9fa72: Merge "docs: switch from caps to initial-case for device button names" into ics-mr1
* commit '
f9bb376bd7bfb6bdc77e1621a340122c29afd21c':
Scott Main [Mon, 6 Feb 2012 22:45:39 +0000 (14:45 -0800)]
am
dbee29ba: am
5a0fe6fc: am
a9d9fa72: Merge "docs: switch from caps to initial-case for device button names" into ics-mr1
* commit '
dbee29ba559a0c16919b5977ed4972481b0a98ec':
docs: switch from caps to initial-case for device button names
Jean-Baptiste Queru [Mon, 6 Feb 2012 22:45:36 +0000 (14:45 -0800)]
am
33476f7a: am
f79bcd2d: am
52da99fa: am
a081c7b8: Merge "Skia API changes as a result of an update to the Skia library."
* commit '
33476f7ad1c3b4dcaefddb306f315e201c4efb33':
Skia API changes as a result of an update to the Skia library.
Scott Main [Mon, 6 Feb 2012 22:15:06 +0000 (14:15 -0800)]
am
afaec576: am
a9d9fa72: Merge "docs: switch from caps to initial-case for device button names" into ics-mr1
* commit '
afaec57668551b797505f43d9d9677979dedf0c9':
Scott Main [Mon, 6 Feb 2012 22:14:09 +0000 (14:14 -0800)]
am
5a0fe6fc: am
a9d9fa72: Merge "docs: switch from caps to initial-case for device button names" into ics-mr1
* commit '
5a0fe6fc13bc1102fbc3da8391dd228ed54bba04':
docs: switch from caps to initial-case for device button names
Scott Main [Mon, 6 Feb 2012 22:12:39 +0000 (14:12 -0800)]
am
a9d9fa72: Merge "docs: switch from caps to initial-case for device button names" into ics-mr1
* commit '
a9d9fa723a10ae41c047a4e8eba330112d344dc8':
docs: switch from caps to initial-case for device button names
Jean-Baptiste Queru [Mon, 6 Feb 2012 22:12:05 +0000 (14:12 -0800)]
am
f79bcd2d: am
52da99fa: am
a081c7b8: Merge "Skia API changes as a result of an update to the Skia library."
* commit '
f79bcd2dd5d82376640661f50aa2e9237af7c02c':
Skia API changes as a result of an update to the Skia library.
Scott Main [Mon, 6 Feb 2012 22:12:03 +0000 (14:12 -0800)]
am
a9d9fa72: Merge "docs: switch from caps to initial-case for device button names" into ics-mr1
* commit '
a9d9fa723a10ae41c047a4e8eba330112d344dc8':
docs: switch from caps to initial-case for device button names
Scott Main [Mon, 6 Feb 2012 22:10:16 +0000 (14:10 -0800)]
Merge "docs: switch from caps to initial-case for device button names" into ics-mr1
Jean-Baptiste Queru [Mon, 6 Feb 2012 22:09:36 +0000 (14:09 -0800)]
am
52da99fa: am
a081c7b8: Merge "Skia API changes as a result of an update to the Skia library."
* commit '
52da99fac85d1e16a3c95bdd9c039801e920e6d1':
Skia API changes as a result of an update to the Skia library.
Jean-Baptiste Queru [Mon, 6 Feb 2012 22:07:31 +0000 (14:07 -0800)]
am
a081c7b8: Merge "Skia API changes as a result of an update to the Skia library."
* commit '
a081c7b8bc5a3ea19fc7562b333fac525b17bc5f':
Skia API changes as a result of an update to the Skia library.
Jean-Baptiste Queru [Mon, 6 Feb 2012 22:01:05 +0000 (14:01 -0800)]
Merge "Skia API changes as a result of an update to the Skia library."
Scott Main [Mon, 6 Feb 2012 21:09:08 +0000 (13:09 -0800)]
am
6f2f42d5: Merge branch \'ics-scoop-plus-aosp\' of ssh://android-git:29418/platform/frameworks/base into ics-scoop-plus-aosp
* commit '
6f2f42d52a23de0bd639d5e4957331118ccc47b8':
Scott Main [Mon, 6 Feb 2012 21:09:06 +0000 (13:09 -0800)]
am
584156ad: am
8e399408: am
4ba15efc: Merge "docs: add Sony USB VID issue
5967572" into ics-mr1
* commit '
584156ad29ec3b62a403ac692b16025c652b984c':
docs: add Sony USB VID issue
5967572
Scott Main [Mon, 6 Feb 2012 21:07:24 +0000 (13:07 -0800)]
Merge branch 'ics-scoop-plus-aosp' of ssh://android-git:29418/platform/frameworks/base into ics-scoop-plus-aosp
Scott Main [Mon, 6 Feb 2012 21:07:21 +0000 (13:07 -0800)]
am
8e399408: am
4ba15efc: Merge "docs: add Sony USB VID issue
5967572" into ics-mr1
* commit '
8e399408724f3d18d48d13194e05a80108216fed':
docs: add Sony USB VID issue
5967572
Scott Main [Mon, 6 Feb 2012 21:07:04 +0000 (13:07 -0800)]
am
0654994b: am
4ba15efc: Merge "docs: add Sony USB VID issue
5967572" into ics-mr1
* commit '
0654994b9e546c50d84b3a9909f190220df65497':
docs: add Sony USB VID issue
5967572
Scott Main [Mon, 6 Feb 2012 21:05:28 +0000 (13:05 -0800)]
am
4ba15efc: Merge "docs: add Sony USB VID issue
5967572" into ics-mr1
* commit '
4ba15efc5b9c884a7651d699a20f9edd7ebd7cb5':
docs: add Sony USB VID issue
5967572
Scott Main [Mon, 6 Feb 2012 21:05:04 +0000 (13:05 -0800)]
am
4ba15efc: Merge "docs: add Sony USB VID issue
5967572" into ics-mr1
* commit '
4ba15efc5b9c884a7651d699a20f9edd7ebd7cb5':
docs: add Sony USB VID issue
5967572
Scott Main [Mon, 6 Feb 2012 21:03:16 +0000 (13:03 -0800)]
Merge "docs: add Sony USB VID issue
5967572" into ics-mr1
Xavier Ducrohet [Mon, 6 Feb 2012 19:46:49 +0000 (11:46 -0800)]
am
9485ca87: am
b54f371c: am
f8aea993: Make aapt ignore tools-related data.
* commit '
9485ca87edd819e3106a4b8c3d08f1ab73adf818':
Xavier Ducrohet [Mon, 6 Feb 2012 19:44:43 +0000 (11:44 -0800)]
am
3d4db0dc: am
c205a9d6: am
f8aea993: Make aapt ignore tools-related data.
* commit '
3d4db0dc1803252b924076f7d10d8e806af71824':
Make aapt ignore tools-related data.
Xavier Ducrohet [Mon, 6 Feb 2012 19:44:19 +0000 (11:44 -0800)]
am
b54f371c: am
f8aea993: Make aapt ignore tools-related data.
* commit '
b54f371cc4cfd32acf0fec35885a1da64accec9e':
Xavier Ducrohet [Mon, 6 Feb 2012 19:42:50 +0000 (11:42 -0800)]
am
c205a9d6: am
f8aea993: Make aapt ignore tools-related data.
* commit '
c205a9d68c23e9ade2cbe28bba0f257d84d23a97':
Make aapt ignore tools-related data.
Xavier Ducrohet [Mon, 6 Feb 2012 19:41:56 +0000 (11:41 -0800)]
am
f8aea993: Make aapt ignore tools-related data.
* commit '
f8aea99385df8373b6edd6d5dd1d15b7b36b525b':
Make aapt ignore tools-related data.
Xavier Ducrohet [Mon, 6 Feb 2012 19:41:04 +0000 (11:41 -0800)]
am
f8aea993: Make aapt ignore tools-related data.
* commit '
f8aea99385df8373b6edd6d5dd1d15b7b36b525b':
Make aapt ignore tools-related data.
Xavier Ducrohet [Mon, 6 Feb 2012 18:57:50 +0000 (10:57 -0800)]
Merge "Add some lint control for the frameworks."
Xavier Ducrohet [Mon, 6 Feb 2012 18:57:40 +0000 (10:57 -0800)]
Merge "Make aapt ignore tools-related data."
Chris Craik [Mon, 6 Feb 2012 18:00:58 +0000 (10:00 -0800)]
Merge "Pause webkit painting when UI tile painting queue is full"
Mathias Agopian [Sun, 5 Feb 2012 10:15:28 +0000 (02:15 -0800)]
fix a crasher when starting SF with the screen off
SF could end-up in an infinite crash-loop during startup if it
was stopped while the screen was off. This happened because
the thread that manages screen blanking was started before
other important pieces of SF were initialized.
Change-Id: I0dded11dbf2395fdd57b673859a7aa0fa9eb32b6
Mathias Agopian [Sun, 5 Feb 2012 09:49:16 +0000 (01:49 -0800)]
ui freeze workaround: reenable triple buffering mode
we're seeing UI freezes when window updates and
composition are separated. for now we workaround this
by always doing a composition after window updates on
vsync. triple buffering is reenabled for performance.
Change-Id: I693d705000b7452489bb0b4918fbeadb9879315c
Mathias Agopian [Sun, 5 Feb 2012 08:19:27 +0000 (00:19 -0800)]
improve SF dumpsys
Mathias Agopian [Sat, 4 Feb 2012 23:44:04 +0000 (15:44 -0800)]
fix UI freezes
In some situations SF would mark a window as "has a pending update"
but would never process that update because the window is not
visible (fully transparent, hidden by another window, etc...), this
window would then be "stuck" until some other window updated.
Change-Id: Ifa18a9aef3a53f2593b473556702688ae62d9503
James Dong [Sat, 4 Feb 2012 13:54:53 +0000 (05:54 -0800)]
Merge "Don't call virtual functions in the destructor for audio and camera source classes"
Fabrice Di Meglio [Sat, 4 Feb 2012 02:33:49 +0000 (18:33 -0800)]
Merge "Revert back to DroidSansArabic font for SystemUI"
Chet Haase [Sat, 4 Feb 2012 01:48:11 +0000 (17:48 -0800)]
Merge "Make the TimeAnimator class public."
Mathias Agopian [Sat, 4 Feb 2012 01:22:09 +0000 (17:22 -0800)]
attempt to fix an ANR in various apps
recent changes in SF introduced a hang where some windows would
stop being refreshed.
This is an attemp to fix that.
Change-Id: I6aa32ac0d6f1c0a6aea8f6195825dc4f4e6f93f9
Jeff Brown [Fri, 3 Feb 2012 23:48:33 +0000 (15:48 -0800)]
Merge "Make the Choreographer thread-safe."
James Dong [Fri, 3 Feb 2012 23:37:40 +0000 (15:37 -0800)]
Merge "Don't call virtual functions in destructors for the writer classes"
Mathias Agopian [Fri, 3 Feb 2012 23:35:45 +0000 (15:35 -0800)]
Merge "fix a dead-lock in eglMakeCurrent"
Stephen Hines [Fri, 3 Feb 2012 23:34:38 +0000 (15:34 -0800)]
Merge "We should not throw for non-fatal errors."
Mathias Agopian [Fri, 3 Feb 2012 23:24:51 +0000 (15:24 -0800)]
fix a dead-lock in eglMakeCurrent
this was introduced in a recent change. eglMakeCurrent can
end up calling eglDestroyImageKHR via ANativewWindow::disconnect
when the consumer is in the same process.
we make sure we don't hold the lock while this is happening.
Change-Id: Id17fe4fd76eecf5f962cefb9aa32be41fc1b042d
Eric Fischer [Fri, 3 Feb 2012 21:48:14 +0000 (13:48 -0800)]
Merge "Import translations. DO NOT MERGE"
Adam Cohen [Fri, 3 Feb 2012 20:06:20 +0000 (12:06 -0800)]
Merge "Handle null PendingIntents, Bitmaps, Uris and Intents in RemoteViews (issue
5223291)"
Amith Yamasani [Fri, 3 Feb 2012 20:04:40 +0000 (12:04 -0800)]
Merge "Multi-user - 1st major checkin"
Amith Yamasani [Wed, 4 May 2011 21:49:28 +0000 (14:49 -0700)]
Multi-user - 1st major checkin
Switching activity stacks
Cache ContentProvider per user
Long-press power to switch users (on phone)
Added ServiceMap for separating services by user
Launch PendingIntents on the correct user's uid
Fix task switching from Recents list
AppWidgetService is mostly working.
Commands added to pm and am to allow creating and switching profiles.
Change-Id: I15810e8cfbe50a04bd3323a7ef5a8ff4230870ed
Fabrice Di Meglio [Fri, 3 Feb 2012 19:57:54 +0000 (11:57 -0800)]
Merge "Fix bug #
5929529 Parentheses aren't correctly rendered in RTL context"
James Dong [Fri, 3 Feb 2012 19:29:59 +0000 (11:29 -0800)]
Merge "Keep AACEncoder around for a bit longer to have more time fix issues related to video editor engine"
Robert Greenwalt [Fri, 3 Feb 2012 16:54:02 +0000 (08:54 -0800)]
Merge "Add some logging to NDC."
Glenn Kasten [Fri, 3 Feb 2012 16:31:01 +0000 (08:31 -0800)]
Merge "Use audio_in_acoustics_t consistently"
Glenn Kasten [Fri, 3 Feb 2012 16:00:52 +0000 (08:00 -0800)]
Merge "Use ToneGenerator::tone_type consistently"
Glenn Kasten [Fri, 3 Feb 2012 15:59:42 +0000 (07:59 -0800)]
Merge "Use NULL not 0 for raw pointers"
George Mount [Fri, 3 Feb 2012 15:58:14 +0000 (07:58 -0800)]
Merge "Enable webkit text entry for all fields"
George Mount [Fri, 3 Feb 2012 15:58:07 +0000 (07:58 -0800)]
Merge "Use a node pointer to identify content-editable fields."
Glenn Kasten [Fri, 3 Feb 2012 15:46:42 +0000 (07:46 -0800)]
Merge "For performance, return large objects by reference"
Glenn Kasten [Fri, 3 Feb 2012 15:45:13 +0000 (07:45 -0800)]
Merge "No need to check a wp<> for 0 before promote()"
Glenn Kasten [Fri, 3 Feb 2012 15:26:28 +0000 (07:26 -0800)]
Merge "Cleanup thread types"
Glenn Kasten [Fri, 3 Feb 2012 15:18:06 +0000 (07:18 -0800)]
Merge "Make AudioTrack control block volume field private"
Stephen Hines [Fri, 3 Feb 2012 05:25:19 +0000 (21:25 -0800)]
Merge "Properly recover from failed compilation."
Jim Miller [Fri, 3 Feb 2012 03:25:06 +0000 (19:25 -0800)]
Merge "Fix
5907223: Fix lock screen glitch caused on devices with a system bar"
Jeff Brown [Fri, 3 Feb 2012 02:50:55 +0000 (18:50 -0800)]
Merge "Rename CancellationSignal using preferred spelling."
Xavier Ducrohet [Fri, 3 Feb 2012 01:47:08 +0000 (17:47 -0800)]
Merge "Make Layoutlib compile on Java 6."
Romain Guy [Fri, 3 Feb 2012 01:33:47 +0000 (17:33 -0800)]
Merge "Separate interface definition and implementation of Snapshot"
Mathias Agopian [Fri, 3 Feb 2012 00:28:05 +0000 (16:28 -0800)]
Merge "separate transactions from updates"
Mathias Agopian [Fri, 3 Feb 2012 00:27:37 +0000 (16:27 -0800)]
Merge "fix an issue where SF would spin if /sys/power/wait_for_fb_xxx don't exist"
Jeff Sharkey [Fri, 3 Feb 2012 00:26:41 +0000 (16:26 -0800)]
Merge "Support snoozing of data warning notification."
Mathias Agopian [Thu, 2 Feb 2012 23:14:13 +0000 (15:14 -0800)]
fix an issue where SF would spin if /sys/power/wait_for_fb_xxx don't exist
we now exit the Display thread on any error happening on these files.
also refactor the code and remove a lot of unused stuff.
Change-Id: I8d080c35b211890ca20ae09fa36fbdccdf5669a8
James Dong [Fri, 3 Feb 2012 00:15:16 +0000 (16:15 -0800)]
Merge "Unhide AAC_ADTS file format"
Wink Saville [Fri, 3 Feb 2012 00:04:17 +0000 (16:04 -0800)]
Merge "Telephony: Fix get_imsi and icc_io"
Dianne Hackborn [Thu, 2 Feb 2012 23:17:16 +0000 (15:17 -0800)]
Merge "New global setting for developer options."
Romain Guy [Thu, 2 Feb 2012 23:16:30 +0000 (15:16 -0800)]
Merge "Disable debugging code in the font renderer"
Alex Sakhartchouk [Thu, 2 Feb 2012 22:54:32 +0000 (14:54 -0800)]
Merge "Fix an incorrect assert that doesn't account for element array size."
Chet Haase [Thu, 2 Feb 2012 22:35:58 +0000 (14:35 -0800)]
Merge "Fix bug in LayoutTransition that caused views to stay invisible"
Glenn Kasten [Thu, 2 Feb 2012 21:31:23 +0000 (13:31 -0800)]
Merge "Fix const sp<>& in parameter list and return value"
James Dong [Thu, 2 Feb 2012 21:30:49 +0000 (13:30 -0800)]
Merge "Removed a loop for buffer lookup"
Glenn Kasten [Thu, 2 Feb 2012 21:30:48 +0000 (13:30 -0800)]
Merge "Unconditional delete"
Glenn Kasten [Thu, 2 Feb 2012 21:26:12 +0000 (13:26 -0800)]
Merge "More audio_stream_type_t"
Fabrice Di Meglio [Thu, 2 Feb 2012 21:25:30 +0000 (13:25 -0800)]
Merge "Update BiDiTest app"
Glenn Kasten [Thu, 2 Feb 2012 21:24:52 +0000 (13:24 -0800)]
Merge "Thread::getTid returns pid_t gettid() after run"
Jeff Sharkey [Thu, 2 Feb 2012 21:19:37 +0000 (13:19 -0800)]
Merge "Avoid NDC deadlock when re-arming network alert."
Marco Nelissen [Thu, 2 Feb 2012 18:48:01 +0000 (10:48 -0800)]
Merge "Enable media scanner bulk inserts"
Chet Haase [Thu, 2 Feb 2012 18:42:44 +0000 (10:42 -0800)]
Merge "Add Developer Option setting for Animator scaling."
Dianne Hackborn [Thu, 2 Feb 2012 18:41:50 +0000 (10:41 -0800)]
Merge "Use Choreographer for window manager animation timing."
Scott Main [Thu, 2 Feb 2012 18:03:43 +0000 (10:03 -0800)]
am
1e148f50: am
2adfc9de: am
633de7ba: docs: fix meta description tag for homepage
* commit '
1e148f509eda581b8ef7cf77acad7f9216034891':
Scott Main [Thu, 2 Feb 2012 18:03:42 +0000 (10:03 -0800)]
Scott Main [Thu, 2 Feb 2012 18:03:25 +0000 (10:03 -0800)]
am
4e133702: am
be09298e: am
633de7ba: docs: fix meta description tag for homepage
* commit '
4e133702acc81ac72a23aa9784c05deec5be59b6':
docs: fix meta description tag for homepage
Eric Laurent [Thu, 2 Feb 2012 17:39:28 +0000 (09:39 -0800)]
Merge "modifications for new webrtc modules"
Mathias Agopian [Wed, 1 Feb 2012 02:24:27 +0000 (18:24 -0800)]
separate transactions from updates
with this changes, SF transactions are handled as soon as possible
but do not trigger updates. the update is delayed until the next
vsync.
this allows us to work much better without requiring triple-buffering.
Change-Id: I1fa10794d0cf742129f0877698b7b1e1f2ec7401
James Dong [Thu, 2 Feb 2012 02:53:50 +0000 (18:53 -0800)]
Merge "Remove the restriction that the width must be a multiple of 4 or 2 for thumbnail generation"
Svetoslav Ganov [Thu, 2 Feb 2012 02:08:01 +0000 (18:08 -0800)]
Merge "Update the comment for View#clearFocus"
Adam Powell [Thu, 2 Feb 2012 01:46:55 +0000 (17:46 -0800)]
Merge "Fix bug
5339708 - edge case in ListView focus restoration"
Fabrice Di Meglio [Thu, 2 Feb 2012 01:21:59 +0000 (17:21 -0800)]
Merge "Fix bug #
5262565 Need to remove CharCount TextDirectionHeuristics"