drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
45,115 Commits 1 Branch 0 Tags
Commit Graph

19726 Commits

Author SHA1 Message Date
Dianne Hackborn
40e7a989e7 Merge "Fix COMPONENT_ENABLED_STATE check (copy from HC)" 2011-02-07 12:11:12 -08:00
Eric Laurent
ced2c59678 am a37a81d7: am e6955f8e: Merge "Issue 3371080: fix VolumePanel in mute state" into honeycomb 
* commit 'a37a81d705bd9abaf1110fecd176a74d32ac2016':
  Issue 3371080: fix VolumePanel in mute state
 2011-02-07 11:40:51 -08:00
Jim Miller
f44ca4664f am 6b590c8f: am 0d47ac11: Merge "Fix 3419077: Allow subclasses to change SeekBarPreference action buttons." into honeycomb 
* commit '6b590c8fd36c20961e9f4ab36bfc03e82f5abf24':
  Fix 3419077: Allow subclasses to change SeekBarPreference action buttons.
 2011-02-07 11:40:38 -08:00
Jim Miller
6572cfe8dc am da983f73: am 4ce0cad1: Merge "Issue 3371080: fix volume update in mute state." into honeycomb 
* commit 'da983f734c608fde57ea4f213d8640490a2f3a84':
  Issue 3371080: fix volume update in mute state.
 2011-02-07 11:40:21 -08:00
Dianne Hackborn
7da70821f7 am 94baff47: am 1b1962f3: Merge "Fix issue #3420898: More wallpaper issues" into honeycomb 
* commit '94baff47975fb3ae1380333f23fc2de2dc65eb86':
  Fix issue #3420898: More wallpaper issues
 2011-02-07 11:39:45 -08:00
Adam Powell
e7175e848b am 86ce6866: am c1be7ac9: Merge "Asset updates for dialog frames and seek bar thumbs" into honeycomb 
* commit '86ce68668c700bd4090d6ef74df3483ce9fea957':
  Asset updates for dialog frames and seek bar thumbs
 2011-02-07 11:38:25 -08:00
Justin Ho
b843c687a7 am 6d1fbba6: am 40523b1b: Merge "Updating default wallpaper" into honeycomb 
* commit '6d1fbba68608dfd8d91d14d67bc34255a14ee4ac':
  Updating default wallpaper
 2011-02-07 11:38:04 -08:00
Nick Pelly
996d493967 am 7c95a2c2: am 062443f2: am 40684946: Merge "Fix docs type that broke build." into gingerbread 
* commit '7c95a2c2471e1ae2308f8a00927e08f321bf8059':
  Fix docs type that broke build.
 2011-02-07 11:37:28 -08:00
Amith Yamasani
9edc5c056f am 9589ac6c: am 823fbbba: Merge "Expanded volume panel with sliders and mute buttons." into honeycomb 
* commit '9589ac6c3f63a632e078adcc8ef742412af2014c':
  Expanded volume panel with sliders and mute buttons.
 2011-02-07 11:36:32 -08:00
Nick Pelly
ca3a704acc am 3bb7b0c2: am 5394ef06: am 630ac8df: Merge "NFC documentation overhaul." into gingerbread 
* commit '3bb7b0c2b3d448a60b64eba37c998d1f7c7424e2':
  NFC documentation overhaul.
 2011-02-07 11:35:47 -08:00
Vasu Nori
d4608a35e8 while waiting for lock, try in 30sec intervals and print warnings if no lock 
should help a little bit in debugging deadlocks in the process.
especially when the an application does this:
  thread1: begin transaction
  thread2: synchronized void blahMethod { do some code; begintransaction;}
  thread1: with lock ion the database, it now tries to get into the above
           synchronized method
   thread2 has synchronized monitor and thred1 has db lock.
   each wants the other lock
 deadlock.
and our stacktraces will not tell us that thread1 has the database lock.

