34145 Commits

Author SHA1 Message Date
Dirk Dougherty
068e695676 Doc change: Merge commit 'd555e264' into manualmerge
Conflicts:
	docs/html/guide/guide_toc.cs

Change-Id: I473bc026fe24caf6a851e8f282b1874c75ef5a30
2010-10-13 19:32:02 -07:00
Jaikumar Ganesh
41d5c805d9 Add function to check for AVRCP target to send volume keys.
Currently, when A2DP is connected and the user changes volume
keys on the device, we just change the volume on the device.
We are not supposed to do that. The white paper recommendation
is to keep the volume stream at max and just send the volume
keys over. But then not all A2DP headsets act as AVRCP targets,
hence check for that.

So now the media code should use the API and not change the volume
at the device but just send the keys.

Bug: 3071356
Change-Id: I03a8b6f7619cf860c4e63979bf4903ded9ecd314
2010-10-13 19:25:33 -07:00
Gilles Debunne
d97b7f20b8 Really leave text selection mode when using the trackball.
Bug 3086617

Change-Id: I04c7f5b59d41ed294ac10c20588d2ea476f9d7f6
2010-10-13 19:20:53 -07:00
John Wang
b57832140e am 7a26ebdf: am 844a6b3c: Turn off additional debug.
Merge commit '7a26ebdf0d5ba62c06ca0b8cb2b3280f008885ef'

* commit '7a26ebdf0d5ba62c06ca0b8cb2b3280f008885ef':
  Turn off additional debug.
2010-10-13 19:14:56 -07:00
Leon Scroggins
f76f6f5c63 am 00c50b2e: am f348502c: Merge "Allow TextView to do its thing." into gingerbread
Merge commit '00c50b2e49dbb3537a3ee553dc79d6e34cd00065'

* commit '00c50b2e49dbb3537a3ee553dc79d6e34cd00065':
  Allow TextView to do its thing.
2010-10-13 19:14:19 -07:00
Romain Guy
2340b8421a Merge changes If2f987fe,Iedf42cbc
* changes:
  Fix layer rendering glitch.
  Don't draw TextView's alpha layers when not needed.
2010-10-13 18:54:37 -07:00
Hung-ying Tyan
3bb1044243 Merge "Make SipService listen to WIFI state change events." into gingerbread 2010-10-13 18:36:31 -07:00
Kenny Root
bdf8034c65 Merge "OBB: use PBKDF2 for key generation." into gingerbread 2010-10-13 18:29:43 -07:00
Romain Guy
93d2361c6d Fix layer rendering glitch.
Change-Id: If2f987fe5526fc88743ca3e91edde4f8232ff658
2010-10-13 18:26:36 -07:00
Kenny Root
3b1abba6bb OBB: use PBKDF2 for key generation.
Switch to using PBKDF2 for the key generation for OBBs. Any previously
generated OBBs will stop being read correctly. A small pbkdf2gen program
is available to allow generation of appropriate keys with the salts.

Bug: 3059950
Change-Id: If4305c989fd692fd1150eb270dbf751e09c37295
2010-10-13 18:25:33 -07:00
Romain Guy
909cbaf8f9 Don't draw TextView's alpha layers when not needed.
Change-Id: Iedf42cbc62d727f18500c78fcccf2d081a761fec
2010-10-13 18:19:48 -07:00
David Brown
e3c50a5470 am cebe5b2e: Merge "Reduce CallerInfoAsyncQuery logging in user builds (STOPSHIP cleanup)" into gingerbread
Merge commit 'cebe5b2e01f8ebbf9089aebc386caecea232df76' into gingerbread-plus-aosp

* commit 'cebe5b2e01f8ebbf9089aebc386caecea232df76':
  Reduce CallerInfoAsyncQuery logging in user builds (STOPSHIP cleanup)
2010-10-13 17:50:43 -07:00
David Brown
cebe5b2e01 Merge "Reduce CallerInfoAsyncQuery logging in user builds (STOPSHIP cleanup)" into gingerbread 2010-10-13 17:48:05 -07:00
Justin Ho
d9fdcfdaad am c9110970: Merge "Updated media transport controls" into gingerbread
Merge commit 'c911097095d0dd909abf4f77628f2154be6dbf9a' into gingerbread-plus-aosp

* commit 'c911097095d0dd909abf4f77628f2154be6dbf9a':
  Updated media transport controls
