Dmitri Plotnikov
cdf228cf87
Merge "Full text search: new API, deprecating old API."
2011-02-08 18:14:40 -08:00
Adam Powell
a1ea2c8457
Merge "Fix bug 3345948 - ActionBar.show()/hide() shouldn't animate if called before first layout"
2011-02-08 16:32:54 -08:00
Dmitri Plotnikov
123653b890
Full text search: new API, deprecating old API.
...
All of this API, old and new, is hidden for now.
Bug: 2078420
Change-Id: I5895e992aa820fa189321e1859179bfe7ccb71ff
2011-02-08 16:31:20 -08:00
Adam Powell
50efbed668
Fix bug 3345948 - ActionBar.show()/hide() shouldn't animate if called
...
before first layout
Enable/disable the action bar show/hide animation as part of the
activity/dialog lifecycle. This allows apps to set action bar
visibility state as the activity first becomes visible or returns to
visibility without the associated animation.
Change-Id: I85ff9268d2cb2c8fcd3364dd275597fe90529224
2011-02-08 16:24:15 -08:00
Scott Main
121370d25c
am 3c565377: am b508d6e2: Merge "docs: fix links to revised fundamentals documents" into honeycomb
...
* commit '3c5653773d6b48f27aa52d746a7a6f8728d5ba36':
docs: fix links to revised fundamentals documents
2011-02-08 15:06:54 -08:00
Scott Main
3c5653773d
am b508d6e2: Merge "docs: fix links to revised fundamentals documents" into honeycomb
...
* commit 'b508d6e26e3a1fd68bf637dc29df335f0e7ccd92':
docs: fix links to revised fundamentals documents
2011-02-08 14:57:45 -08:00
Adam Powell
017b807991
Merge "Fix bug 3395349 - Treat Spinner dropDownWidth property properly"
2011-02-08 14:20:36 -08:00
Adam Powell
8db7cb1cdf
Fix bug 3395349 - Treat Spinner dropDownWidth property properly
...
Change-Id: I15bca2c938e1f9742cc5d47218632a1e636f90ac
2011-02-08 14:19:35 -08:00
Shimeng (Simon) Wang
357a9335c2
Merge "Fix bug: use content height instead of view height."
2011-02-08 12:30:52 -08:00
Romain Guy
069ea0e31a
Better handling of EGL_SWAP_BEHAVIOR_PRESERVED_BIT
...
Bug #3410832
Bug #3410834
Change-Id: I6025d6b7200e4d23e43f783e9401df13a13e7b63
2011-02-08 12:24:52 -08:00
Scott Main
7aee61f5a9
docs: fix links to revised fundamentals documents
...
Change-Id: Ie2a660cce1d00f924c9fde5c6a00776307e5e1c7
2011-02-08 11:37:44 -08:00
Shimeng (Simon) Wang
6a0b5ca114
Fix bug: use content height instead of view height.
...
issue: 3396895
Change-Id: I3012fa2c48d3e215d5b877ac525fdba89c0f9251
2011-02-08 10:19:53 -08:00
Gilles Debunne
5a50351cf3
Merge "CTRL+A simply highlights all text."
2011-02-08 10:15:01 -08:00
Jesse Wilson
543146a82b
Remove @Override that chokes Doclava.
...
Change-Id: I160aa2209d148c48f4ab8f4dc42ab77d300919de
2011-02-08 10:01:09 -08:00
Jesse Wilson
4baf5d7234
Merge "New LRU cache class."
2011-02-08 09:12:15 -08:00
Adam Powell
c1a35d2b1a
Merge "Fix bug 3389707 - Spinner: should be able to expand wider than their collapsed size"
2011-02-07 19:09:44 -08:00
Adam Powell
19fd164408
Fix bug 3389707 - Spinner: should be able to expand wider than their
...
collapsed size
Change-Id: Ibd7389d3d7f74b36e9b3e42392cc1f3c0522f20d
2011-02-07 19:05:32 -08:00
Adam Powell
326a23a381
Merge "Fix bug 3426162 - Overflow menu closes on its own"
2011-02-07 18:11:53 -08:00
Adam Powell
f2d7a5d831
Fix bug 3426162 - Overflow menu closes on its own
...
Makes populating action menus smarter, doesn't completely empty and
repopulate. Fixes issues where changing menus can leave popups without
an anchor.
Change-Id: I03cc266f0952123c5704a78cdcfc69b77af1915b
2011-02-07 18:09:56 -08:00
Gilles Debunne
299733e2b4
CTRL+A simply highlights all text.
...
Bug 3351442
It does not start text selection mode, and does not display selection
handles. Just like a selectAllOnFocus does.
Change-Id: I3b6df3c57abb7cc2cd03a0a67896faeec2ec631f
2011-02-07 17:11:41 -08:00
Jaikumar Ganesh
609602ed77
Merge "Reject incoming tethering connections if Tethering option is not enabled."
2011-02-07 16:49:26 -08:00
Jaikumar Ganesh
8f08ae9661
Reject incoming tethering connections if Tethering option is not enabled.
...
Change-Id: I40aa08ad5a3f3a2169551bbe35682910daced098
2011-02-07 16:45:23 -08:00
Jesse Wilson
e2c1f4a0ee
New LRU cache class.
...
Change-Id: I0e6ea1e489c684b876aebd5857c6f16a21048a8d
http://b/3184897
2011-02-07 16:39:35 -08:00
Shimeng (Simon) Wang
ae7272d8cb
Merge "Send actual view height to webkit for window.innerHeight."
2011-02-07 15:30:52 -08:00
Vasu Nori
be92556350
Merge "while waiting for lock, try in 30sec intervals and print warnings if no lock"
2011-02-07 14:40:25 -08:00
Scott Main
97228942d8
am 602a891a: am b0f1cfff: Merge "docs: SearchView is iconified by default" into honeycomb
...
* commit '602a891aea0392168e90f9dee61b33f45c698f34':
docs: SearchView is iconified by default
2011-02-07 13:51:36 -08:00
Paul Eastham
19e70cbbcb
am 9a5bda87: am be46d145: Revert "Fix for StaticLayout bug with ellipsized text"
...
* commit '9a5bda875f86b188b501ce7cf73810dd92288251':
Revert "Fix for StaticLayout bug with ellipsized text"
2011-02-07 13:50:42 -08:00
Kenny Root
7679365b54
am 6465889e: am c4dfa998: am d2a99617: am c94a9998: Merge "JPtextinput: Dont break emoji characters when cutting strings."
...
* commit '6465889ecbf4c04bb4bb6f4e8d4306727f7ca837':
JPtextinput: Dont break emoji characters when cutting strings.
2011-02-07 13:49:08 -08:00
Eric Laurent
3da2538aa1
am bdb23c26: am 2e96f15d: Merge "Fix issues 3425035 and 3423785." into honeycomb
...
* commit 'bdb23c26759089e29eb2f379e296bd006bc32b97':
Fix issues 3425035 and 3423785.
2011-02-07 13:46:31 -08:00
Gilles Debunne
de1285e7ea
am 63308bd0: am a324a581: Merge "Fix for StaticLayout bug with ellipsized text" into honeycomb
...
* commit '63308bd092a0edcea685d9f81b3d6d6d345c663b':
Fix for StaticLayout bug with ellipsized text
2011-02-07 13:46:21 -08:00
Mike Cleron
9ac50056dd
am c1467908: am b8578741: Merge "Fix issue #3424823 : 4-corner trick causes runtime restart" into honeycomb
...
* commit 'c14679089376fb7df28eb0a829518b33abb1d794':
Fix issue #3424823 : 4-corner trick causes runtime restart
2011-02-07 13:45:21 -08:00
Patrick Scott
f01e3b5b8f
am 01b7a98c: am 160c18a4: Merge "Need a public way to wait for cookie operations." into honeycomb
...
* commit '01b7a98c31f3d4587fb6739c8c6b35530177c20c':
Need a public way to wait for cookie operations.
2011-02-07 13:44:41 -08:00
Mike Cleron
85cabc2eb3
am 9cfa9c7a: am f6141980: Merge changes I46acd27a,I70b322e1 into honeycomb
...
* commit '9cfa9c7a3f5f23dec6ef4575407c1076d1b3c479':
aa is better than cc
Prevent ProgressBar from slowing down everything. bug #3422568
2011-02-07 13:41:21 -08:00
Daniel Sandler
32cd1d5053
resolved conflicts for merge of 31796297 to master
...
Change-Id: Ice632b3378f8f67c186245fdb63b022ade864ba1
2011-02-07 16:12:16 -05:00
Alon Albert
f313e95821
Merge "Move handing of a "cancel" inside try-finally block"
2011-02-07 12:20:36 -08:00
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
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
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
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 bbc910f229 .
2011-02-04 19:17:54 -08:00