with this CL, we will know WHO owns the database lock and which thread
dies waiting for the lock.

Change-Id: If51578e7fa0a70ee3d762eb2233d1fddd98a2e86
 2011-02-07 11:08:41 -08:00
Justin Ho
e44e28fa11 am 0c3169cf: am 60a008ed: Updated volume dialog assets 
* commit '0c3169cf208b253b1f3f41ca82796a464eeec464':
  Updated volume dialog assets
 2011-02-07 10:57:19 -08:00
Alon Albert
9257ec0563 Move handing of a "cancel" inside try-finally block 
Bug: 3417906
Change-Id: I87e41c0cdad74e2ba72a7b4d1f059e72d106e105
 2011-02-07 10:53:26 -08:00
Justin Ho
f04b353573 am fc05bc3b: am cc84ea17: Merge "Updated default wallpaper" into honeycomb 
* commit 'fc05bc3b36c665a0da2661d57a2c5a68245e6a68':
  Updated default wallpaper
 2011-02-07 10:48:07 -08:00
Justin Ho
6d9aa80ae9 am efba660d: am 97e1dbab: Merge "Adding remaining volume dialog assets" into honeycomb 
* commit 'efba660d8efb8ed2f8c31c4aeea81b32016ad601':
  Adding remaining volume dialog assets
 2011-02-07 10:47:17 -08:00
Justin Ho
4a01756c99 am 8bdfcaa0: am 9b95d352: Updated Talk notification icon Bug: 3362749 
* commit '8bdfcaa0c452dba14b1dc03d9a78728bb39e72a0':
  Updated Talk notification icon Bug: 3362749
 2011-02-07 10:46:47 -08:00
Scott Main
602a891aea am b0f1cfff: Merge "docs: SearchView is iconified by default" into honeycomb 
* commit 'b0f1cfffd9b201335560c15ffbdcfe12225bac8c':
  docs: SearchView is iconified by default
 2011-02-07 09:44:52 -08:00
Scott Main
b0f1cfffd9 Merge "docs: SearchView is iconified by default" into honeycomb 2011-02-07 09:33:32 -08:00
Scott Main
cccdbe9acb docs: SearchView is iconified by default 
Change-Id: Iabe0fdc0b28847f0c401e3692932a73b7d595c88
 2011-02-06 16:28:05 -08:00
Paul Eastham
9a5bda875f am be46d145: Revert "Fix for StaticLayout bug with ellipsized text" 
* commit 'be46d1456beb7e2f3e8b82bda2d0a5023db3debd':
  Revert "Fix for StaticLayout bug with ellipsized text"
 2011-02-04 19:23:10 -08:00
Paul Eastham
be46d1456b Revert "Fix for StaticLayout bug with ellipsized text" 
This reverts commit bbc910f229dec45fa7481a62fbf051f7ff3130e7.
 2011-02-04 19:17:54 -08:00
Lorenzo Colitti
24401c7966 Merge "Add a protocol property to the APNs and use it." 2011-02-04 17:41:11 -08:00
Gilles Debunne
cdfe899991 Fix for multiple merge problem. 
Change-Id: I5d9c497f44aa9cdc34c195c41e02c3d7353c3fb4
 2011-02-04 16:50:01 -08:00
Kenny Root
6465889ecb am c4dfa998: am d2a99617: am c94a9998: Merge "JPtextinput: Dont break emoji characters when cutting strings." 
* commit 'c4dfa998b7660b9afc4d41b0c940d798f2122fc3':
  JPtextinput: Dont break emoji characters when cutting strings.
 2011-02-04 16:16:19 -08:00
Kenny Root
c4dfa998b7 am d2a99617: am c94a9998: Merge "JPtextinput: Dont break emoji characters when cutting strings." 
* commit 'd2a996173e53e7b38ff9b703cc5986d9715508a1':
  JPtextinput: Dont break emoji characters when cutting strings.
 2011-02-04 16:12:14 -08:00
