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

19705 Commits

Author SHA1 Message Date
Eric Fischer
1e09ca2a1f am c7bece13: Merge "Import revised translations. DO NOT MERGE" into honeycomb 
* commit 'c7bece13495949db1736263a7cf5cf67c6165c51':
  Import revised translations.  DO NOT MERGE
 2011-02-08 10:40:47 -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
Eric Fischer
7dd2196e8b Import revised translations. DO NOT MERGE 
Change-Id: Icb56518620be62481ed0d152f7eb9ab44d6f759d
 2011-02-07 17:19:23 -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
Mike Cleron
b31688eb05 am a626eb18: am 2d47fd3c: Merge "Fix crash when Paths are GCd in hw accelerated apps" into honeycomb 
* commit 'a626eb18ae2c4a48c8770ece3a64eeee5974f455':
  Fix crash when Paths are GCd in hw accelerated apps
 2011-02-07 13:47:48 -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
Romain Guy
f0907fe6d4 am 9732d9e6: am 43703325: Merge "New default wallpaper" into honeycomb 
* commit '9732d9e6ea78b9418cdef0054252d71292812f23':
  New default wallpaper
 2011-02-07 13:41:42 -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
Eric Fischer
dff2fea9b1 Import revised translations. DO NOT MERGE 
Change-Id: I9fe35888f8aa02c559949ad8395e8e4f4dffb669
 2011-02-07 13:17:26 -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
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