Commit Graph

16870 Commits

Author SHA1 Message Date
Gilles Debunne
3ecceb5b94 Merge "TextView refactoring to ease future merges in HC." into gingerbread 2010-10-07 17:18:59 -07:00
Jaikumar Ganesh
f5cae7d1c5 am 38702d5f: Merge "DO NOT MERGE: Disconnect PBAP while disconnecting HFP profile." into gingerbread
Merge commit '38702d5f1c42e2dfcc8fa5472c8fe842b4056914' into gingerbread-plus-aosp

* commit '38702d5f1c42e2dfcc8fa5472c8fe842b4056914':
  DO NOT MERGE: Disconnect PBAP while disconnecting HFP profile.
2010-10-07 16:58:13 -07:00
Gilles Debunne
cbfbb524af TextView refactoring to ease future merges in HC.
Change-Id: I979324b28fa4ca787e5836271c9014bca590c595
2010-10-07 16:58:06 -07:00
Jaikumar Ganesh
38702d5f1c Merge "DO NOT MERGE: Disconnect PBAP while disconnecting HFP profile." into gingerbread 2010-10-07 16:56:06 -07:00
Mindy Pereira
6c4609ada4 am dfe0870e: Merge "DO NOT MERGE Only show edge glow effect on 1 side at a time." into gingerbread
Merge commit 'dfe0870e72574eaffc9a165f01a021149529d9c2' into gingerbread-plus-aosp

* commit 'dfe0870e72574eaffc9a165f01a021149529d9c2':
  DO NOT MERGE Only show edge glow effect on 1 side at a time.
2010-10-07 16:04:35 -07:00
Mindy Pereira
4f2c8cc86a am 36a18287: Merge "DO NOT MERGE Only show edge glow effect on 1 side at a time." into gingerbread
Merge commit '36a182870527f1d71f482e9a280bc818a4609cb6' into gingerbread-plus-aosp

* commit '36a182870527f1d71f482e9a280bc818a4609cb6':
  DO NOT MERGE Only show edge glow effect on 1 side at a time.
2010-10-07 15:47:44 -07:00
Gilles Debunne
c6faec80d2 am 4a962a06: Merge "Removing \'last\' of red cross asset." into gingerbread
Merge commit '4a962a06db88d7132448808aaae82b94728b69a6' into gingerbread-plus-aosp

* commit '4a962a06db88d7132448808aaae82b94728b69a6':
  Removing 'last' of red cross asset.
2010-10-07 15:47:23 -07:00
Jeff Brown
22cb4ef8ce am d577cfd7: Merge "Switch Looper back to using poll() instead of epoll()." into gingerbread
Merge commit 'd577cfd73a223279f9a5af698f55edd38a3fe4db' into gingerbread-plus-aosp

* commit 'd577cfd73a223279f9a5af698f55edd38a3fe4db':
  Switch Looper back to using poll() instead of epoll().
2010-10-07 15:46:57 -07:00
Mindy Pereira
4de94de9c5 DO NOT MERGE Only show edge glow effect on 1 side at a time.
Pulling on a side should force the opposite side into "decay".
Fixes b/3061753  new list "bounce" shouldn't show on both ends
This fixes scroller and horizontalscroller.

Change-Id: I4d9820c7178378b793ed9a29b119943eb1f46587
2010-10-07 15:12:56 -07:00
Mindy Pereira
ca6eb210e6 DO NOT MERGE Only show edge glow effect on 1 side at a time.
Pulling on a side should force the opposite side into "decay".
Fixes b/3061753  new list "bounce" shouldn't show on both ends

Change-Id: I4742e8c212f8e13da29ed887ebdd712903b533f7
2010-10-07 14:14:10 -07:00
Justin Ho
51501aa870 am b74941e3: Merge "Fixed popup assets (background)" into gingerbread
Merge commit 'b74941e32e068ec03f90b9a53670328cd17ff4b4' into gingerbread-plus-aosp

* commit 'b74941e32e068ec03f90b9a53670328cd17ff4b4':
  Fixed popup assets (background)
