Commit Graph

19377 Commits

Author SHA1 Message Date
Justin Ho
45fd903c5a am b6634127: Merge "Updating popup center asset (v5)" into gingerbread
Merge commit 'b663412741ca3fa30473106a7bda3a8a95a5e194' into gingerbread-plus-aosp

* commit 'b663412741ca3fa30473106a7bda3a8a95a5e194':
  Updating popup center asset (v5)
2010-10-13 17:33:36 -07:00
Justin Ho
6ea889064d Merge "Updating popup center asset (v5)" into gingerbread 2010-10-13 17:15:00 -07:00
Jesse Wilson
567307a5d4 am 3394db7d: Merge "Regenerate preloaded classes for Gingerbread." into gingerbread
Merge commit '3394db7d9432053e56d86b3f24e64deeb3099950' into gingerbread-plus-aosp

* commit '3394db7d9432053e56d86b3f24e64deeb3099950':
  Regenerate preloaded classes for Gingerbread.
2010-10-13 17:02:48 -07:00
Jesse Wilson
04e736394a Merge "Regenerate preloaded classes for Gingerbread." into gingerbread 2010-10-13 16:59:12 -07:00
Jaikumar Ganesh
a28308b33a am a31cbd61: Merge "Remove STOPSHIP and reduce log spam." into gingerbread
Merge commit 'a31cbd61bc53730d756464b0c273475c4f738066' into gingerbread-plus-aosp

* commit 'a31cbd61bc53730d756464b0c273475c4f738066':
  Remove STOPSHIP and reduce log spam.
2010-10-13 16:56:27 -07:00
Vasu Nori
a533ebe220 am 51679ca8: Merge "bug:3069735 in Download UI app, handle deletes correctly" into gingerbread
Merge commit '51679ca89293ef33275b9681018c09be3948bf1c' into gingerbread-plus-aosp

* commit '51679ca89293ef33275b9681018c09be3948bf1c':
  bug:3069735 in Download UI app, handle deletes correctly
2010-10-13 16:52:57 -07:00
Jaikumar Ganesh
0f67f57fa9 Merge "Remove STOPSHIP and reduce log spam." into gingerbread 2010-10-13 16:52:52 -07:00
Vasu Nori
3de1115fc9 Merge "bug:3069735 in Download UI app, handle deletes correctly" into gingerbread 2010-10-13 16:50:45 -07:00
Jaikumar Ganesh
0c373811ab am c008ca96: Merge "Work around for errant headsets." into gingerbread
Merge commit 'c008ca96bb32289958010dcf8f247c35ab9b1f18' into gingerbread-plus-aosp

* commit 'c008ca96bb32289958010dcf8f247c35ab9b1f18':
  Work around for errant headsets.
2010-10-13 16:48:41 -07:00
Jaikumar Ganesh
93aa52d2b4 Merge "Work around for errant headsets." into gingerbread 2010-10-13 16:44:17 -07:00
Mindy Pereira
bf60e0e7bd am 998c6777: Merge "Never show overscroll if the page scrolls at all." into gingerbread
Merge commit '998c67774aa2260ed05a39df45d983feb72e683c' into gingerbread-plus-aosp

* commit '998c67774aa2260ed05a39df45d983feb72e683c':
  Never show overscroll if the page scrolls at all.
2010-10-13 16:34:27 -07:00
Mindy Pereira
1837c61e40 Merge "Never show overscroll if the page scrolls at all." into gingerbread 2010-10-13 16:31:18 -07:00
Mindy Pereira
14fe6b832a am 868322ce: Merge "Reduce the time it takes to decay the glow after a pull." into gingerbread
Merge commit '868322ced806ec58750edd8ce964f4e17507ddad' into gingerbread-plus-aosp

* commit '868322ced806ec58750edd8ce964f4e17507ddad':
  Reduce the time it takes to decay the glow after a pull.
