Jean-Baptiste Queru
dd60ee728d
am 6d13b146: am e78a0009: resolved conflicts for merge of 4b94c451 to stage-korg-master
...
* commit '6d13b146e0444f40f45b9fe5812093c5e611b68e':
Added dropbox broadcast notification
2010-12-13 13:12:36 -08:00
Jean-Baptiste Queru
6d13b146e0
am e78a0009: resolved conflicts for merge of 4b94c451 to stage-korg-master
...
* commit 'e78a000955c283509ee8a21b8b7e448060ac8dd8':
Added dropbox broadcast notification
2010-12-13 13:10:23 -08:00
Jean-Baptiste Queru
e78a000955
resolved conflicts for merge of 4b94c451 to stage-korg-master
...
Change-Id: I07b974f96ca598677e58623050e4668822e68f23
2010-12-13 13:06:13 -08:00
Leon Scroggins
3db6af9237
Merge "Do not loop forever."
2010-12-13 13:02:39 -08:00
Dianne Hackborn
30d7189067
Fix issue #3274841 : Orientation change problem with a paused activity
...
Plus a bunch of debug output improvements.
And some new Intent helpers for dealing with restarting an app.
Change-Id: I50ec56bca6a86c562156b13fe8a6fdf68038a12e
2010-12-13 12:57:02 -08:00
Leon Scroggins
d75e64af99
Do not loop forever.
...
Bug:3279066
Change-Id: I5222c465af2345f643bfd528d580d32ab9ba328e
2010-12-13 15:48:40 -05:00
Martijn Coenen
87212c1979
am 6c247164: am e3f6336b: Fixed API for active NDEF reading and NDEF formatting.
...
* commit '6c2471649b5b1d1d9c19305a43676161823b623a':
Fixed API for active NDEF reading and NDEF formatting.
2010-12-13 12:31:46 -08:00
Jeff Hamilton
152cce2199
am 80c78a89: am 641dd621: First pass at advanced NFC tag dispatching APIs and other cleanup.
...
* commit '80c78a896f32461513b9750fc2869cd6b2795888':
First pass at advanced NFC tag dispatching APIs and other cleanup.
2010-12-13 12:31:38 -08:00
Martijn Coenen
c26ba7dd27
am 41e74b99: am b79173f6: Changed technology close() to reconnect to the tag instead of physical disconnect.
...
* commit '41e74b991bc50bfa16ba920e998c76a88aa8ae69':
Changed technology close() to reconnect to the tag instead of physical disconnect.
2010-12-13 12:31:29 -08:00
Martijn Coenen
4e656372bd
am 2019f533: am fc5a3b6c: Changed transceive on all technologies to "raw", except for Mifare classes.
...
* commit '2019f53396f5b45a307cc4b24123eb19b9a5246f':
Changed transceive on all technologies to "raw", except for Mifare classes.
2010-12-13 12:31:23 -08:00
Martijn Coenen
8efdf6459e
am 25556f66: am 3300e4c3: Implemented isWritable() to indicate NDEF capability container r/w state.
...
* commit '25556f666934c72ca53ad0f309078e3d4bd29ca9':
Implemented isWritable() to indicate NDEF capability container r/w state.
2010-12-13 12:31:10 -08:00
Nick Pelly
907ecb1dd5
Merge "resolved conflicts for merge of 1d0d1188 to master"
2010-12-13 12:25:22 -08:00
Nick Pelly
d250746716
resolved conflicts for merge of 1d0d1188 to master
...
Change-Id: I80413d5a54a0284ab6f685c4c6197a2c009ea717
2010-12-13 12:22:34 -08:00
Adam Powell
14b0a6bc0e
Merge "Update bg drawable properly on ActionBars based on earlier changes"
2010-12-13 10:52:04 -08:00
Adam Powell
e8c1e5c02d
Update bg drawable properly on ActionBars based on earlier changes
...
Change-Id: I5e24ffb030d2c29620948114b9015c0c028a133e
2010-12-13 10:49:32 -08:00
Adam Powell
e0893a8555
Merge "Smooth out gesture zooming in WebViews."
2010-12-13 10:47:07 -08:00
Kristian Monsen
7400be47b7
Cleanup of private browsing files are now done in webkit
...
Bug 3243891
Change-Id: I51e63a96bf1c95cd8e675a3d94a4aa210418e216
2010-12-13 17:51:20 +00:00
Patrick Scott
d2f44b7a32
Merge "Suppress scrollbars during layer fling."
2010-12-13 09:30:27 -08:00
Martijn Coenen
6c2471649b
am e3f6336b: Fixed API for active NDEF reading and NDEF formatting.
...
* commit 'e3f6336bcffc250da90ec864bccfa73ad1d016b9':
Fixed API for active NDEF reading and NDEF formatting.
2010-12-13 08:14:01 -08:00
Martijn Coenen
e3f6336bcf
Fixed API for active NDEF reading and NDEF formatting.
...
- Added getNdefCached() to return the message read at discovery time.
- Fixed format() to check ndef before doing the write:
libnfc actually requires a checkNdef to be done before writing.
Change-Id: I9b3108299c05539bdef92dd74f62f911fb5a16bf
2010-12-13 09:58:58 -06:00
Iain Merrick
0f868ca036
Disable CacheManager when using the Chrome HTTP stack.
...
Currently, cacheDisabled() reports false, but no files are ever
added to the cache. This CL makes the framework more honest and
reports that the cache is disabled.
BUG=3270236
Change-Id: I13c0291ac295d965f71f1e70dbdebc74b95ddce0
2010-12-13 14:28:56 +00:00
Iain Merrick
d1281286f2
Merge "Move useChromiumHttpStack() from CookieManager to JniUtil."
2010-12-13 06:22:49 -08:00
Patrick Scott
5b87e296c5
Suppress scrollbars during layer fling.
...
Change-Id: Ia6bc1f48e464212d5b9cebef27e4527b0bc93713
2010-12-13 09:20:32 -05:00
Leon Scroggins
c5ab8b331d
Merge "Use drawLines to draw the outline of the WebTextView."
2010-12-13 05:56:54 -08:00
Jeff Hamilton
80c78a896f
am 641dd621: First pass at advanced NFC tag dispatching APIs and other cleanup.
...
* commit '641dd62155fd2eeddd93b2036154b13c05b70ba2':
First pass at advanced NFC tag dispatching APIs and other cleanup.
2010-12-11 20:58:38 -08:00
Adam Powell
63814df667
Smooth out gesture zooming in WebViews.
...
Change-Id: I42c1182f82af3ed16cd23efc056d7c9c34e32940
2010-12-11 16:49:05 -08:00
Adam Powell
45f1e08c34
Fix bug 3259354 - Handle ActionBar backgrounds better for interacting
...
with action modes.
Tweak ActionBar/mode transition animation to look better with a
variety of action bar styles.
Fix bug 3273773 - ActionBar disappearing while displaying
popupwindow. Some SurfaceFlinger optimizations require a relayout to
recalculate the bounds of overlaid views.
Fix bug 3266010 - Cancel animations properly when switching between
modes.
Change-Id: Ic431176b11115a2211bd0a46d09c8998aefe58d6
2010-12-11 16:25:13 -08:00
Wink Saville
086c0611d3
Fix build.
...
This change, I80dbccebea11544595935077463ad7737c3392e9, broke the build
I undeprecated two old OverScroller constructors and hid the new one.
Change-Id: I257ebbc6bb432c6487d63ff03725146dd225a8e2
2010-12-11 09:01:31 -08:00
Jeff Hamilton
641dd62155
First pass at advanced NFC tag dispatching APIs and other cleanup.
...
Change-Id: I022fcd481274a2f68d93218026e77551cfae8cae
2010-12-10 22:48:16 -06:00
Martijn Coenen
41e74b991b
am b79173f6: Changed technology close() to reconnect to the tag instead of physical disconnect.
...
* commit 'b79173f6602359d00a1a89f4d6505a44d461d796':
Changed technology close() to reconnect to the tag instead of physical disconnect.
2010-12-10 20:40:40 -08:00
Martijn Coenen
2019f53396
am fc5a3b6c: Changed transceive on all technologies to "raw", except for Mifare classes.
...
* commit 'fc5a3b6cfb85679e82a39730c7154b55b0711a0c':
Changed transceive on all technologies to "raw", except for Mifare classes.
2010-12-10 20:40:34 -08:00
Martijn Coenen
25556f6669
am 3300e4c3: Implemented isWritable() to indicate NDEF capability container r/w state.
...
* commit '3300e4c3ea2f2317532ded6f9e79d6ad9e038679':
Implemented isWritable() to indicate NDEF capability container r/w state.
2010-12-10 20:40:26 -08:00
Martijn Coenen
b79173f660
Changed technology close() to reconnect to the tag instead of physical disconnect.
...
Change-Id: I8935e4aae452adeec472c0b3ff3c77f1400a264e
2010-12-10 22:07:46 -06:00
Martijn Coenen
fc5a3b6cfb
Changed transceive on all technologies to "raw", except for Mifare classes.
...
Change-Id: I3d680e37fec0ab84cdbb70d9fb6fff9527dd76a2
2010-12-10 22:06:35 -06:00
Martijn Coenen
3300e4c3ea
Implemented isWritable() to indicate NDEF capability container r/w state.
...
Change-Id: Ie8bdf490c955e620f5e5029346fbe2e188ea4748
2010-12-10 22:02:09 -06:00
Nick Pelly
1d0d1188d7
am ae56a851: Merge "Make getSystemService(NFC_SERVICE) the NFC entry point." into gingerbread
...
* commit 'ae56a851624c2b2e78da8a2c339d2caa64c4f981':
Make getSystemService(NFC_SERVICE) the NFC entry point.
2010-12-10 17:19:45 -08:00
Gilles Debunne
512b54cf9e
Merge "TextView's runnable are stopped when the View is detached."
2010-12-10 17:19:06 -08:00
Gilles Debunne
406d09b8a7
Merge "Modified OverScroller curves"
2010-12-10 17:18:37 -08:00
Nick Pelly
50b4d8f643
Make getSystemService(NFC_SERVICE) the NFC entry point.
...
This gives NFC service a handle to the application context.
Deprecate NfcAdapter.getDefaultAdapter(), it does not provide a context.
Using this method will print a warning, and will later throw an exception
if a method that requires a context is called. No 2.3 API's will fail, but
new API's that do require a context might fail.
Also add helper NfcAdapter.getDefaultAdapter(Context).
Change-Id: I9a6378de4ef4b61ad922f8d53e64e2a1a1d5d60c
2010-12-10 17:12:33 -08:00
Gilles Debunne
7eeba5fad5
TextView's runnable are stopped when the View is detached.
...
Stopping all Runnable thread that would otherwise keep a reference on the context,
thus preventing the activity to be recycled.
All Runnable are now also lazily created.
Change-Id: Idb93603c20cb3e847ae56eb842c64af6c5b82523
2010-12-10 16:56:20 -08:00
Adam Powell
05decf6d62
Merge "Fix a bug where the fast scroll track would be positioned incorrectly."
2010-12-10 16:33:47 -08:00
Adam Powell
2c6196aa55
Fix a bug where the fast scroll track would be positioned
...
incorrectly.
Make fast scroll theme attributes public.
Fix a bug where always-visible fast scrollers wouldn't appear on small
lists.
Change-Id: I377adf63d2fe88478f77b0b04466c6ae88557efe
2010-12-10 16:31:13 -08:00
Gilles Debunne
c35a829b10
Modified OverScroller curves
...
When OverFlinged, the scroller goes back to the edge using a spline
instead of a parabolic curve. This ensures that the final velocity of
this movement is null, thus removing the visual discontinuity that can
be observed with the current version.
Bouncing coefficient is deprecated. Changed doc accordingly.
New more expressive spline tension tuning coefficients.
These were tuned to match the one used before the refactoring of CL 81532.
Change-Id: I80dbccebea11544595935077463ad7737c3392e9
2010-12-10 16:04:06 -08:00
Amith Yamasani
b170954d84
Merge "Potential fix for Settings screen ClassCast exception on the phone."
2010-12-10 15:39:41 -08:00
Gilles Debunne
aa85a4c8b7
A long press on the insertion handles triggers the selection.
...
The distance threshold has to be tuned before this feature can be validated.
Change-Id: I233ebc4a1d2d495279818d34496e8b17bbd76752
2010-12-10 15:19:21 -08:00
Leon Scroggins
6e9b327d08
Use drawLines to draw the outline of the WebTextView.
...
Bug:3214760
Optimize drawing the background of the WebTextView.
Change-Id: Iad44839137ffa3b91dd2044885028c283291b491
2010-12-10 17:32:25 -05:00
Amith Yamasani
3e86040439
Potential fix for Settings screen ClassCast exception on the phone.
...
Bug: 3273396
Change-Id: I92477dc8d5e864027923c52545069710dff3575a
2010-12-10 14:23:39 -08:00
Brad Fitzpatrick
4decffa46d
Merge "StrictMode "custom" trigger support."
2010-12-10 14:19:58 -08:00
Brad Fitzpatrick
e36f9bf123
StrictMode "custom" trigger support.
...
For people who want to annotate their own functions as slow, outside
of just the built-in disk & network stuff.
Change-Id: Ia90e150d1cf7a23a658c091285c1c8bb2d7d9732
2010-12-10 14:18:13 -08:00
Gilles Debunne
89d7787454
Merge "Selecting text from a punctuation sign selects previous word."
2010-12-10 13:50:51 -08:00