2010-10-07 14:02:22 -07:00
Adam Powell
b361639566 am f15dfbec: Merge "Fix bug 3071869 - text anchors are now treated as application sub-panels." into gingerbread
Merge commit 'f15dfbec5df911f4cedd3e302864496d77ce295b' into gingerbread-plus-aosp

* commit 'f15dfbec5df911f4cedd3e302864496d77ce295b':
  Fix bug 3071869 - text anchors are now treated as application sub-panels.
2010-10-07 14:02:15 -07:00
Brad Fitzpatrick
6a15f0d7c7 am 6275dbbe: Merge "Quiet unnecessary debug logging." into gingerbread
Merge commit '6275dbbea8ad7bde984a362516654004e111dc67' into gingerbread-plus-aosp

* commit '6275dbbea8ad7bde984a362516654004e111dc67':
  Quiet unnecessary debug logging.
2010-10-07 14:02:10 -07:00
Gilles Debunne
5e3329b5fa am e86a6b2a: Merge "Removed unused and broken screen_progress" into gingerbread
Merge commit 'e86a6b2a4dc0c01717366c35fd0d6acd778988d4' into gingerbread-plus-aosp

* commit 'e86a6b2a4dc0c01717366c35fd0d6acd778988d4':
  Removed unused and broken screen_progress
2010-10-07 14:01:48 -07:00
Brad Fitzpatrick
b8d40d263b am 30f5c8fe: More DropBoxManager javadoc love.
Merge commit '30f5c8fede241e7560f4a33e48af3a4627fd5efc' into gingerbread-plus-aosp

* commit '30f5c8fede241e7560f4a33e48af3a4627fd5efc':
  More DropBoxManager javadoc love.
2010-10-07 14:01:40 -07:00
Brad Fitzpatrick
992a9e507f am fd124570: Merge "DropBox.Entry javadoc syntax fix" into gingerbread
Merge commit 'fd124570ce647b3adc5dc30ce782d6e017dab4a2' into gingerbread-plus-aosp

* commit 'fd124570ce647b3adc5dc30ce782d6e017dab4a2':
  DropBox.Entry javadoc syntax fix
2010-10-07 14:01:30 -07:00
John Wang
5df4b5a78b am 08fb5851: Merge "Add flag to skip restoring network seletion." into gingerbread
Merge commit '08fb5851bbaf11ecac0cac0de321942bfbf6a630' into gingerbread-plus-aosp

* commit '08fb5851bbaf11ecac0cac0de321942bfbf6a630':
  Add flag to skip restoring network seletion.
2010-10-07 14:00:53 -07:00
Gilles Debunne
4a962a06db Merge "Removing 'last' of red cross asset." into gingerbread 2010-10-07 13:53:16 -07:00
Jeff Brown
d577cfd73a Merge "Switch Looper back to using poll() instead of epoll()." into gingerbread 2010-10-07 13:29:56 -07:00
Jeff Brown
415d8c3819 Switch Looper back to using poll() instead of epoll().
Added a couple of micro-optimizations to avoid calling wake() unnecessarily
and reduce JNI overhead slightly.

Fixed a minor issue where we were not clearing the "next" field of Messages
returned by the MessageQueue so the Message would hold on to its successor
and potentially prevent the GC from collecting it if the message were leaked
somehow.

Change-Id: I488d29417ce0cdd7d0e447cda76ec978ef7f811c
2010-10-07 13:26:39 -07:00
Chet Haase
6a5fc4bc62 Merge "New TimeInterpolator interface for android.animation package." 2010-10-07 13:18:36 -07:00
Chet Haase
e0ee2e9f31 New TimeInterpolator interface for android.animation package.
The new animation package's reliance on the old Interpolator interface (in
android.view.animation) was an eyesore. Adding TimeInterpolator, and having the
old Interpolator interface extend it, allows the new Animator classes to break
the tie to the older animation package completely. However, developers can still
use the older Interpolator-based classes, such as AccelerateInterpolator,
because they all implicitly extend the new TimeInterpolator class.