2010-10-13 17:47:19 -07:00
Justin Ho
c911097095 Merge "Updated media transport controls" into gingerbread 2010-10-13 17:42:03 -07:00
Justin Ho
f0f95e61d4 Updated media transport controls
Change-Id: I928b7fcd0f9bd11d5f642e3c5207b00099fc8b41
2010-10-13 17:39:24 -07:00
Justin Ho
31e5901e4c 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
Joe Onorato
184498ce5a Allow notifications to not specify a contentIntent.
If they don't, the click events will be passed through to the individual
views in the notification view, which may have their own PendingIntents
attached.

Previously, it was against the UX spec to allow this, but now we are
changing that and will have buttons in there.

Change-Id: I674234212f64b2b8802a0708b7eed0614e147ca3
2010-10-13 17:29:26 -07:00
Romain Guy
5d794412e3 Small potential performance improvement for fonts rendering.
Change-Id: If59c1e7803b84340fbc8b31ce6171ef0e5dc6189
2010-10-13 17:24:41 -07:00
Romain Guy
67a2f7b5a1 Never skip drawing SurfaceViews.
Change-Id: I07fbc632b01d96cee16b6e000e0cbf05238a442b
2010-10-13 17:24:41 -07:00
Romain Guy
99bcdc52dc Return identity matrix when rendering in an FBO.
Change-Id: I57438e745b30c8cfe16c269f3cafcd719049d705
2010-10-13 17:24:41 -07:00
Justin Ho
b663412741 Merge "Updating popup center asset (v5)" into gingerbread 2010-10-13 17:15:00 -07:00
Justin Ho
4cc49d3e80 Updating popup center asset (v5)
Change-Id: I0acb31925e011ddbd668894f1291bc1ee94e5c97
2010-10-13 17:11:26 -07:00
Brad Fitzpatrick
bbf68c6ad2 am 4711d21a: am 9facd2d0: Merge "StrictMode: link to designing for responsiveness ANR docs" into gingerbread
Merge commit '4711d21a55d9ff6f234d3b06ff2d07dca19238fc'

* commit '4711d21a55d9ff6f234d3b06ff2d07dca19238fc':
  StrictMode: link to designing for responsiveness ANR docs
2010-10-13 17:03:10 -07:00
Jesse Wilson
8b1082bba9 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
Jeff Brown
cd4af421ca am 4b255a23: am 03aa28fb: Merge "Improve the input policy handling a bit." into gingerbread
Merge commit '4b255a23041225103a6870e77a236f78c2816eda'

* commit '4b255a23041225103a6870e77a236f78c2816eda':
  Improve the input policy handling a bit.
2010-10-13 17:02:48 -07:00
David Brown
d34d30ac2e Reduce CallerInfoAsyncQuery logging in user builds (STOPSHIP cleanup)
Bug: 3095005

Change-Id: Ide96756282d17252fac16a27cc184ea314a8b31a
2010-10-13 17:02:33 -07:00
Chung-yih Wang
bad553ba34 am b99db0c7: am 4367ab00: Set the wifi-only for SIP service as the default config.
Merge commit 'b99db0c70e0ee18e0a691126134b9394f30f7f03'

* commit 'b99db0c70e0ee18e0a691126134b9394f30f7f03':
  Set the wifi-only for SIP service as the default config.
2010-10-13 17:02:24 -07:00
Hung-ying Tyan
99f92ac7a4 am f5b7c855: am f5201ab7: Keep original phone number in SipConnection.
Merge commit 'f5b7c855fbb69e8614dab5ca15639228a2428784'

* commit 'f5b7c855fbb69e8614dab5ca15639228a2428784':
  Keep original phone number in SipConnection.
2010-10-13 17:02:08 -07:00
Jeff Brown
9f164aa9b3 am b05632aa: am a28d5aff: Merge "Fix a bug synthesizing cancelation events for motions." into gingerbread
Merge commit 'b05632aae37ea3a3573aabf10e6868733546de96'

* commit 'b05632aae37ea3a3573aabf10e6868733546de96':
  Fix a bug synthesizing cancelation events for motions.
2010-10-13 17:01:53 -07:00
Hung-ying Tyan
8635bb5405 am c74d3917: am ece7e11b: Merge "SipService: fix a missing switch-case break." into gingerbread
Merge commit 'c74d39173e1071dbffe713e008b95784ac4312bc'

