Chris Craik
fa189c8f1c
am c972f05c: am a76f823c: Merge "Fix locking for skip draw" into jb-dev
...
* commit 'c972f05cccd5fb344ee290aa73ab08da84163b74':
Fix locking for skip draw
2012-05-10 09:33:36 -07:00
Guang Zhu
257dfaeda9
am cc441aba: am 0fa15291: Merge "Make UiTestAutomationBridge see non-important views again" into jb-dev
...
* commit 'cc441aba8a7d7366e256675bea27207284fff74e':
Make UiTestAutomationBridge see non-important views again
2012-05-10 09:33:33 -07:00
Dianne Hackborn
455af7f7b0
am 67cc7f2e: am a53de062: Add callback hack to find out when to load system properties.
...
* commit '67cc7f2e60bc6532d00bb3c473b9a1d32cdafce2':
Add callback hack to find out when to load system properties.
2012-05-10 09:33:27 -07:00
Jeff Sharkey
4311705501
am fe9e28cb: am 6367b166: Merge "Recover from Throwable in FileRotator, dump." into jb-dev
...
* commit 'fe9e28cba7dabb452fdbadcf421f7f758a859447':
Recover from Throwable in FileRotator, dump.
2012-05-10 09:33:21 -07:00
Chris Craik
c972f05ccc
am a76f823c: Merge "Fix locking for skip draw" into jb-dev
...
* commit 'a76f823c7f31bffdea4d49daa6c6165520928708':
Fix locking for skip draw
2012-05-10 09:24:32 -07:00
Guang Zhu
cc441aba8a
am 0fa15291: Merge "Make UiTestAutomationBridge see non-important views again" into jb-dev
...
* commit '0fa152912e55f2d08f0a8d1260332a81e5706694':
Make UiTestAutomationBridge see non-important views again
2012-05-10 09:24:19 -07:00
Dianne Hackborn
67cc7f2e60
am a53de062: Add callback hack to find out when to load system properties.
...
* commit 'a53de0629f3b94472c0f160f5bbe1090b020feab':
Add callback hack to find out when to load system properties.
2012-05-10 09:24:07 -07:00
Jeff Sharkey
fe9e28cba7
am 6367b166: Merge "Recover from Throwable in FileRotator, dump." into jb-dev
...
* commit '6367b1669d41f9fe7cd7abe5e05296edecd50f8e':
Recover from Throwable in FileRotator, dump.
2012-05-10 09:23:59 -07:00
Chris Craik
a76f823c7f
Merge "Fix locking for skip draw" into jb-dev
2012-05-09 15:37:03 -07:00
Guang Zhu
0fa152912e
Merge "Make UiTestAutomationBridge see non-important views again" into jb-dev
2012-05-09 15:11:14 -07:00
Dianne Hackborn
a53de0629f
Add callback hack to find out when to load system properties.
...
Use this to reload the trace and layout bounds properties.
This is ONLY for debugging.
Change-Id: I1c4bdb52c823520c352c5bac45fa9ee31160793c
2012-05-09 14:53:20 -07:00
Jeff Sharkey
6367b1669d
Merge "Recover from Throwable in FileRotator, dump." into jb-dev
2012-05-09 14:36:40 -07:00
Guang Zhu
df549f8381
Make UiTestAutomationBridge see non-important views again
...
This problem was introduced in I74df9c24. The intention of the
change was still let UiTestAutomationBridge see the
non-important views, but there were bugs in the implementation:
1. AccessibilityManagerService was not really updating
mIncludeNotImportantViews when mIsAutomation is true
2. Wrong constant is used to set the flag
Change-Id: Ia0a2e9ed9720bd0ea3a563e0b492e870a6ec1586
2012-05-09 14:32:15 -07:00
Irfan Sheriff
0280e9cf8f
am 1a11e33b: am 9669a0ce: Merge "API review fixes" into jb-dev
...
* commit '1a11e33b91daeed22eef42936233e0751e56f4b8':
API review fixes
2012-05-09 14:09:20 -07:00
John Reck
55c68f14e1
Fix locking for skip draw
...
Bug: 6469098
Change-Id: I3e6903072994a5a0437c40dcf211ddb707883a69
2012-05-09 14:08:01 -07:00
Irfan Sheriff
1a11e33b91
am 9669a0ce: Merge "API review fixes" into jb-dev
...
* commit '9669a0ce574745ba0b0ebd32e8337811973fb7dc':
API review fixes
2012-05-09 14:06:12 -07:00
Irfan Sheriff
9669a0ce57
Merge "API review fixes" into jb-dev
2012-05-09 14:04:04 -07:00
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
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
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