2010-10-13 16:25:59 -07:00
Mindy Pereira
742983fdec Merge "Reduce the time it takes to decay the glow after a pull." into gingerbread 2010-10-13 16:23:15 -07:00
Mathias Agopian
d91595b000 am 011b5bcc: Merge "implement part of [3094280] New animation for screen on and screen off add support for screen on animation" into gingerbread
Merge commit '011b5bcc0355338b7ff906656282a54ffaa04b5a' into gingerbread-plus-aosp

* commit '011b5bcc0355338b7ff906656282a54ffaa04b5a':
  implement part of [3094280] New animation for screen on and screen off
2010-10-13 15:59:42 -07:00
Mathias Agopian
c2a2b5c440 Merge "implement part of [3094280] New animation for screen on and screen off add support for screen on animation" into gingerbread 2010-10-13 15:55:57 -07:00
Andreas Huber
48ffcfce90 am 90d59d18: Merge "Metadata.cpp and Metadata.java had drifted out of sync. This change remedies that." into gingerbread
Merge commit '90d59d180bd963f00161e6bfaabfda432960cab6' into gingerbread-plus-aosp

* commit '90d59d180bd963f00161e6bfaabfda432960cab6':
  Metadata.cpp and Metadata.java had drifted out of sync. This change remedies that.
2010-10-13 15:50:27 -07:00
Andreas Huber
bd44d85426 Merge "Metadata.cpp and Metadata.java had drifted out of sync. This change remedies that." into gingerbread 2010-10-13 15:46:18 -07:00
Jean-Baptiste Queru
779d49ea2e Merge "ignore - a similar change already exists" into gingerbread-plus-aosp 2010-10-13 15:26:15 -07:00
Jean-Baptiste Queru
42dda50965 ignore - a similar change already exists
Change-Id: I5e8be06213161c7f3ab284a74030b6117bb43dab
2010-10-13 15:23:38 -07:00
Dan Morrill
31d44c288e am 5c62ab0a: Merge "Adding a new <uses-gl-texture/> tag, to be used to enable apps to specify filtering based on support for OpenGL ES texture and texture compression formats." into gingerbread
Merge commit '5c62ab0af9dadc3bccdad7b01c3ae17266f0b0e1' into gingerbread-plus-aosp

* commit '5c62ab0af9dadc3bccdad7b01c3ae17266f0b0e1':
  Adding a new <uses-gl-texture/> tag, to be used to enable apps to specify
2010-10-13 15:23:27 -07:00
Dan Morrill
03a7820c96 Merge "Adding a new <uses-gl-texture/> tag, to be used to enable apps to specify filtering based on support for OpenGL ES texture and texture compression formats." into gingerbread 2010-10-13 15:20:34 -07:00
Kenny Root
a5661d2ee6 am 361a6ad1: Merge "Handle native library deletion in scanPackage" into gingerbread
Merge commit '361a6ad16dedfed871c76e8fa64eb45aa82a0088' into gingerbread-plus-aosp

* commit '361a6ad16dedfed871c76e8fa64eb45aa82a0088':
  Handle native library deletion in scanPackage
2010-10-13 14:53:23 -07:00
Kenny Root
fab4a31891 am 49ec3dff: Merge "OBB: Change documentation to reflect reality" into gingerbread
Merge commit '49ec3dff4350209e109fc11dafe4294acea36146' into gingerbread-plus-aosp

* commit '49ec3dff4350209e109fc11dafe4294acea36146':
  OBB: Change documentation to reflect reality
2010-10-13 14:53:18 -07:00
Kenny Root
8e896920e7 Merge "Handle native library deletion in scanPackage" into gingerbread 2010-10-13 14:50:29 -07:00
Kenny Root
322ea9435a Merge "OBB: Change documentation to reflect reality" into gingerbread 2010-10-13 14:49:42 -07:00
Andreas Huber
4de1235c82 am 5f423917: Merge "Attempt to derive the avg. bitrate of the entire stream from metadata." into gingerbread
Merge commit '5f42391701c0657d520d00f62a4c061b18ba1280' into gingerbread-plus-aosp

