Satoshi Kataoka
580bb919ed
am faf45d25: am ebf7e285: Merge "Close the current input method when attached view doesn\'t have a handler" into jb-mr1-dev
...
* commit 'faf45d2525bf64fa7f484cde9180c448fd0e0345':
Close the current input method when attached view doesn't have a handler
2012-10-03 21:06:57 -07:00
Satoshi Kataoka
faf45d2525
am ebf7e285: Merge "Close the current input method when attached view doesn\'t have a handler" into jb-mr1-dev
...
* commit 'ebf7e2851cab55348153fca299c52042b125924d':
Close the current input method when attached view doesn't have a handler
2012-10-03 21:05:12 -07:00
Satoshi Kataoka
ebf7e2851c
Merge "Close the current input method when attached view doesn't have a handler" into jb-mr1-dev
2012-10-03 21:02:20 -07:00
Christopher Tate
5acd58a758
am d2426a91: am 1a2fac3e: Merge "Use myUserId() only in registerContentObserver()" into jb-mr1-dev
...
* commit 'd2426a91f20dcff6a1845a94a7fa914c63d2de5b':
Use myUserId() only in registerContentObserver()
2012-10-03 18:59:54 -07:00
Christopher Tate
d2426a91f2
am 1a2fac3e: Merge "Use myUserId() only in registerContentObserver()" into jb-mr1-dev
...
* commit '1a2fac3eeda031ac5f4c7d17c883d54af5661a66':
Use myUserId() only in registerContentObserver()
2012-10-03 18:57:23 -07:00
Christopher Tate
1a2fac3eed
Merge "Use myUserId() only in registerContentObserver()" into jb-mr1-dev
2012-10-03 18:54:49 -07:00
Romain Guy
bf8d8e73e4
am 5971d03f: am f7ee2a03: Merge "Fix rendering artifacts on tiled renderers Bug #7275145 " into jb-mr1-dev
...
* commit '5971d03f233c52d697e55ee83d8e514adac21527':
Fix rendering artifacts on tiled renderers Bug #7275145
2012-10-03 18:52:03 -07:00
Dianne Hackborn
85486bd33d
am cd09cb8f: am 6fb7fd3a: Merge "Fix issue #7267494 , issue #7212347 " into jb-mr1-dev
...
* commit 'cd09cb8fb79442aa22018db9134ef1ef22059360':
Fix issue #7267494 , issue #7212347
2012-10-03 18:50:18 -07:00
Romain Guy
5971d03f23
am f7ee2a03: Merge "Fix rendering artifacts on tiled renderers Bug #7275145 " into jb-mr1-dev
...
* commit 'f7ee2a03c1f930db4b20c04225f496ada97e646b':
Fix rendering artifacts on tiled renderers Bug #7275145
2012-10-03 18:49:30 -07:00
Dianne Hackborn
cd09cb8fb7
am 6fb7fd3a: Merge "Fix issue #7267494 , issue #7212347 " into jb-mr1-dev
...
* commit '6fb7fd3a0939413d8968fc0d404ed499d7f7dc52':
Fix issue #7267494 , issue #7212347
2012-10-03 18:47:51 -07:00
Romain Guy
f7ee2a03c1
Merge "Fix rendering artifacts on tiled renderers Bug #7275145 " into jb-mr1-dev
2012-10-03 18:47:35 -07:00
Dianne Hackborn
6fb7fd3a09
Merge "Fix issue #7267494 , issue #7212347 " into jb-mr1-dev
2012-10-03 18:45:37 -07:00
Justin Koh
11adf0ad31
am a521abef: Merge "Synthesizing D-pad event directly from motion events. Includes fling." into jb-mr1-aah-dev
...
* commit 'a521abef83bc329931ef9b8230fe1ae9e1a87b3a':
Synthesizing D-pad event directly from motion events. Includes fling.
2012-10-03 18:20:33 -07:00
Justin Koh
a521abef83
Merge "Synthesizing D-pad event directly from motion events. Includes fling." into jb-mr1-aah-dev
2012-10-03 18:17:06 -07:00
Romain Guy
dfab363807
Fix rendering artifacts on tiled renderers
...
Bug #7275145
This change fixes ViewRoot and adds extra debug information. It does
not solve the problem entirely. Another CL will.
Change-Id: I7e604ba38aad7f421769783dcbd998d6905ab2d9
2012-10-03 18:07:59 -07:00
Dianne Hackborn
c428aae642
Fix issue #7267494 , issue #7212347
...
7267494 Calendar is not syncing
Check for whether a content provider is dead before returning
it. This is kind-of a band-aid, but probably the right thing
to do; I'm just not sure exactly the full details of why this
problem is happening. Hopefully this "fixes" it, though I don't
have a way to repro to tell.
7212347 System power off dialog is only visible to user 0
Make it visible. Also turn on some battery debugging stuff and
clean it up so we can just keep it.
Change-Id: I5add25bf2a763c8dfe1df23bc5c753a9ea5d157a
2012-10-03 18:07:23 -07:00
Fabrice Di Meglio
b4a80baaff
am 5e5169b0: am 33c36895: Merge "Fix bug #7282594 EditText does not allow to move the cursor when typing RTL text and if gravity is set to LEFT" into jb-mr1-dev
...
* commit '5e5169b0d0d51e042a79ca32d2825fc5f4a25531':
Fix bug #7282594 EditText does not allow to move the cursor when typing RTL text and if gravity is set to LEFT
2012-10-03 17:48:09 -07:00
Fabrice Di Meglio
5e5169b0d0
am 33c36895: Merge "Fix bug #7282594 EditText does not allow to move the cursor when typing RTL text and if gravity is set to LEFT" into jb-mr1-dev
...
* commit '33c36895a294c7b731fd59017a7ea0f06ac2a356':
Fix bug #7282594 EditText does not allow to move the cursor when typing RTL text and if gravity is set to LEFT
2012-10-03 17:45:16 -07:00
Fabrice Di Meglio
33c36895a2
Merge "Fix bug #7282594 EditText does not allow to move the cursor when typing RTL text and if gravity is set to LEFT" into jb-mr1-dev
2012-10-03 17:43:08 -07:00
Christopher Tate
afccaa84c8
Use myUserId() only in registerContentObserver()
...
The reason for this is a bit subtle: we want to guarantee that
when a content observer is registered using the public API, it
is *always* bound to the host user's view of the data behind the
observed Uri, never the calling user's. Now, the reason it was
the calling user in the first place is that the Settings provider
(and potentially any singleton provider) needs the observers
underlying Cursors returned from query() to be tied to the caller's
user, not the provider's host user.
In order to accomplish that now that the public-facing behavior is
always tied to the host user, the concrete class that implements
the Cursor type handled by the Settings provider has been extended
with a new hidden API for setting a notification observer tied to
an arbitrary user; and then the provider explicitly downcasts the
query result's Cursor to that class in order to register the
notification observer. We can do this safely because this is platform
code; if we change the way that these underlying cursors are constructed,
we can just fix this point of call to follow along. If they get out
of sync in the future, the Settings provider will scream bloody
murder in the log and throw a crashing exception.
Bug 7231549
Change-Id: I0aaceebb8b4108c56f8b9964ca7f9e698ddd91c8
2012-10-03 17:41:51 -07:00
Ben Pietrzak
6f403a8290
Synthesizing D-pad event directly from motion events. Includes fling.
...
Change-Id: I0b1d4fafee6f21b64ca8b4480e4fde73085efbbe
2012-10-03 17:31:49 -07:00
Amith Yamasani
23243730a2
am f4809ebb: am 2e307a61: Merge "No breadcrumbs for single-pane preferences" into jb-mr1-dev
...
* commit 'f4809ebba77bdf84b700ae863bfbd913367908d4':
No breadcrumbs for single-pane preferences
2012-10-03 17:18:29 -07:00
Fabrice Di Meglio
db24f0a73f
Fix bug #7282594 EditText does not allow to move the cursor when typing RTL text and if gravity is set to LEFT
...
- fold LEFT/RIGHT into NORMAL/OPPOSITE cases
Change-Id: Idf14342ffed4840e7b4ea53cc42f1cde8f196a4c
2012-10-03 17:17:14 -07:00
Amith Yamasani
f4809ebba7
am 2e307a61: Merge "No breadcrumbs for single-pane preferences" into jb-mr1-dev
...
* commit '2e307a61a3730e6b65906f575d85258b197e3494':
No breadcrumbs for single-pane preferences
2012-10-03 17:16:32 -07:00
Amith Yamasani
2e307a61a3
Merge "No breadcrumbs for single-pane preferences" into jb-mr1-dev
2012-10-03 17:13:24 -07:00
mike wakerly
419a85e47e
am 067bf854: am 2e7b11af: Merge "NfcAdapterExtras: expose driver name." into jb-mr1-dev
...
* commit '067bf85404b704f046f777c2c4c2e218808ac6a0':
NfcAdapterExtras: expose driver name.
2012-10-03 16:53:50 -07:00
mike wakerly
067bf85404
am 2e7b11af: Merge "NfcAdapterExtras: expose driver name." into jb-mr1-dev
...
* commit '2e7b11af55efa97239ac2d96d36bc80e7107ffca':
NfcAdapterExtras: expose driver name.
2012-10-03 16:50:59 -07:00
Amith Yamasani
3ec7bac9a0
No breadcrumbs for single-pane preferences
...
Bug: 7274530
Change-Id: I6a4b6321a72ad38a757098ea470ac58d4294639b
2012-10-03 16:21:42 -07:00
mike wakerly
f74df47fc9
NfcAdapterExtras: expose driver name.
...
Bug: 7276355
Change-Id: I65597f732c2ccb749f8fc5ef1793bacf5de8b592
2012-10-03 14:14:23 -07:00
Adam Powell
7eb3ecdfef
am e2238929: am b25629b1: Merge "Close a Spinner dropdown if its anchor view goes away." into jb-mr1-dev
...
* commit 'e223892986f21ceeb942a73cf2c7a66642cd8af8':
Close a Spinner dropdown if its anchor view goes away.
2012-10-03 13:53:46 -07:00
Raph Levien
11541338c5
am e9b175b7: am 484de9db: Merge "Fix for bug 6954231 text wraps on second line and is fused..." into jb-mr1-dev
...
* commit 'e9b175b7131e2b709902c6e2f4a861fbb638b1d2':
Fix for bug 6954231 text wraps on second line and is fused...
2012-10-03 13:53:42 -07:00
Christopher Tate
11ebeae0b5
am f4c51434: am 1795325a: Merge "Make settings backup/restore work in the new multi-user world" into jb-mr1-dev
...
* commit 'f4c51434e7d02685e7f1cc02d9b049a104d2a18f':
Make settings backup/restore work in the new multi-user world
2012-10-03 13:53:36 -07:00
Adam Powell
e223892986
am b25629b1: Merge "Close a Spinner dropdown if its anchor view goes away." into jb-mr1-dev
...
* commit 'b25629b123a6ccb70095cfa3a26362ee46d30e33':
Close a Spinner dropdown if its anchor view goes away.
2012-10-03 12:13:07 -07:00
Adam Powell
b25629b123
Merge "Close a Spinner dropdown if its anchor view goes away." into jb-mr1-dev
2012-10-03 12:11:02 -07:00
Raph Levien
e9b175b713
am 484de9db: Merge "Fix for bug 6954231 text wraps on second line and is fused..." into jb-mr1-dev
...
* commit '484de9db7c4044588929f11673906fea205e409b':
Fix for bug 6954231 text wraps on second line and is fused...
2012-10-03 12:09:50 -07:00
Raph Levien
484de9db7c
Merge "Fix for bug 6954231 text wraps on second line and is fused..." into jb-mr1-dev
2012-10-03 12:07:26 -07:00
Christopher Tate
f4c51434e7
am 1795325a: Merge "Make settings backup/restore work in the new multi-user world" into jb-mr1-dev
...
* commit '1795325af7b0d9abc6cd47ea31aa2ff29eec0ba9':
Make settings backup/restore work in the new multi-user world
2012-10-03 12:00:17 -07:00
Christopher Tate
1795325af7
Merge "Make settings backup/restore work in the new multi-user world" into jb-mr1-dev
2012-10-03 11:54:01 -07:00
Adam Powell
f16daf6127
Close a Spinner dropdown if its anchor view goes away.
...
PopupWindow already tracks when anchor views scroll, but it doesn't
catch other layout changes.
Bug 7267264
Change-Id: I1e20f9335057832c78c3002aa931f533dd77514b
2012-10-03 11:53:06 -07:00
Raph Levien
6b558994d4
Fix for bug 6954231 text wraps on second line and is fused...
...
When breaking a line, the paragraphs below the new line break were still
being drawn in their old location. This only happened when the height
was fill_parent, otherwise the height change would force a relayout,
which in turn would do a full invalidation.
This patch checks for changes to the layout height (not just the widget
height, which won't change when it's fill_parent), and invalidates.
Change-Id: I64adb9f5eae0479c1c9c8d37c10c2c27a6f582a8
2012-10-03 09:34:24 -07:00
Jeff Brown
2e9b86fa73
am f1d95f59: am 5558b79e: Merge "Fix some synchronization issues in BatteryService." into jb-mr1-dev
...
* commit 'f1d95f59d5e97b9cefa2aacf08abae010ce5311f':
Fix some synchronization issues in BatteryService.
2012-10-02 23:32:02 -07:00
Jeff Brown
f1d95f59d5
am 5558b79e: Merge "Fix some synchronization issues in BatteryService." into jb-mr1-dev
...
* commit '5558b79e7a40adb3ad550e8bdf37996ddbeb714f':
Fix some synchronization issues in BatteryService.
2012-10-02 23:29:52 -07:00
Jeff Brown
5558b79e7a
Merge "Fix some synchronization issues in BatteryService." into jb-mr1-dev
2012-10-02 23:28:02 -07:00
Satoshi Kataoka
3573950e0b
Close the current input method when attached view doesn't have a handler
...
Bug: 7187452
Change-Id: Iba4f7ac89f5806e871aaeb97f366935b83b95a5a
2012-10-03 12:07:23 +09:00
Adam Powell
3183a2cf28
am 653d4b47: am d27f1cd3: Merge "Further refine touchMajor processing in ScaleGestureDetector" into jb-mr1-dev
...
* commit '653d4b47f4112f8fac1e2e7985ae246f312cdab4':
Further refine touchMajor processing in ScaleGestureDetector
2012-10-02 19:37:35 -07:00
Adam Powell
653d4b47f4
am d27f1cd3: Merge "Further refine touchMajor processing in ScaleGestureDetector" into jb-mr1-dev
...
* commit 'd27f1cd30b140f042e11032e4aa4381756e2998f':
Further refine touchMajor processing in ScaleGestureDetector
2012-10-02 19:35:04 -07:00
Adam Powell
d27f1cd30b
Merge "Further refine touchMajor processing in ScaleGestureDetector" into jb-mr1-dev
2012-10-02 19:33:00 -07:00
Jeff Brown
a4d8204e30
Fix some synchronization issues in BatteryService.
...
Some of the BatteryService state was being locked
sometimes and it wasn't at all consistent.
Bug: 7158734
Change-Id: I46e75f66fde92c5a577a80a6bd99c9573066f3c1
2012-10-02 19:11:19 -07:00
Adam Powell
5b5c414e31
Further refine touchMajor processing in ScaleGestureDetector
...
On some devices the information coming from the touchscreen is very
noisy or otherwise unreliable. Perform some processing on the data
we have to try to provide a smoother experience.
Bug 7267507
Change-Id: I863125f58577f522de05a1361b81c2e42975fd89
2012-10-02 19:07:16 -07:00
Dianne Hackborn
bba79225c9
am 8a22c07a: am 720d14db: Merge "Fix issue #7273573 : Need API to find out if activity is destroyed" into jb-mr1-dev
...
* commit '8a22c07a8ce805a73269a6577f6dd00f213e71a5':
Fix issue #7273573 : Need API to find out if activity is destroyed
2012-10-02 19:04:15 -07:00