Change-Id: I41132fa56167ba564f4839113289114d0ea31a92
2010-10-07 12:27:06 -07:00
Dianne Hackborn
8c4e779a4c am e112b744: am 930d6c3c: Merge "Fix issue #3056500: Problem report for ASTRO" into gingerbread
Merge commit 'e112b744c08cd7dcffe142f3cd22c96870bad482'

* commit 'e112b744c08cd7dcffe142f3cd22c96870bad482':
  Fix issue #3056500: Problem report for ASTRO
2010-10-07 12:22:14 -07:00
Kenny Root
c5610a4c13 am cfc80bd5: am 2c3360fe: Merge "Remove lingering system app native libs in /data" into gingerbread
Merge commit 'cfc80bd5c1e4f0207357b288b1b7b8374a31ba70'

* commit 'cfc80bd5c1e4f0207357b288b1b7b8374a31ba70':
  Remove lingering system app native libs in /data
2010-10-07 12:21:22 -07:00
Gilles Debunne
94f183b1b4 Removing 'last' of red cross asset.
Change-Id: Ie325195220f95074d8e12e64216d1b02e9b3e2af
2010-10-07 12:07:43 -07:00
Justin Ho
b74941e32e Merge "Fixed popup assets (background)" into gingerbread 2010-10-07 11:56:18 -07:00
Adam Powell
f15dfbec5d Merge "Fix bug 3071869 - text anchors are now treated as application sub-panels." into gingerbread 2010-10-07 11:32:49 -07:00
Brad Fitzpatrick
6275dbbea8 Merge "Quiet unnecessary debug logging." into gingerbread 2010-10-07 11:27:56 -07:00
Brad Fitzpatrick
90bc5ee02b Quiet unnecessary debug logging.
Change-Id: I46d8aff5790db371d60b2066acbbdd55cfad8074
2010-10-07 11:26:57 -07:00
Adam Powell
574b37ecc2 Fix bug 3071869 - text anchors are now treated as application sub-panels.
This places text anchors on a layer above normal application panels,
ensuring that they stay above things like the browser autocompletion
list.

Change-Id: I4ee0aea7416a2dafd7e48a7a39acf949af5db3e9
2010-10-07 11:17:12 -07:00
Gilles Debunne
3c88039187 Fixed popup assets (background)
Change-Id: I8a651915119fec6a06a5f43315408b0d06c4b7d6
2010-10-07 10:54:54 -07:00
Joe Onorato
7d56e3d3cb Merge "Add extra to ACTION_BATTERY_CHANGED to indicate an invalid charger is attached." 2010-10-07 10:52:30 -07:00
Gilles Debunne
e86a6b2a4d Merge "Removed unused and broken screen_progress" into gingerbread 2010-10-07 10:52:11 -07:00
Brad Fitzpatrick
30f5c8fede More DropBoxManager javadoc love.
Change-Id: I9b14f6905533e0af66bd64fc76352ed8fc365058
2010-10-07 10:48:20 -07:00
Brad Fitzpatrick
95173b14d6 DropBox.Entry javadoc syntax fix
Change-Id: I32d055b39ca89ec9f6a7bf189263844424533b60
2010-10-07 10:07:34 -07:00
John Wang
08fb5851bb Merge "Add flag to skip restoring network seletion." into gingerbread 2010-10-07 09:47:01 -07:00
John Wang
35c4c211e0 Add flag to skip restoring network seletion.
For bug 3045366.

Change-Id: I7ad9ff89b0a77df473b638ad917b363c42de5405
2010-10-07 09:44:19 -07:00
Eric Rowe
82aacddef9 am f8d2acdc: Merge "DO NOT MERGE Initialize bluetooth profiles in BT stress tests" into gingerbread
Merge commit 'f8d2acdc57fd747278bb909c9e15b959e07d63b6' into gingerbread-plus-aosp

* commit 'f8d2acdc57fd747278bb909c9e15b959e07d63b6':
  DO NOT MERGE Initialize bluetooth profiles in BT stress tests