Kenny Root
d2a996173e am c94a9998: Merge "JPtextinput: Dont break emoji characters when cutting strings." 
* commit 'c94a99987d8a49ea599c22ffad0e61db591963e0':
  JPtextinput: Dont break emoji characters when cutting strings.
 2011-02-04 16:01:13 -08:00
Gilles Debunne
1ba2a47b82 am 893ac28f: Merge "Blinking runnable is created only if text is editable. DO NOT MERGE." into gingerbread 
* commit '893ac28f75561061a8f334cbd4e47833d7fd7843':
  Blinking runnable is created only if text is editable. DO NOT MERGE.
 2011-02-04 15:50:15 -08:00
Gilles Debunne
826fbdf7b6 am 8a6ba494: Merge "All runnable are stopped on detach. DO NOT MERGE." into gingerbread 
* commit '8a6ba494a28702e68b0a8fbd8bac34335536a8f8':
  All runnable are stopped on detach. DO NOT MERGE.
 2011-02-04 15:50:12 -08:00
Gilles Debunne
c0728cc042 Double tap triggers text selection in a TextView. DO NOT MERGE 
This is a convenient way to switch to selection mode without the
context menu. Context menu is still available and offerts Select Input method option.

Browser overloads touch events and this feature is not available in Browser which
limits the conflict with double tap zoom in browser.

Change-Id: I286504cf03733d5c2fb9bc01765f713d14bbd2f4
 2011-02-04 15:50:10 -08:00
Gilles Debunne
2f7e9d403a am 53841df2: Merge "SelectAllOnFocus shows a higlighted text. DO NOT MERGE." into gingerbread 
* commit '53841df2a49bffa53ba3d1e4b0580f4f23a64dc3':
  SelectAllOnFocus shows a higlighted text. DO NOT MERGE.
 2011-02-04 15:49:56 -08:00
Gilles Debunne
893ac28f75 Merge "Blinking runnable is created only if text is editable. DO NOT MERGE." into gingerbread 2011-02-04 15:46:15 -08:00
Gilles Debunne
8a6ba494a2 Merge "All runnable are stopped on detach. DO NOT MERGE." into gingerbread 2011-02-04 15:46:11 -08:00
Gilles Debunne
53841df2a4 Merge "SelectAllOnFocus shows a higlighted text. DO NOT MERGE." into gingerbread 2011-02-04 15:46:06 -08:00
Kenny Root
c94a99987d Merge "JPtextinput: Dont break emoji characters when cutting strings." 2011-02-04 15:42:14 -08:00
Mike Cleron
a626eb18ae am 2d47fd3c: Merge "Fix crash when Paths are GCd in hw accelerated apps" into honeycomb 
* commit '2d47fd3c3566e5fbe16bcee2ec4be87c6cdc2440':
  Fix crash when Paths are GCd in hw accelerated apps
 2011-02-04 15:32:04 -08:00
Mike Cleron
2d47fd3c35 Merge "Fix crash when Paths are GCd in hw accelerated apps" into honeycomb 2011-02-04 15:29:28 -08:00
Eric Laurent
bdb23c2675 am 2e96f15d: Merge "Fix issues 3425035 and 3423785." into honeycomb 
* commit '2e96f15d8c6608c6bcb49c73fe13078a57245b28':
  Fix issues 3425035 and 3423785.
 2011-02-04 14:08:25 -08:00
Eric Laurent
2e96f15d8c Merge "Fix issues 3425035 and 3423785." into honeycomb 2011-02-04 14:06:40 -08:00
Gilles Debunne
63308bd092 am a324a581: Merge "Fix for StaticLayout bug with ellipsized text" into honeycomb 
* commit 'a324a5810c84596d3a4f67f81a725a0c98dfc30f':
  Fix for StaticLayout bug with ellipsized text
 2011-02-04 14:02:05 -08:00
