Svetoslav Ganov
48168e7b23
am cd26d63f: am f103758b: Merge "Delegate list item focus and click actions to the parent list." into jb-dev
...
* commit 'cd26d63ffa455856157d375d1f2564151365b19e':
Delegate list item focus and click actions to the parent list.
2012-05-09 13:52:18 -07:00
Svetoslav Ganov
cd26d63ffa
am f103758b: Merge "Delegate list item focus and click actions to the parent list." into jb-dev
...
* commit 'f103758b7c78f4dc1c5bd57383d245ec138576a1':
Delegate list item focus and click actions to the parent list.
2012-05-09 13:49:33 -07:00
Svetoslav Ganov
f103758b7c
Merge "Delegate list item focus and click actions to the parent list." into jb-dev
2012-05-09 13:46:57 -07:00
Jeff Sharkey
6de357e4d1
Recover from Throwable in FileRotator, dump.
...
In rewriteSingle(), catch Throwable to rollback to backup file,
instead of just IOException. Also add dumpAll() to pack up contents
for later debugging, and use it when encountering bad stats.
Bug: 6467868
Change-Id: Ic8e287cf5a235706811a304a88d71d11d3a79cd4
2012-05-09 13:43:19 -07:00
Jeff Brown
fd23e3ed97
Fix bugs in fallback key handling.
...
If a fallback key is generated using a key plus a modifier,
then it's possible we might get a different fallback key
generated if the modifier has changed. PhoneWindowManager
needs to remember which fallback is last generated for a
given key code so that it can apply the same fallback action.
When generating cancellation events, it's important to have
preserved the policyFlags of the original event. Otherwise
we may not dispatch the cancellation properly. For example,
some actions are not performed if the POLICY_FLAG_TRUSTED
is not specified.
Remember the metaState associated with a key event so we can
include it when canceled.
Tell the policy when a fallback is being cancelled so that it
can clean up its state.
After a SEARCH shortcut is invoked, clear the flag indicating
that a shortcut is pending. This is to prevent SEARCH from
getting stuck down in the case where we might forget to send
the up. (Shouldn't happen anymore after the prior fixes.)
Bug: 5616255
Change-Id: I68f0a9679c7af464eaf31c099f2aa50b53fecf1f
2012-05-09 13:34:28 -07:00
Kenny Root
941d2edd83
am 7a7d8f18: am bad417df: Merge "Throw RemoteException when MountService is not yet up" into jb-dev
...
* commit '7a7d8f182a2f18f1d548e76d629b8ed191caade5':
Throw RemoteException when MountService is not yet up
2012-05-09 13:32:03 -07:00
Kenny Root
7a7d8f182a
am bad417df: Merge "Throw RemoteException when MountService is not yet up" into jb-dev
...
* commit 'bad417df657128a988b23a6b70b4d08633e4ac5a':
Throw RemoteException when MountService is not yet up
2012-05-09 13:28:54 -07:00
Kenny Root
bad417df65
Merge "Throw RemoteException when MountService is not yet up" into jb-dev
2012-05-09 13:27:08 -07:00
Gilles Debunne
9740181e5f
am 4f9e7490: am 12ff1492: Merge "Spell checker underlines words even when there are no suggestions" into jb-dev
...
* commit '4f9e7490e720025f9b14c45342eac8b671544fe4':
Spell checker underlines words even when there are no suggestions
2012-05-09 11:54:41 -07:00
Gilles Debunne
4f9e7490e7
am 12ff1492: Merge "Spell checker underlines words even when there are no suggestions" into jb-dev
...
* commit '12ff149265ba599627896f6c1a0e3ea9721b54c1':
Spell checker underlines words even when there are no suggestions
2012-05-09 11:52:13 -07:00
Gilles Debunne
12ff149265
Merge "Spell checker underlines words even when there are no suggestions" into jb-dev
2012-05-09 11:49:08 -07:00
Irfan Sheriff
22af38c526
API review fixes
...
- Remove the notion of channel from an application perspective
- Remove the use of DnsSd as part of API and add a protocol type to allow
future extensions
- Use the listener object as a handler for stop and unregister operations. Also,
we now allow multiple active discovery operations.
- Remove init/deinit operations in favour of setting up construction
Bug:6434844
Change-Id: Id15521d571aac9c4053d81184ad66dfc54f636de
2012-05-09 11:48:42 -07:00
Adam Cohen
3e8582d71f
am 88f295d7: am 6a080bff: Merge "Accounting for widget padding in dips instead of pixels" into jb-dev
...
* commit '88f295d72b6228738a9ea7eaa0a3b8796a1ff918':
Accounting for widget padding in dips instead of pixels
2012-05-09 11:28:04 -07:00
Adam Cohen
88f295d72b
am 6a080bff: Merge "Accounting for widget padding in dips instead of pixels" into jb-dev
...
* commit '6a080bff83b59c44b4eee493b8bf684f25871e2b':
Accounting for widget padding in dips instead of pixels
2012-05-09 11:24:58 -07:00
Adam Cohen
6a080bff83
Merge "Accounting for widget padding in dips instead of pixels" into jb-dev
2012-05-09 11:23:12 -07:00
Gilles Debunne
69865bd686
Minor changes in SpellCheckSpan pool management in SpellChecker
...
Bug 6464190
The 'inProgress' flag is set to false when the SpellCheckSpan starts
to get used (instead of a less intuitive when it is removed).
Pool recycling in handled by onSpellCheckSpanRemoved, called from
the TextView's SpanWatcher, when a SpellCheckSpan is removed for any
reason (from the SC code or due to text editing).
The other change is that Sentence SC now correctly removes the span
from the text (and hence recycles it in the pool).
Change-Id: If8b433fd5e41d4dc0304a127ebcc088ea1eecaa7
2012-05-09 11:22:26 -07:00
Adam Cohen
f065c96631
Accounting for widget padding in dips instead of pixels
...
Change-Id: I29c4290274f8b9fa6d9b49072d3cf37cf6f1acb8
2012-05-09 11:13:54 -07:00
Daisuke Miyakawa
f275b86124
am 6cf8be39: am 57b09882: Merge "Have a new constant for "vibrate when ringing" setting" into jb-dev
...
* commit '6cf8be39cccd8d41c817c90e67cb90203f93f483':
Have a new constant for "vibrate when ringing" setting
2012-05-09 10:22:20 -07:00
Daisuke Miyakawa
6cf8be39cc
am 57b09882: Merge "Have a new constant for "vibrate when ringing" setting" into jb-dev
...
* commit '57b098829f5960bc2fd29f0b0917189911b18338':
Have a new constant for "vibrate when ringing" setting
2012-05-09 10:17:54 -07:00
satok
96f55fb799
am 5f745367: am d422ade3: Merge "Fix the issue that the ime switch icon is remaining after closing VoiceInput" into jb-dev
...
* commit '5f74536732076785930d769efe03b6485b35524f':
Fix the issue that the ime switch icon is remaining after closing VoiceInput
2012-05-09 10:17:24 -07:00
Daisuke Miyakawa
57b098829f
Merge "Have a new constant for "vibrate when ringing" setting" into jb-dev
2012-05-09 10:16:07 -07:00
Adam Powell
39cf3179df
am 217477e0: am ea3f8cc7: Merge "Forgive me monkeys, for I have sinned." into jb-dev
...
* commit '217477e01311b4b77c3ad536cb3cc35e5ce08373':
Forgive me monkeys, for I have sinned.
2012-05-09 10:11:15 -07:00
satok
3a2034afe8
am 957f1e3e: am d1e323b2: Merge "Not to add invalid spell check spans Bug: 6464197" into jb-dev
...
* commit '957f1e3e1acc655c04d476a2c134781ca6e73118':
Not to add invalid spell check spans Bug: 6464197
2012-05-09 10:11:12 -07:00
Dianne Hackborn
c4247af290
am 9d2947f8: am feecf9d7: Merge "Support for changing traces from development settings." into jb-dev
...
* commit '9d2947f80f4b57d49bba46a6bbbcc0e9910836e6':
Support for changing traces from development settings.
2012-05-09 10:11:03 -07:00
Jeff Brown
335f8726d7
am 8ab3f090: am 8c680128: Merge "Check for null fd when constructing AssetFileDescriptor." into jb-dev
...
* commit '8ab3f090c008091318bc0c0e8052f18132e720c2':
Check for null fd when constructing AssetFileDescriptor.
2012-05-09 10:11:01 -07:00
Svetoslav Ganov
fc93c0cadf
am 939a0908: am 2aaa6bbd: Merge "Renaming the constants for activation and long press." into jb-dev
...
* commit '939a09089f7b0950fb21aa9c70ce48aadcb4c81f':
Renaming the constants for activation and long press.
2012-05-09 10:10:54 -07:00
Adam Powell
132a75f5cf
am c23411e6: am 13740708: Merge "Fix bug in TaskStackBuilder#addParentStack" into jb-dev
...
* commit 'c23411e6db3989cf8b5259d2c89c640dad3bb008':
Fix bug in TaskStackBuilder#addParentStack
2012-05-09 10:10:39 -07:00
Svetoslav Ganov
7956d5a019
am 72912116: am a3b67289: Merge "Fixing View.getBoundsOnScreen()" into jb-dev
...
* commit '72912116cf0ff08dc655f065cff173d53b7152bd':
Fixing View.getBoundsOnScreen()
2012-05-09 10:10:33 -07:00
Chris Craik
d8483c490b
am 4a5c0163: am b010601c: Merge "Pass webview instance when getting base layer / color, and prevent null value" into jb-dev
...
* commit '4a5c01631e637427666f728206504ac54dea1ad4':
Pass webview instance when getting base layer / color, and prevent null value
2012-05-09 10:10:30 -07:00
George Mount
510b2962a1
am 0d612c0d: am 5602d023: Merge "Scroll edit text into view when keyboard shows." into jb-dev
...
* commit '0d612c0d61f62957f9946b33c78b93b1eb15a06f':
Scroll edit text into view when keyboard shows.
2012-05-09 10:10:27 -07:00
Adam Cohen
89961f35fc
am d6e75283: am 8a7eff18: Merge "Account for auto-padding in AppWidgetHostView#updateAppWidgetSize (issue 6454251)" into jb-dev
...
* commit 'd6e752831c5e66d7ae6ee9cd15122580cae35d2a':
Account for auto-padding in AppWidgetHostView#updateAppWidgetSize (issue 6454251)
2012-05-09 10:10:21 -07:00
Adam Powell
433b4425bd
am eb0890da: am a87f2346: Merge "More fun with AbsListView smooth scrolling" into jb-dev
...
* commit 'eb0890da4c875521a79edde0cc9ed7a6a12b5a46':
More fun with AbsListView smooth scrolling
2012-05-09 10:10:16 -07:00
Carlos Valdivia
e8308aafec
am e0ea02c2: am 3fcf1c85: Merge "Fix a race condition with respect to clients of SyncStorageEngine." into jb-dev
...
* commit 'e0ea02c20ea7bcb495baab653a12087b8cd09890':
Fix a race condition with respect to clients of SyncStorageEngine.
2012-05-09 10:10:13 -07:00
Jeff Brown
eda88f0089
am 3d42f8f8: am 9ac663ef: Merge "Disable input dispatch until boot finished." into jb-dev
...
* commit '3d42f8f8cab56ab33cb587a7aa857051d92ada90':
Disable input dispatch until boot finished.
2012-05-09 10:10:09 -07:00
Eric Laurent
ec9323509d
am 776339fe: am c8ade15d: Merge "Silent and Vibrate mode clean up" into jb-dev
...
* commit '776339fe4c6254fd8e344496a793ce4a11b6f450':
Silent and Vibrate mode clean up
2012-05-09 10:10:07 -07:00
Gilles Debunne
e92c4e029b
am 4fcc9b49: am 2e999d12: Merge "Removed debug code in TextView" into jb-dev
...
* commit '4fcc9b49242e850008ea4966f741cdcecca0ae3f':
Removed debug code in TextView
2012-05-09 10:10:03 -07:00
Romain Guy
1313b08011
am 3607c338: am 27ef44c4: Merge "Invalidate display lists immediately when views are removed/added quickly" into jb-dev
...
* commit '3607c338c75bbfbc7e3ac61b5ead4eaf1ac61427':
Invalidate display lists immediately when views are removed/added quickly
2012-05-09 10:09:59 -07:00
Svetoslav Ganov
6a50300822
am d71f6e9a: am 14326fd4: Merge "DefaultGestureHandlingHelperService should not include non-important views." into jb-dev
...
* commit 'd71f6e9a81336f468454a0f9aa76f3860544fea9':
DefaultGestureHandlingHelperService should not include non-important views.
2012-05-09 10:09:56 -07:00
Chris Craik
4af8e75d6a
am d9155605: am aa997294: Merge "Revert "Add temporary functor lifetime logging"" into jb-dev
...
* commit 'd9155605abe9111b1e708cf773c4e6ecfffb59e2':
Revert "Add temporary functor lifetime logging"
2012-05-09 10:09:47 -07:00
Svetoslav Ganov
2da197dff2
am aecb9b59: am 59f3f585: Merge "Add performAccessibilityAction to AccessibilityDelegate." into jb-dev
...
* commit 'aecb9b59e6c9e9a864bf4b302f978fb950df09ff':
Add performAccessibilityAction to AccessibilityDelegate.
2012-05-09 10:09:44 -07:00
Svetoslav Ganov
eacfff7f47
am c2f5e797: am 6704c233: Merge "AccessibilityNodeInfo for visible views should reported." into jb-dev
...
* commit 'c2f5e797506fbc4235d4940846f3e2110e67daa6':
AccessibilityNodeInfo for visible views should reported.
2012-05-09 10:09:32 -07:00
Svetoslav Ganov
529ddb895e
am ca1e49ca: am cdbbecf3: Merge "Accessibility focus on temporary detached view not cleared." into jb-dev
...
* commit 'ca1e49cad5b5eebdd47039289b604bea6f00e8f7':
Accessibility focus on temporary detached view not cleared.
2012-05-09 10:09:29 -07:00
Adam Powell
40b903726f
am cb533917: am 1705b2a5: Merge "Fix some oddities in ResolverActivity" into jb-dev
...
* commit 'cb533917fa759848c6e93cb7dba8f4ab39ac1dff':
Fix some oddities in ResolverActivity
2012-05-09 10:09:26 -07:00
Fabrice Di Meglio
450743459f
am e1b1cdc0: am 92d7f9ff: Merge "Fix bug #6408393 Character corruption is caused when locale is changed" into jb-dev
...
* commit 'e1b1cdc0d45b23ad65819643ca135783ad17b976':
Fix bug #6408393 Character corruption is caused when locale is changed
2012-05-09 10:09:23 -07:00
Jeff Brown
8fd851709f
am a394efa3: am 947f1c8d: Merge "Move CancellationSignal to android.os package." into jb-dev
...
* commit 'a394efa33531ce36c432872ec56ad0c93a9999e7':
Move CancellationSignal to android.os package.
2012-05-09 10:09:20 -07:00
Dianne Hackborn
df74ef8ea5
am 92f12822: am 4a337ec9: Merge "New preference for multi-selection check boxes." into jb-dev
...
* commit '92f12822c18f988c2a5cfbac1b33dd1b0ffaa8e1':
New preference for multi-selection check boxes.
2012-05-09 10:09:14 -07:00
Adam Powell
d509da93e4
am 5fac4ca4: am ef31e7ca: Fix for toggling menu item visibility outside of create/prepare menu
...
* commit '5fac4ca4652e1a5211ef15c706feb64b9f250aa3':
Fix for toggling menu item visibility outside of create/prepare menu
2012-05-09 10:09:05 -07:00
Teng-Hui Zhu
a8c4cd408b
am b63418da: am 87156c96: Merge "Replace tree observer with a JNI call at draw time" into jb-dev
...
* commit 'b63418da9421f2529c7e6d76f6e6d9539ce6660a':
Replace tree observer with a JNI call at draw time
2012-05-09 10:09:02 -07:00
John Reck
140be99266
am 7ed271f3: am 7c38077e: Merge "Fix inval issue" into jb-dev
...
* commit '7ed271f379d9a8272228cb56a5827bed031884c9':
Fix inval issue
2012-05-09 10:08:59 -07:00
John Reck
2dfb7fa1a7
am 443afd7d: am 975b9b78: Merge "Delay creating Java objects for WebHistoryItem" into jb-dev
...
* commit '443afd7d538666976e153ac100cb44e041cc41b3':
Delay creating Java objects for WebHistoryItem
2012-05-09 10:08:56 -07:00