Satoshi Kataoka
feb750e729
am 580bb919: am faf45d25: am ebf7e285: Merge "Close the current input method when attached view doesn\'t have a handler" into jb-mr1-dev
...
* commit '580bb919ed61d22de018f5cb0df68ae566c01843':
Close the current input method when attached view doesn't have a handler
2012-10-03 21:08:51 -07:00
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
Jim Miller
7cbba9f5d9
am 9b8c0095: am c2cb3c2f: am 5b14b969: Merge "Fix keyguard landscape layout on phones" into jb-mr1-dev
...
* commit '9b8c0095100a551ac1fe19ccfb18ec5353df0bee':
Fix keyguard landscape layout on phones
2012-10-03 20:36:30 -07:00
Jim Miller
9b8c009510
am c2cb3c2f: am 5b14b969: Merge "Fix keyguard landscape layout on phones" into jb-mr1-dev
...
* commit 'c2cb3c2f3cc50a9d583b970cf85978ba36b97d63':
Fix keyguard landscape layout on phones
2012-10-03 20:34:07 -07:00
Jim Miller
c2cb3c2f3c
am 5b14b969: Merge "Fix keyguard landscape layout on phones" into jb-mr1-dev
...
* commit '5b14b9698c288031fea6b40f0e1240c32ac83725':
Fix keyguard landscape layout on phones
2012-10-03 20:32:02 -07:00
Jim Miller
5b14b9698c
Merge "Fix keyguard landscape layout on phones" into jb-mr1-dev
2012-10-03 20:30:10 -07:00
Christopher Tate
2c7c1dfd56
am 5acd58a7: am d2426a91: am 1a2fac3e: Merge "Use myUserId() only in registerContentObserver()" into jb-mr1-dev
...
* commit '5acd58a758ad9bb93d59d9d6f1dbe9f516096e3a':
Use myUserId() only in registerContentObserver()
2012-10-03 19:01:37 -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
Adam Powell
31470b4e81
am bc2ddd51: am 057b2f12: am ac2fc163: Merge "Remove unneeded margin below action bar subtitles" into jb-mr1-dev
...
* commit 'bc2ddd519288313d5419565092dbb2532a85307a':
Remove unneeded margin below action bar subtitles
2012-10-03 18:56:29 -07:00
Christopher Tate
1a2fac3eed
Merge "Use myUserId() only in registerContentObserver()" into jb-mr1-dev
2012-10-03 18:54:49 -07:00
Adam Powell
bc2ddd5192
am 057b2f12: am ac2fc163: Merge "Remove unneeded margin below action bar subtitles" into jb-mr1-dev
...
* commit '057b2f12a964ec2508ae8958240c908857eaebb6':
Remove unneeded margin below action bar subtitles
2012-10-03 18:54:40 -07:00
Romain Guy
82fa5ffbbc
am bf8d8e73: am 5971d03f: am f7ee2a03: Merge "Fix rendering artifacts on tiled renderers Bug #7275145 " into jb-mr1-dev
...
* commit 'bf8d8e73e4123f529845e88de6d74b62853b9786':
Fix rendering artifacts on tiled renderers Bug #7275145
2012-10-03 18:53:48 -07:00
Adam Powell
057b2f12a9
am ac2fc163: Merge "Remove unneeded margin below action bar subtitles" into jb-mr1-dev
...
* commit 'ac2fc16373fb93f28c9335c27dff744194b28678':
Remove unneeded margin below action bar subtitles
2012-10-03 18:52:12 -07:00
Dianne Hackborn
618c9030db
am 85486bd3: am cd09cb8f: am 6fb7fd3a: Merge "Fix issue #7267494 , issue #7212347 " into jb-mr1-dev
...
* commit '85486bd33de1f3665f158df636217166c83199f5':
Fix issue #7267494 , issue #7212347
2012-10-03 18:52:07 -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
Adam Powell
ac2fc16373
Merge "Remove unneeded margin below action bar subtitles" into jb-mr1-dev
2012-10-03 18:50:10 -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
Jim Miller
ce3e948c5c
Fix keyguard landscape layout on phones
...
This particular layout didn't have layout_height specified, which
is undefined. However, the undefined behavior seems to have changed
on the platform to one where this layout no longer works. Not
specifying layout_height causes the security area view to be 0 pixels
wide, effectively ignoring layout_weight.
Fixes bug 7283261
Change-Id: I0e3d156e9b2d7ef1492dec9791f0e241e8cd7fe6
2012-10-03 18:48:07 -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
Adam Powell
17033bfa15
Remove unneeded margin below action bar subtitles
...
This just throws off alignment when the natural centering of this
layout will take care of things.
Bug 6369593
Change-Id: If0993091e0d47011f3bf5dd0b5a1fa649471f8e6
2012-10-03 18:31:08 -07:00
Justin Koh
6f409f9f3b
am 11adf0ad: am a521abef: Merge "Synthesizing D-pad event directly from motion events. Includes fling." into jb-mr1-aah-dev
...
* commit '11adf0ad313a53d017bcbab81969b3c2d9547a17':
Synthesizing D-pad event directly from motion events. Includes fling.
2012-10-03 18:22:55 -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
df0732c3a8
am b4a80baa: 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 'b4a80baaff113f0f9ba357bfbd5dc0cb85dc8987':
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:49:56 -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
55a3b96133
am 23243730: am f4809ebb: am 2e307a61: Merge "No breadcrumbs for single-pane preferences" into jb-mr1-dev
...
* commit '23243730a2e8da360c24ecad9ce89914274b0eab':
No breadcrumbs for single-pane preferences
2012-10-03 17:20:52 -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
ee3151e0eb
am 419a85e4: am 067bf854: am 2e7b11af: Merge "NfcAdapterExtras: expose driver name." into jb-mr1-dev
...
* commit '419a85e47e1dabb2cbcbd2f70a44a1a735610383':
NfcAdapterExtras: expose driver name.
2012-10-03 16:56:23 -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
mike wakerly
2e7b11af55
Merge "NfcAdapterExtras: expose driver name." into jb-mr1-dev
2012-10-03 16:47:45 -07:00
Amith Yamasani
3ec7bac9a0
No breadcrumbs for single-pane preferences
...
Bug: 7274530
Change-Id: I6a4b6321a72ad38a757098ea470ac58d4294639b
2012-10-03 16:21:42 -07:00
Raph Levien
997d4283c0
am d8c6c6f5: am 1ca8d35f: am 5a829cbf: Merge "Fix for testPaintFlagsDrawFilter CTS test" into jb-mr1-dev
...
* commit 'd8c6c6f56630fa466b96dd5359d39a659a1e42f8':
Fix for testPaintFlagsDrawFilter CTS test
2012-10-03 16:05:18 -07:00
Raph Levien
d8c6c6f566
am 1ca8d35f: am 5a829cbf: Merge "Fix for testPaintFlagsDrawFilter CTS test" into jb-mr1-dev
...
* commit '1ca8d35f4d05a4dcd0d0cc202a3e4a51f35e8655':
Fix for testPaintFlagsDrawFilter CTS test
2012-10-03 16:02:42 -07:00
Raph Levien
1ca8d35f4d
am 5a829cbf: Merge "Fix for testPaintFlagsDrawFilter CTS test" into jb-mr1-dev
...
* commit '5a829cbf5862d6c41f709b86ed5fc1085fea95ee':
Fix for testPaintFlagsDrawFilter CTS test
2012-10-03 16:01:15 -07:00