* commit 'c74d39173e1071dbffe713e008b95784ac4312bc':
  SipService: fix a missing switch-case break.
2010-10-13 17:01:38 -07:00
Dianne Hackborn
bc931eaf15 am a007ab29: am ffbc4b94: Merge "Fix SD card mounting issues #3074555 and #3072332" into gingerbread
Merge commit 'a007ab294d83db987b05b49ab869566978a87494'

* commit 'a007ab294d83db987b05b49ab869566978a87494':
  Fix SD card mounting issues #3074555 and #3072332
2010-10-13 17:01:17 -07:00
Jesse Wilson
3394db7d94 Merge "Regenerate preloaded classes for Gingerbread." into gingerbread 2010-10-13 16:59:12 -07:00
Jaikumar Ganesh
a905d95511 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
Jesse Wilson
eaca10e2d0 Regenerate preloaded classes for Gingerbread.
Unlike previous releases where the set of classes-to-be-preloaded
was generated on a first-generation device (G1 and MyTouch 3G), this
round I used a second-generation device, a Nexus One. As a consequence,
class loading is faster (win) and fewer classes hit the 1250ms threshold.
Instead of sharing classes based on load time alone, classes are now shared
based on the number of applications loading them.

Change-Id: I18f7aa3e7e6258818871b3968b515c06314371b3
http://b/2546002
2010-10-13 16:55:26 -07:00
Vasu Nori
c6bf3eaab4 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
a31cbd61bc Merge "Remove STOPSHIP and reduce log spam." into gingerbread 2010-10-13 16:52:52 -07:00
Vasu Nori
51679ca892 Merge "bug:3069735 in Download UI app, handle deletes correctly" into gingerbread 2010-10-13 16:50:45 -07:00
Jaikumar Ganesh
bbb90d134a 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
bdb1d9320b Remove STOPSHIP and reduce log spam.
We still need some logs, as it helped me fix the errant headset bug.

Bug: 3095000
Change-Id: If12601430e6dc30490df1ff86fc3f9d4d455e6d5
2010-10-13 16:48:02 -07:00
Jaikumar Ganesh
c008ca96bb Merge "Work around for errant headsets." into gingerbread 2010-10-13 16:44:17 -07:00
Jaikumar Ganesh
70a053bf1b Work around for errant headsets.
1. Some headsets send an AVCTP connection before an AVDTP connection
When that AVCTP connection fails, we get stuck in IncomingA2DP state
because we don't handle AVCTP signals for now.
We need to handle the signals and fix it better.

2. Also when ACL gets disconnected, reset state i.e
when the low level connection disconnected reset our state.
This is like a fail safe in case we get stuck.

Bug: 3051490
Change-Id: Ibcf188103999ffb1e08c36c2554504c639fb7f50
2010-10-13 16:38:28 -07:00
Mindy Pereira
baf5608941 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
Daniel Sandler
db6303e51e Merge "Dynamically show the menu button on the system bar." 2010-10-13 16:32:07 -07:00
Mindy Pereira
998c67774a Merge "Never show overscroll if the page scrolls at all." into gingerbread 2010-10-13 16:31:18 -07:00
Mindy Pereira
7d73b70668 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
868322ced8 Merge "Reduce the time it takes to decay the glow after a pull." into gingerbread 2010-10-13 16:23:15 -07:00
Mindy Pereira
22c5ff2282 Never show overscroll if the page scrolls at all.
Fixes b/3092852  Tune overscroll in web views that can scroll both horizontally and vertically

Change-Id: I92cb6d1fa7d2034837654f2d2ddb7c3c997ce893
2010-10-13 16:21:10 -07:00
Vasu Nori
216fa22791 bug:3069735 in Download UI app, handle deletes correctly
gingerbread.
(for more detailed comments, please see the dependent CL
Change-Id: Ib90eb9e647f543312c865d3bbf9a06fb867a648b )

2 changes in this CL.
1. add 2 new columns to downloads table in downloads.db:
    mediaprovider_uri = downloaded file's content_uri in mediaprovider db
    deleted = flag is set to true if a file is to be deleted
2. download UI app shows only those files whose 'deleted' flag is not set

Change-Id: I47c5f72b0a0b354fac3abe3a97752130b8189794
2010-10-13 16:18:44 -07:00
Erik
70983c47a9 Merge "Adds a way to scroll to a position in a given duration" 2010-10-13 16:03:21 -07:00