* commit '5f42391701c0657d520d00f62a4c061b18ba1280':
  Attempt to derive the avg. bitrate of the entire stream from metadata.
2010-10-13 14:28:52 -07:00
Mathias Agopian
9daa5c9b9d implement part of [3094280] New animation for screen on and screen off
add support for screen on animation

Change-Id: If50cf52ae04b95b42da7d74cf7fa96d5cb54d238
2010-10-13 14:28:26 -07:00
Andreas Huber
f61daab2ed Merge "Attempt to derive the avg. bitrate of the entire stream from metadata." into gingerbread 2010-10-13 14:25:32 -07:00
Andreas Huber
f8659dd62b am 646e0d5a: Merge "Some webcams output rtp streams but never send any rtcp data in violation of the specs. Attempt to use fake timestamps to be able to play these..." into gingerbread
Merge commit '646e0d5ab342f414f556574f2d078bd6deb22ed3' into gingerbread-plus-aosp

* commit '646e0d5ab342f414f556574f2d078bd6deb22ed3':
  Some webcams output rtp streams but never send any rtcp data in violation of
2010-10-13 14:22:57 -07:00
Kenny Root
3c191009bd am e6ae5c39: Merge "Add shutdown assurance" into gingerbread
Merge commit 'e6ae5c39848d2a3a6f3fb750811550969799e410' into gingerbread-plus-aosp

* commit 'e6ae5c39848d2a3a6f3fb750811550969799e410':
  Add shutdown assurance
2010-10-13 14:22:19 -07:00
Andreas Huber
7a838543a9 Merge "Some webcams output rtp streams but never send any rtcp data in violation of the specs. Attempt to use fake timestamps to be able to play these..." into gingerbread 2010-10-13 13:45:57 -07:00
Kenny Root
ad34e3b167 Merge "Add shutdown assurance" into gingerbread 2010-10-13 13:19:25 -07:00
Wink Saville
67047d53d0 am 07e1be62: Merge "Fix NPE caused by Change I4df27119." into gingerbread
Merge commit '07e1be62c7a8650313e7ad8690968c58ec8e88ad' into gingerbread-plus-aosp

* commit '07e1be62c7a8650313e7ad8690968c58ec8e88ad':
  Fix NPE caused by Change I4df27119.
2010-10-13 12:27:22 -07:00
Scott Main
7823e1a6c4 am eb4ef072: am 5249ad03: docs: add "boot completed" broadcast to list of DO NOTs for installing on external storage bug: 3088494
Merge commit 'eb4ef07223030eb61d8cf99771e657b7fc0108d0' into gingerbread-plus-aosp

* commit 'eb4ef07223030eb61d8cf99771e657b7fc0108d0':
  docs: add "boot completed" broadcast to list of DO NOTs for installing on external storage
2010-10-13 12:27:08 -07:00
Wink Saville
3ac8dfcb03 Merge "Fix NPE caused by Change I4df27119." into gingerbread 2010-10-13 12:17:05 -07:00
Scott Main
e4c9d8e8ed am 5249ad03: docs: add "boot completed" broadcast to list of DO NOTs for installing on external storage bug: 3088494
Merge commit '5249ad03454301744374d04e04b38aaad3b01530' into gingerbread

* commit '5249ad03454301744374d04e04b38aaad3b01530':
  docs: add "boot completed" broadcast to list of DO NOTs for installing on external storage
2010-10-13 12:08:02 -07:00
Nick Pelly
e863e66640 am 527d8bbd: Merge "Add missing native methods to fix boot." into gingerbread
Merge commit '527d8bbd79c1ff2b6e24d19fe9e7a1ecdb72891a' into gingerbread-plus-aosp

* commit '527d8bbd79c1ff2b6e24d19fe9e7a1ecdb72891a':
  Add missing native methods to fix boot.
