Jeff Brown
7952056c71
am b1e93505: am 25f5a71f: am 17f36d15: Merge "Allow phone to go to sleep while in call." into jb-mr1-dev
...
* commit 'b1e93505ae479c657fd2cfc21ddabadec8a03f6a':
Allow phone to go to sleep while in call.
2012-10-04 17:39:07 -07:00
Jeff Brown
b1e93505ae
am 25f5a71f: am 17f36d15: Merge "Allow phone to go to sleep while in call." into jb-mr1-dev
...
* commit '25f5a71f31d8cb526f04c833c5b67e59369c725f':
Allow phone to go to sleep while in call.
2012-10-04 17:37:29 -07:00
Jeff Brown
25f5a71f31
am 17f36d15: Merge "Allow phone to go to sleep while in call." into jb-mr1-dev
...
* commit '17f36d154f1a8ebe72fc35af332f5c0069503364':
Allow phone to go to sleep while in call.
2012-10-04 17:35:29 -07:00
Jeff Brown
93cbbb25a5
Allow phone to go to sleep while in call.
...
Bug: 7279383
Change-Id: Ia05490218f40a1843507b95ff48fa07910e582d4
2012-10-04 16:22:04 -07:00
Jeff Brown
2e65fa2cc3
am 6ac19fe0: am 4fb5b85a: am dce8b948: Merge "Fix parceling of display info flags." into jb-mr1-dev
...
* commit '6ac19fe0b02c05089e53e380a980b4f646739b30':
Fix parceling of display info flags.
2012-10-04 15:33:35 -07:00
Jeff Brown
6ac19fe0b0
am 4fb5b85a: am dce8b948: Merge "Fix parceling of display info flags." into jb-mr1-dev
...
* commit '4fb5b85a5be88028398e67f37b2d7f802550d9fd':
Fix parceling of display info flags.
2012-10-04 15:31:07 -07:00
Adam Powell
0a027ded5f
am 5e1b345f: am 64f369bb: am b4fad85c: Merge "Fix regression in AbsListView CHOICE_MODE_SINGLE" into jb-mr1-dev
...
* commit '5e1b345f41a01e46e2bddf53e3b0c73b3877333c':
Fix regression in AbsListView CHOICE_MODE_SINGLE
2012-10-04 15:30:16 -07:00
Adam Powell
5e1b345f41
am 64f369bb: am b4fad85c: Merge "Fix regression in AbsListView CHOICE_MODE_SINGLE" into jb-mr1-dev
...
* commit '64f369bbc55a1ca9a88db298dff34fba38c1daae':
Fix regression in AbsListView CHOICE_MODE_SINGLE
2012-10-04 15:27:47 -07:00
Jeff Brown
4fb5b85a5b
am dce8b948: Merge "Fix parceling of display info flags." into jb-mr1-dev
...
* commit 'dce8b948320e933e46e4a38c496f56555472495f':
Fix parceling of display info flags.
2012-10-04 15:27:15 -07:00
Adam Powell
64f369bbc5
am b4fad85c: Merge "Fix regression in AbsListView CHOICE_MODE_SINGLE" into jb-mr1-dev
...
* commit 'b4fad85ca0ed258e4f8de8045c707a4bf2a6ce66':
Fix regression in AbsListView CHOICE_MODE_SINGLE
2012-10-04 15:25:36 -07:00
Jeff Brown
dce8b94832
Merge "Fix parceling of display info flags." into jb-mr1-dev
2012-10-04 15:04:21 -07:00
Adam Powell
b4fad85ca0
Merge "Fix regression in AbsListView CHOICE_MODE_SINGLE" into jb-mr1-dev
2012-10-04 15:02:52 -07:00
Jeff Brown
3f2ba6220b
Fix parceling of display info flags.
...
Bug: 7283429
Change-Id: I5365a3b06d9b9f2414f9a9d2c94b0906c41b4ece
2012-10-04 14:58:43 -07:00
Adam Powell
f3b8e6fe78
Fix regression in AbsListView CHOICE_MODE_SINGLE
...
Earlier patch reversed a few lines of code that allowed deselection of
the currently selected item in CHOICE_MODE_SINGLE. Put it back the way
it was.
Bug 7289436
Change-Id: Ia1c5f3238d2faa3dd79e474851333fda90978d3c
2012-10-04 14:53:36 -07:00
Dianne Hackborn
8f5a94d938
am a718bc86: am 7df202e2: am 8a229195: Merge "Fix issue #6968859 : home not exiting an ANR\'d dream" into jb-mr1-dev
...
* commit 'a718bc863aafd21a2bc7240974ca2a51d6af92cf':
Fix issue #6968859 : home not exiting an ANR'd dream
2012-10-04 12:48:13 -07:00
Dianne Hackborn
a718bc863a
am 7df202e2: am 8a229195: Merge "Fix issue #6968859 : home not exiting an ANR\'d dream" into jb-mr1-dev
...
* commit '7df202e27a34bc1dc8832e4521a2189279de2030':
Fix issue #6968859 : home not exiting an ANR'd dream
2012-10-04 12:45:23 -07:00
Dianne Hackborn
7df202e27a
am 8a229195: Merge "Fix issue #6968859 : home not exiting an ANR\'d dream" into jb-mr1-dev
...
* commit '8a2291952528303d284878468fe260ec41998db3':
Fix issue #6968859 : home not exiting an ANR'd dream
2012-10-04 12:43:15 -07:00
Dianne Hackborn
8a22919525
Merge "Fix issue #6968859 : home not exiting an ANR'd dream" into jb-mr1-dev
2012-10-04 12:41:41 -07:00
Dianne Hackborn
5fe7e2a304
Fix issue #6968859 : home not exiting an ANR'd dream
...
Add a new call to the activity manager for the input dispatcher
to report about any pid having an ANR. This has a new feature
where it can also tell the activity manager that it is above the
system alert layer, so the activity manager can pop its ANR dialog
on top of everything if it needs to. (Normally we don't want
these dialogs appearing on top of the lock screen.)
Also fixed some debugging stuff here and there that was useful
as I was working on this -- windows now very clearly include
their uid, various system dialogs now have titles so you know
what they are in the window manager, etc.
Change-Id: Ib8f5d29a5572542cc506e6d338599ab64088ce4e
2012-10-04 12:04:58 -07:00
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
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
Christopher Tate
1a2fac3eed
Merge "Use myUserId() only in registerContentObserver()" into jb-mr1-dev
2012-10-03 18:54:49 -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
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
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
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