Cary Clark
8ffa04f47b
am 297c1acc: am 8733bea4: Merge "scroll selected text in scrollable layers" into honeycomb
...
* commit '297c1acc79a474a413fa881da8d3b5154fc59824':
scroll selected text in scrollable layers
2011-01-10 07:33:57 -08:00
Cary Clark
297c1acc79
am 8733bea4: Merge "scroll selected text in scrollable layers" into honeycomb
...
* commit '8733bea4c1631cf1d6758c45d5f2a279f7d66eed':
scroll selected text in scrollable layers
2011-01-10 07:29:03 -08:00
Cary Clark
8733bea4c1
Merge "scroll selected text in scrollable layers" into honeycomb
2011-01-10 07:25:33 -08:00
Cary Clark
b9aaa776a6
scroll selected text in scrollable layers
...
Compute whether the initial tap point is in
a scrollable layer or not. If it is, get
the bounds of the scrollable layer and use them,
clipped to the view, to determine when the
select anchor is dragged close to the layer's
edge, to invoke autoscrolling.
Fix some bugs around stopping the autoscrolling
when there is nothing to do, and when a motion
up event is sent.
requires companion change in external/webkit
bug:3191699
Change-Id: Ic9229b063a8102ec93d0cd5bcaba774cc170c106
2011-01-10 09:10:25 -05:00
Adam Powell
3cff902b34
am 38f0c2ee: am 8b50495d: Merge "Fix bug 3324981 - Inconsistent/buggy FastScroll behavior" into honeycomb
...
* commit '38f0c2ee8a67865cb7fc493c76a1881d54a2c79a':
Fix bug 3324981 - Inconsistent/buggy FastScroll behavior
2011-01-09 21:41:19 -08:00
Adam Powell
38f0c2ee8a
am 8b50495d: Merge "Fix bug 3324981 - Inconsistent/buggy FastScroll behavior" into honeycomb
...
* commit '8b50495d02a6423bfa5c8cf6406e3e06b7c84f7f':
Fix bug 3324981 - Inconsistent/buggy FastScroll behavior
2011-01-09 21:39:49 -08:00
Adam Powell
8b50495d02
Merge "Fix bug 3324981 - Inconsistent/buggy FastScroll behavior" into honeycomb
2011-01-09 21:38:05 -08:00
Adam Powell
32c3a6929a
Fix bug 3324981 - Inconsistent/buggy FastScroll behavior
...
The fast scroller now always positions by index position.
Fixed a bug with always-show fast scrollers.
Change-Id: I08586ab2aae9733e78aa823aff711bcc14d2d44d
2011-01-09 21:34:21 -08:00
Jeff Hamilton
0091091a3c
am e3db3d62: Merge commit \'525f953b\' into manualmerge
...
* commit 'e3db3d6209c234e032775079a1e1489478dabf86':
Make the new NFC APIs public.
2011-01-09 19:04:15 -08:00
Jeff Hamilton
e3db3d6209
Merge commit '525f953b' into manualmerge
...
Conflicts:
api/current.xml
Change-Id: I6cbde67b8da6b85def6e3ddd985b0e04edf279a7
2011-01-09 21:01:56 -06:00
Romain Guy
82020a4cbc
am b6c4f790: am 867b1f60: Merge "Better documentation for FLAG_HARDWARE_ACCELERATED Bug #3154883 " into honeycomb
...
* commit 'b6c4f7904aa320d2129ef5b235e25d8827e45fb6':
Better documentation for FLAG_HARDWARE_ACCELERATED Bug #3154883
2011-01-09 16:47:09 -08:00
Romain Guy
b6c4f7904a
am 867b1f60: Merge "Better documentation for FLAG_HARDWARE_ACCELERATED Bug #3154883 " into honeycomb
...
* commit '867b1f60e6c2fff4650e5edc4409b26c9c605f00':
Better documentation for FLAG_HARDWARE_ACCELERATED Bug #3154883
2011-01-09 16:44:14 -08:00
Romain Guy
867b1f60e6
Merge "Better documentation for FLAG_HARDWARE_ACCELERATED Bug #3154883 " into honeycomb
2011-01-09 16:42:35 -08:00
Romain Guy
72f0a276ff
Better documentation for FLAG_HARDWARE_ACCELERATED
...
Bug #3154883
Change-Id: I2062781ba3b447b8ec4e0836b9ddeaa97c7aa60e
2011-01-09 16:45:28 -08:00
Brett Chabot
8cff70eddc
am d320877f: am 3b4fcbc9: Add ActivityManager#isRunningInTestHarness() public API.
...
* commit 'd320877f32ddfc70b10457e0ea1494f6ef1f544b':
Add ActivityManager#isRunningInTestHarness() public API.
2011-01-09 16:38:08 -08:00
Brett Chabot
d320877f32
am 3b4fcbc9: Add ActivityManager#isRunningInTestHarness() public API.
...
* commit '3b4fcbc9f13bab6a2e9e5c37cc5e18fec7341c04':
Add ActivityManager#isRunningInTestHarness() public API.
2011-01-09 16:35:59 -08:00
Brett Chabot
3b4fcbc9f1
Add ActivityManager#isRunningInTestHarness() public API.
...
Replaces use of ro.monkey system property. This new API is controlled by
ro.test_harness.
Bug 3329873
Change-Id: Idb5bbbd9ca691976ef842eec681be34c29915976
2011-01-09 16:31:11 -08:00
Jim Miller
7f0c2bfb01
am b3a82ebd: am 730f0b23: Merge "Fix 3299611: Use system font for AM/PM indicator" into honeycomb
...
* commit 'b3a82ebd6e7e9c68a907ff49e396de9f6a8ccaee':
Fix 3299611: Use system font for AM/PM indicator
2011-01-09 16:12:58 -08:00
Jim Miller
b3a82ebd6e
am 730f0b23: Merge "Fix 3299611: Use system font for AM/PM indicator" into honeycomb
...
* commit '730f0b238a20362ff0ae6bdfbd069f0996fc1b39':
Fix 3299611: Use system font for AM/PM indicator
2011-01-09 16:10:19 -08:00
Jim Miller
730f0b238a
Merge "Fix 3299611: Use system font for AM/PM indicator" into honeycomb
2011-01-09 16:08:58 -08:00
Jim Miller
81f9b286d1
Fix 3299611: Use system font for AM/PM indicator
...
This fixes a bug where translations wouldn't pick up the proper
AM/PM indicator because AndroidClock.ttf doesn't contain the
full Android character set for translations.
Change-Id: I61737bae7383946906a4e6b776afa7463da9355d
2011-01-09 16:03:27 -08:00
Romain Guy
d0b8365fcb
Return the View that matches the clicked position.
...
Bug #3323669
Change-Id: If6093885283f962d20bf287ba8b82d7c76f9076c
2011-01-09 15:41:04 -08:00
Romain Guy
beaadd38b2
am e03e47b2: am d0b8365f: Return the View that matches the clicked position. Bug #3323669
...
* commit 'e03e47b2f37b7c33cd142b9499fad5ea6d5921f8':
Return the View that matches the clicked position. Bug #3323669
2011-01-09 15:40:52 -08:00
Romain Guy
e03e47b2f3
am d0b8365f: Return the View that matches the clicked position. Bug #3323669
...
* commit 'd0b8365fcbe891b0bb3b54d345337f60c292d09e':
Return the View that matches the clicked position. Bug #3323669
2011-01-09 15:39:14 -08:00
Romain Guy
7d4811fec6
am 022f3767: am fcd3e8e6: Merge "Tighten up AsyncTask\'s semantics and behavior. Bug #3109366 Bug #3109382 " into honeycomb
...
* commit '022f37672db4cf46f905ef9d50adcb423f55c64e':
Tighten up AsyncTask's semantics and behavior. Bug #3109366 Bug #3109382
2011-01-09 14:05:07 -08:00
Romain Guy
022f37672d
am fcd3e8e6: Merge "Tighten up AsyncTask\'s semantics and behavior. Bug #3109366 Bug #3109382 " into honeycomb
...
* commit 'fcd3e8e6faa5c73d3cf964b765ba3199ff323276':
Tighten up AsyncTask's semantics and behavior. Bug #3109366 Bug #3109382
2011-01-09 14:03:26 -08:00
Romain Guy
fcd3e8e6fa
Merge "Tighten up AsyncTask's semantics and behavior. Bug #3109366 Bug #3109382 " into honeycomb
2011-01-09 14:01:42 -08:00
Romain Guy
e95003e4a1
Tighten up AsyncTask's semantics and behavior.
...
Bug #3109366
Bug #3109382
The new behavior of AsyncTask is the following:
- Unchanged if you don't call cancel()
- If you call cancel():
- Either onCancelled() *OR* onPostExecute() is invoked
- onCancelled() is invoked only after doInBackground() finishes
Change-Id: If53faec5890d2fa7098aea76973186a0b1026b39
2011-01-09 14:04:36 -08:00
Dianne Hackborn
7c4f44f50f
am febbf6e7: Merge "DO NOT MERGE Fix issue #3333958 : Package Manager can sometimes mistakenly think..." into honeycomb
...
* commit 'febbf6e7f87900b479fbed31ab1e0486caeb281d':
DO NOT MERGE Fix issue #3333958 : Package Manager can sometimes mistakenly think...
2011-01-09 13:26:36 -08:00
Dianne Hackborn
1f22d2a31a
DO NOT MERGE Fix issue #3333958 : Package Manager can sometimes mistakenly think...
...
...an app is disabled!
Ouch.
Change-Id: I45dc2beef4e413fd447d905632901fadd924cb6e
2011-01-09 13:15:30 -08:00
Wink Saville
31144e26c0
Merge "Revert "Propagate new link-status-change message to any NetworkManagementService""
2011-01-09 12:48:50 -08:00
Wink Saville
1a7e671902
Revert "Propagate new link-status-change message to any NetworkManagementService"
...
This reverts commit 780dfa42aa .
2011-01-09 12:16:38 -08:00
Michael Chan
0a720eeb8b
am ae34a7cd: Merge "b/3279789 Fixed NPE in CalendarUtils.onQueryComplete" into honeycomb
...
* commit 'ae34a7cd2d65fb89f1d4bffd6316d8b817a45da5':
b/3279789 Fixed NPE in CalendarUtils$TimeZoneUtils$AsyncTZHandler.onQueryComplete
2011-01-09 12:13:57 -08:00
Michael Chan
ae34a7cd2d
Merge "b/3279789 Fixed NPE in CalendarUtils$TimeZoneUtils$AsyncTZHandler.onQueryComplete" into honeycomb
2011-01-09 12:12:26 -08:00
Michael Chan
aa5bb98120
b/3279789 Fixed NPE in CalendarUtils$TimeZoneUtils$AsyncTZHandler.onQueryComplete
...
Null cursor was returned from query
Change-Id: I76a7d710b0764f52ed6ced23792717feb7b6ae08
2011-01-09 12:11:02 -08:00
Dmitri Plotnikov
0142de5972
am 5af299b2: am bdd8d17d: Merge "Fixed the waitForLoader method." into honeycomb
...
* commit '5af299b26f252150a9381b7d143cf4b07cde085c':
Fixed the waitForLoader method.
2011-01-09 11:30:59 -08:00
Dmitri Plotnikov
5af299b26f
am bdd8d17d: Merge "Fixed the waitForLoader method." into honeycomb
...
* commit 'bdd8d17d81c4ef41a2ae82c7f73ecff6b48f493e':
Fixed the waitForLoader method.
2011-01-09 11:29:19 -08:00
Dmitri Plotnikov
59d8edd09d
Fixed the waitForLoader method.
...
The reason we need a separate latch is that
AsyncTask will post onPostExecute/onCancelled
_after_ executing mFuture.get(). The previous
implementation would only wait for mFuture.get()
to complete and not the entire task.
Change-Id: I96964591980965148eb09af38b5838bfa5d28277
2011-01-09 11:05:50 -08:00
Chet Haase
42363c71c4
am 3ecf835e: am 2954cd91: Add start/endTransition events for CHANGE transitions
...
* commit '3ecf835e95378bdb98247bb036b78d9c22473d5e':
Add start/endTransition events for CHANGE transitions
2011-01-09 10:17:36 -08:00
Chet Haase
3ecf835e95
am 2954cd91: Add start/endTransition events for CHANGE transitions
...
* commit '2954cd91ab1fef14c8aed5173c160ce00558cd3a':
Add start/endTransition events for CHANGE transitions
2011-01-09 10:16:09 -08:00
Chet Haase
2954cd91ab
Add start/endTransition events for CHANGE transitions
...
There was already a mechanism for sending out events for LayoutTransition
when animations started or ended, but the implementation only sent out events
for the appearing/disappearing animations. This fix provides callbacks to
listeners for the CHANGE_APPEARING and CHANGE_DISAPPEARING transitions, too.
Change-Id: Icfb8cc1c20d2df3e4a817255e96c9d0e94c1d8c4
2011-01-09 09:43:39 -08:00
Dianne Hackborn
7079ef0824
am 5ef0a153: am 247fe74c: Implement issue # 3255887 could CursorLoader offer...
...
* commit '5ef0a153f01362a3263d3cd608ece09cc67377df':
Implement issue # 3255887 could CursorLoader offer...
2011-01-08 18:29:19 -08:00
Dianne Hackborn
5ef0a153f0
am 247fe74c: Implement issue # 3255887 could CursorLoader offer...
...
* commit '247fe74c934cb3fba85aae7e051a8044f460fb11':
Implement issue # 3255887 could CursorLoader offer...
2011-01-08 18:27:24 -08:00
Dianne Hackborn
247fe74c93
Implement issue # 3255887 could CursorLoader offer...
...
...to throttle contentobserver-based requeries
Why yes, I guess it could.
This also reworks AsyncTaskLoader to not generate multiple
concurrent tasks if it is getting change notifications before
the last background task is complete.
And removes some of the old APIs that had been deprecated but
need to be gone for final release.
And fixes a few little problems with applying the wrong theme
in system code.
Change-Id: Ic7a665b666d0fb9d348e5f23595532191065884f
2011-01-08 18:25:30 -08:00
Adam Powell
f5473d03ae
am 34a4aeed: am f600780b: Merge "Remove unnecessary log" into honeycomb
...
* commit '34a4aeed9920ef3867c783ab567df87b87f6a9a0':
Remove unnecessary log
2011-01-08 17:33:37 -08:00
Adam Powell
34a4aeed99
am f600780b: Merge "Remove unnecessary log" into honeycomb
...
* commit 'f600780bea864c672e01a391b65da65d85045803':
Remove unnecessary log
2011-01-08 17:31:37 -08:00
Adam Powell
f600780bea
Merge "Remove unnecessary log" into honeycomb
2011-01-08 17:30:07 -08:00
Adam Powell
1ab74be06c
Remove unnecessary log
...
Change-Id: I6bb267d7d5f82ae9e1cbe6b022b722ccedc428fd
2011-01-08 17:29:22 -08:00
Adam Powell
44d2ab2191
am 9861973c: am 2b6be701: Fix bug 3312807 - Fix child margin measurement in FrameLayout
...
* commit '9861973c0beba15ee216e88bda7723cb01b02d63':
Fix bug 3312807 - Fix child margin measurement in FrameLayout
2011-01-08 17:01:21 -08:00
Adam Powell
9861973c0b
am 2b6be701: Fix bug 3312807 - Fix child margin measurement in FrameLayout
...
* commit '2b6be701a90a4f0aefefcf8e70feb04722e1bcfe':
Fix bug 3312807 - Fix child margin measurement in FrameLayout
2011-01-08 16:59:06 -08:00