Gilles Debunne
a324a5810c Merge "Fix for StaticLayout bug with ellipsized text" into honeycomb 2011-02-04 13:59:29 -08:00
Chet Haase
5a7e828842 Fix crash when Paths are GCd in hw accelerated apps 
A recent change to optimize path rendering didn't account for
the destruction of native objects by the VM finalizer. We may be
done with the Java level version before we're done with the native
structure that's used by the display list. For example, a drawing
method on a View that creates a temporary path to render into the
canvas will implicitly create a native structure that is put onto
the GL display list. That temporary path may go away, but the native
version should stick around as long as the display list does.

The fix is to refcount the original native version of the path
and only delete it when the refcoutn reaches zero (which means that
it is no longer needed by any display list). This is a similar mechanism
used for bitmaps and shaders.

Change-Id: I4de1047415066d425d1c689aa60827f97729b470
 2011-02-04 12:50:55 -08:00
Eric Laurent
402f7f2963 Fix issues 3425035 and 3423785. 
- Make sure that STREAM_MUSIC is affected by ringer mode on non voice capable
devices whatever the saved settings say.

- Added a hidden method to AudioManager for VolumePanel to override
the stream selection logic while the panel is showing.

Change-Id: Ib2ff2a7af63decb4e29c45700c41e5058f79d877
 2011-02-04 12:39:14 -08:00
Mike Cleron
c146790893 am b8578741: Merge "Fix issue #3424823: 4-corner trick causes runtime restart" into honeycomb 
* commit 'b85787411085bbea0ac725135cae02a4167b7aa7':
  Fix issue #3424823: 4-corner trick causes runtime restart
 2011-02-04 11:56:23 -08:00
Mike Cleron
b857874110 Merge "Fix issue #3424823: 4-corner trick causes runtime restart" into honeycomb 2011-02-04 11:53:58 -08:00
Patrick Scott
01b7a98c31 am 160c18a4: Merge "Need a public way to wait for cookie operations." into honeycomb 
* commit '160c18a4d209f56766fdd90e4711c8e29fd407e6':
  Need a public way to wait for cookie operations.
 2011-02-04 11:22:41 -08:00
Shimeng (Simon) Wang
48fc9097cc Send actual view height to webkit for window.innerHeight. 
Currently only fixed height is sent over to webkit, which is to
avoid relayout when url bar is being scrolled.
And this fixed height is used also as the visible height and shown up
as window.innerheight, which is not correct.

This change sends the actual view height as the screen height to
webkit, so window.innerheight is correct.  This may potentially
help fixed elments in a page's bottom.  The relayout is still avoided
as before.

issue: 3396895
Change-Id: I0426a7d6dc76a823d8d26943a92689f49026fba8
 2011-02-04 10:57:54 -08:00
Dianne Hackborn
912d9d1369 Fix issue #3424823: 4-corner trick causes runtime restart 
Change-Id: Ibd3fc63d0ab975a2b74765a00023c7f783b24216
 2011-02-04 10:35:36 -08:00
Robert Greenwalt
6d1f9d031d Merge "Place the DHCP server address in the "next server IP address" field of the bootp header. A certain Apple client likes this, and it is more consistent with other DHCP servers." 2011-02-04 10:16:22 -08:00
Patrick Scott
b88e52c760 Need a public way to wait for cookie operations. 
Hidden for now as we are past the public api deadline.

Bug: 3421214
Change-Id: I8a65ae479d0b8b020af2600d7d29d5d358414add
 2011-02-04 12:52:46 -05:00
Leon Scroggins
2f7fa83507 Save form data when submitted. 
Bug:3280725

Save form data when submitted, rather than when a page
loads.

Requires a change in external/webkit.

Change-Id: I3ff9515ef9e9ab28992cdc8a7beb537752ed1e8c
 2011-02-04 11:43:19 -05:00