2010-10-07 09:19:37 -07:00
Eric Rowe
f8d2acdc57 Merge "DO NOT MERGE Initialize bluetooth profiles in BT stress tests" into gingerbread 2010-10-07 09:06:30 -07:00
Eric Rowe
8bcc744e1b DO NOT MERGE Initialize bluetooth profiles in BT stress tests
Change-Id: I0a8b75c8686d9d6969db51d618c1ddeacb2aba87
2010-10-07 18:01:23 +02:00
Wu-cheng Li
9df1408513 am 29332971: Merge "Add javadoc for display orientation." into gingerbread
Merge commit '29332971ddbace4ae3d645a67f28f717df8b1dbd' into gingerbread-plus-aosp

* commit '29332971ddbace4ae3d645a67f28f717df8b1dbd':
  Add javadoc for display orientation.
2010-10-07 07:18:39 -07:00
Adam Powell
86b500289b am fbb3b476: Fix bug 3066313 - integrate new text anchor assets.
Merge commit 'fbb3b4768e858f004fe9a87e83b066244c829d87' into gingerbread-plus-aosp

* commit 'fbb3b4768e858f004fe9a87e83b066244c829d87':
  Fix bug 3066313 - integrate new text anchor assets.
2010-10-07 07:18:21 -07:00
Dianne Hackborn
18e225b42b am bfba7cab: Fix issue #3001362: API REVIEW: android.view.InputQueue.Callback
Merge commit 'bfba7cab94cd9cf28e561159dbbe934dc83a6f0a' into gingerbread-plus-aosp

* commit 'bfba7cab94cd9cf28e561159dbbe934dc83a6f0a':
  Fix issue #3001362: API REVIEW: android.view.InputQueue.Callback
2010-10-07 07:18:08 -07:00
Eric Fischer
7778173a32 am 70f1a3b8: Merge "Import revised translations. DO NOT MERGE" into gingerbread
Merge commit '70f1a3b8a0fcf332e35f87be85ae3a9e37a85e9c' into gingerbread-plus-aosp

* commit '70f1a3b8a0fcf332e35f87be85ae3a9e37a85e9c':
  Import revised translations.  DO NOT MERGE
2010-10-07 07:16:56 -07:00
Dianne Hackborn
55f1b0b82f am 9d6824cd: Merge "Make Activity.removeDialog() less strict." into gingerbread
Merge commit '9d6824cd53960b4562ea3c55876b40ca21710050' into gingerbread-plus-aosp

* commit '9d6824cd53960b4562ea3c55876b40ca21710050':
  Make Activity.removeDialog() less strict.
2010-10-07 07:16:34 -07:00
Kenny Root
36455d0325 am a3ee5c03: Merge "Add MountService tests and fix a bug it found" into gingerbread
Merge commit 'a3ee5c0351e51f7a978ddddc37644f46051ca6ed' into gingerbread-plus-aosp

* commit 'a3ee5c0351e51f7a978ddddc37644f46051ca6ed':
  Add MountService tests and fix a bug it found
2010-10-07 07:16:08 -07:00
Dianne Hackborn
e89bf50261 am ef083ec0: Merge "Work on issue #3062691: GPS enable bypass via com.android.settings.widget.SettingsAppWidgetProvider" into gingerbread
Merge commit 'ef083ec008a3ec69180340912e7f0137472c97d9' into gingerbread-plus-aosp

* commit 'ef083ec008a3ec69180340912e7f0137472c97d9':
  Work on issue #3062691: GPS enable bypass via com.android.settings.widget.SettingsAppWidgetProvider
2010-10-07 07:15:57 -07:00
Gilles Debunne
f960718c1c am 1ae32bfe: New assets for buttons and notification
Merge commit '1ae32bfebf5102774cbf6424885f84e4630925c4' into gingerbread-plus-aosp

* commit '1ae32bfebf5102774cbf6424885f84e4630925c4':
  New assets for buttons and notification
2010-10-07 07:15:05 -07:00
Wu-cheng Li
29332971dd Merge "Add javadoc for display orientation." into gingerbread 2010-10-07 05:49:27 -07:00
Wu-cheng Li
c157e0cd16 Add javadoc for display orientation.
Display orientation should be considered while setting preview size,
picture size, or thumbnail size.

bug:3051937
Change-Id: I3b6bd1b920e4752ffdfc8aec56a0da9d474dd630
2010-10-07 19:41:23 +08:00