2010-10-13 10:18:58 -07:00
Nick Pelly
6e6864a54b Merge "Add missing native methods to fix boot." into gingerbread 2010-10-13 10:16:49 -07:00
Andreas Huber
77222360df am 312644cd: Merge "Support for writing to MPEG2 transport stream files." into gingerbread
Merge commit '312644cdbb39522fe9cac028b15b907ce0e8e0f7' into gingerbread-plus-aosp

* commit '312644cdbb39522fe9cac028b15b907ce0e8e0f7':
  Support for writing to MPEG2 transport stream files.
2010-10-13 09:19:28 -07:00
Andreas Huber
45c10062f8 am 165c6579: Merge "HTTP Live content that are tagged as complete are now seekable." into gingerbread
Merge commit '165c6579660c22edafb61fee2a0cf39334a2a905' into gingerbread-plus-aosp

* commit '165c6579660c22edafb61fee2a0cf39334a2a905':
  HTTP Live content that are tagged as complete are now seekable.
2010-10-13 09:17:13 -07:00
Andreas Huber
debb3a6be9 Merge "Support for writing to MPEG2 transport stream files." into gingerbread 2010-10-13 09:14:40 -07:00
Andreas Huber
5558435e53 Merge "HTTP Live content that are tagged as complete are now seekable." into gingerbread 2010-10-13 09:14:13 -07:00
Leon Scroggins
c9adb8d26f am dfc07279: Line up WebTextView text with the page.
Merge commit 'dfc07279fc6205c38f5f39cb5ba4f0aef6b593a4' into gingerbread-plus-aosp

* commit 'dfc07279fc6205c38f5f39cb5ba4f0aef6b593a4':
  Line up WebTextView text with the page.
2010-10-13 07:56:38 -07:00
Mike Lockwood
08fa659cc4 am c792c2e9: Merge "GPS: Remove unnecessary and broken test in AgpsRilInterface updateNetworkState glue" into gingerbread
Merge commit 'c792c2e9edb3c785208560b6961ac6ed5b07eb4e' into gingerbread-plus-aosp

* commit 'c792c2e9edb3c785208560b6961ac6ed5b07eb4e':
  GPS: Remove unnecessary and broken test in AgpsRilInterface updateNetworkState glue
2010-10-13 05:52:51 -07:00
Mike Lockwood
91a2e55166 Merge "GPS: Remove unnecessary and broken test in AgpsRilInterface updateNetworkState glue" into gingerbread 2010-10-13 05:46:15 -07:00
Justin Ho
a8003e8afc am e03471e1: Merge "Updated popup_ 9 patches and removing text_select_handle (hdpi)" into gingerbread
Merge commit 'e03471e12f1adcd818b5bfd9dcb894c75fe955c5' into gingerbread-plus-aosp

* commit 'e03471e12f1adcd818b5bfd9dcb894c75fe955c5':
  Updated popup_ 9 patches and removing text_select_handle (hdpi)
2010-10-12 20:32:56 -07:00
Justin Ho
137ef22cef Merge "Updated popup_ 9 patches and removing text_select_handle (hdpi)" into gingerbread 2010-10-12 20:30:36 -07:00
Justin Ho
e867b1c1ef am 33bae9b8: Updated lockscreen asset (Hiroshi), new menu background
Merge commit '33bae9b826145677585a2171f4986d4c6433fd0d' into gingerbread-plus-aosp

* commit '33bae9b826145677585a2171f4986d4c6433fd0d':
  Updated lockscreen asset (Hiroshi), new menu background
2010-10-12 20:24:37 -07:00
Hung-ying Tyan
d516490fcb am f1b1eec9: Merge "SipService: mScreenOn is flipped to wrong value." into gingerbread
Merge commit 'f1b1eec9de1ca27b660f6c00487de07a30eecf64' into gingerbread-plus-aosp

* commit 'f1b1eec9de1ca27b660f6c00487de07a30eecf64':
  SipService: mScreenOn is flipped to wrong value.
2010-10-12 19:46:14 -07:00