Jeff Brown
9370592e23
am 5d359a92: am 5e3dcf72: Merge "Remove clearUserActivityTimeout()." into jb-mr1-dev
...
* commit '5d359a92658d01b0220f77eb294d6124848739bc':
Remove clearUserActivityTimeout().
2012-10-01 11:41:11 -07:00
Jeff Brown
5d359a9265
am 5e3dcf72: Merge "Remove clearUserActivityTimeout()." into jb-mr1-dev
...
* commit '5e3dcf7210bed65d8f9aec40d9da078daf76dead':
Remove clearUserActivityTimeout().
2012-10-01 11:39:30 -07:00
Jeff Brown
5e3dcf7210
Merge "Remove clearUserActivityTimeout()." into jb-mr1-dev
2012-10-01 11:35:55 -07:00
Adam Powell
586439676f
am 21a80ff4: am c56e5600: Merge "Construct a task stack for picking a wifi network from notification" into jb-mr1-dev
...
* commit '21a80ff4d1a557d8e33f86a218d204c0093fefc7':
Construct a task stack for picking a wifi network from notification
2012-10-01 10:36:48 -07:00
Adam Powell
21a80ff4d1
am c56e5600: Merge "Construct a task stack for picking a wifi network from notification" into jb-mr1-dev
...
* commit 'c56e5600501a5c376dc13e6a99fcec7782fc8718':
Construct a task stack for picking a wifi network from notification
2012-10-01 10:34:59 -07:00
Adam Powell
c56e560050
Merge "Construct a task stack for picking a wifi network from notification" into jb-mr1-dev
2012-10-01 10:32:35 -07:00
John Spurlock
e58fc04f7c
am db3b01a5: am ff70848e: Merge "Status bar: Keep disabled state per user." into jb-mr1-dev
...
* commit 'db3b01a5bfbf5e190bf6116b71e27971c3b5816b':
Status bar: Keep disabled state per user.
2012-10-01 10:24:05 -07:00
Satoshi Kataoka
6ce84e681e
am c97fa8f8: am 135e5fb7: Always accept API calls from processes which have INTERACT_ACROSS_USERS_FULL in InputMethodManagerService
...
* commit 'c97fa8f8a02f1850779cc1e6ff6b67bcdbeecb1b':
Always accept API calls from processes which have INTERACT_ACROSS_USERS_FULL in InputMethodManagerService
2012-10-01 10:17:05 -07:00
Jeff Sharkey
1586c228f7
am f138e3ce: am 71520a68: Merge "Handle ISE when physical volume isn\'t mounted." into jb-mr1-dev
...
* commit 'f138e3cec9aa6b86a0e614a39ed29f0709ebfabd':
Handle ISE when physical volume isn't mounted.
2012-10-01 10:16:35 -07:00
Dianne Hackborn
3645f2ccde
am 55241249: am 2a30547a: Merge "Work on issue #6949468 : android.dpi.cts.ConfigurationScreenLayoutTest..." into jb-mr1-dev
...
* commit '552412496c00c04c9af353785936a89743677d49':
Work on issue #6949468 : android.dpi.cts.ConfigurationScreenLayoutTest...
2012-10-01 10:16:22 -07:00
rich cannings
fdd8a81015
am 60000916: am 2b58c1b5: Merge "Disable package verification in test harness" into jb-mr1-dev
...
* commit '6000091663200e8846f418db99f2b4618cc6a294':
Disable package verification in test harness
2012-10-01 10:16:14 -07:00
Craig Mautner
7b9a263b50
am 61d32c0d: am a6efc965: Merge "Changing debug for b/7094175." into jb-mr1-dev
...
* commit '61d32c0d0f05a394129e03d774589b8d93f5f8fb':
Changing debug for b/7094175.
2012-10-01 10:15:05 -07:00
Svetoslav Ganov
798af86dcc
am 82e21b33: am 9ea8f390: Explore by touch enabled when screen magnification is on.
...
* commit '82e21b33bde057ba21dde9ee2023d785b4b5a757':
Explore by touch enabled when screen magnification is on.
2012-10-01 10:14:19 -07:00
Jeff Brown
843b014aca
am 489c1e9f: am 7f813202: Merge "Get rid of preventScreenOn()." into jb-mr1-dev
...
* commit '489c1e9f82250770004ec9080778546b040f6146':
Get rid of preventScreenOn().
2012-10-01 10:13:52 -07:00
Dianne Hackborn
d698542867
am 66e92752: am 84215565: Merge "Fix issue #7255954 : API Review: rename Dream to DreamService" into jb-mr1-dev
...
* commit '66e92752260e4ef21e77a44379f3a6b8969b4d65':
Fix issue #7255954 : API Review: rename Dream to DreamService
2012-10-01 10:13:25 -07:00
John Spurlock
db3b01a5bf
am ff70848e: Merge "Status bar: Keep disabled state per user." into jb-mr1-dev
...
* commit 'ff70848eb2a6b916ad2ad2ceec0c59bcb41373a2':
Status bar: Keep disabled state per user.
2012-10-01 10:13:14 -07:00
Svetoslav Ganov
8173646ea4
am 45cde607: am c5211780: Merge "Sending interaction end event at the end of a drag." into jb-mr1-dev
...
* commit '45cde607d5c6dfe39675a12d3bc47a0bc74565a2':
Sending interaction end event at the end of a drag.
2012-10-01 10:13:12 -07:00
John Spurlock
13451a25ff
Status bar: Keep disabled state per user.
...
Bug:7165607
Change-Id: If6f7a41c2516996612aef5e013dd0d2bd23f9084
2012-10-01 11:44:37 -04:00
Satoshi Kataoka
c97fa8f8a0
am 135e5fb7: Always accept API calls from processes which have INTERACT_ACROSS_USERS_FULL in InputMethodManagerService
...
* commit '135e5fb71242b1151929e2ea7bf221ff421e6ad2':
Always accept API calls from processes which have INTERACT_ACROSS_USERS_FULL in InputMethodManagerService
2012-10-01 00:29:44 -07:00
Satoshi Kataoka
135e5fb712
Always accept API calls from processes which have INTERACT_ACROSS_USERS_FULL in InputMethodManagerService
...
Bug: 6931482
Change-Id: I1620413578b9e8da6564664219f65bdc00d5ecfd
2012-10-01 16:18:05 +09:00
Adam Powell
d56b4d1db3
Construct a task stack for picking a wifi network from notification
...
Bug 7001327
Change-Id: I5a79e6933cd33386cd0aa4df626f15902deedd67
2012-09-30 18:30:42 -07:00
Jeff Sharkey
f138e3cec9
am 71520a68: Merge "Handle ISE when physical volume isn\'t mounted." into jb-mr1-dev
...
* commit '71520a68f3906ce2a7e425edd7fe08bac535a967':
Handle ISE when physical volume isn't mounted.
2012-09-30 17:18:49 -07:00
Jeff Sharkey
71520a68f3
Merge "Handle ISE when physical volume isn't mounted." into jb-mr1-dev
2012-09-30 17:16:50 -07:00
Jeff Brown
edce6a7978
Remove clearUserActivityTimeout().
...
This function is not implemented and not needed.
Bug: 7165399
Change-Id: Ib1c50fabad6292ccf670404ba70aeb1242c4614d
2012-09-30 16:23:05 -07:00
Dianne Hackborn
552412496c
am 2a30547a: Merge "Work on issue #6949468 : android.dpi.cts.ConfigurationScreenLayoutTest..." into jb-mr1-dev
...
* commit '2a30547af44536f6b0e2f7020ac1a435c72afc84':
Work on issue #6949468 : android.dpi.cts.ConfigurationScreenLayoutTest...
2012-09-30 15:55:02 -07:00
Dianne Hackborn
2a30547af4
Merge "Work on issue #6949468 : android.dpi.cts.ConfigurationScreenLayoutTest..." into jb-mr1-dev
2012-09-30 15:52:47 -07:00
rich cannings
6000091663
am 2b58c1b5: Merge "Disable package verification in test harness" into jb-mr1-dev
...
* commit '2b58c1b503334ea20be9de3c2b5654855f9d4669':
Disable package verification in test harness
2012-09-30 15:25:35 -07:00
Dianne Hackborn
fe37f8f51d
Work on issue #6949468 : android.dpi.cts.ConfigurationScreenLayoutTest...
...
...#testScreenLayout failures on JO
This doesn't actually fix it; I have concluded that the test is broken
(the platform is correctly reporting that this is a NOT LONG device
because in portrait once you account for the status bar and system
bar our size is 880dp high and 600dp wide, which is not enough for us
to be in the LONG config).
However while working on this I noticed that the code for computing
the configuration of the external display was wrong. I have fixed
that by putting this code for computing these parts of the configuration
in a common place that both the window manager and external display
code can use.
Change-Id: Ic6a84b955e9ec345a87f725203a29e4712dac0ad
2012-09-30 15:06:05 -07:00
rich cannings
a2064df6ab
Disable package verification in test harness
...
Bug: 7233608
Change-Id: I521980728f5fb68b42a3906ff4fd25cd59dbbd7a
2012-09-30 14:52:41 -07:00
Jeff Sharkey
32ee831eab
Handle ISE when physical volume isn't mounted.
...
Bug: 7238149
Change-Id: I85081225a1a43a2c1b6f70b6275c6bbca0b3764e
2012-09-30 13:35:33 -07:00
Craig Mautner
61d32c0d0f
am a6efc965: Merge "Changing debug for b/7094175." into jb-mr1-dev
...
* commit 'a6efc965cc6f42ab88c08e48463ea4604d29cc77':
Changing debug for b/7094175.
2012-09-30 11:47:17 -07:00
Craig Mautner
a6efc965cc
Merge "Changing debug for b/7094175." into jb-mr1-dev
2012-09-30 11:45:32 -07:00
Svetoslav Ganov
82e21b33bd
am 9ea8f390: Explore by touch enabled when screen magnification is on.
...
* commit '9ea8f390dbe8123415b9d64ce1a31683012958d9':
Explore by touch enabled when screen magnification is on.
2012-09-29 23:54:17 -07:00
Craig Mautner
c36c49ee83
Changing debug for b/7094175.
...
Fixes bug 7094175 (but not really).
Change-Id: Ice2abb93f479ea0bda931e9643710668c25aa285
2012-09-29 16:02:43 -07:00
Svetoslav Ganov
9ea8f390db
Explore by touch enabled when screen magnification is on.
...
1. A recently added check was preventing touch exploration being
disabled when the last touch exploring service was turned off.
As a consequence enabling explore by touch was initializing the
input filter with the magnification and the not disabled
screen magnification features.
bug:7256223
Change-Id: I9ed5457705d625805462e4d316b2c8a5af9aabca
2012-09-29 10:46:16 -07:00
Jeff Brown
489c1e9f82
am 7f813202: Merge "Get rid of preventScreenOn()." into jb-mr1-dev
...
* commit '7f813202cb08a829b59e17be749ffee4a2f482b8':
Get rid of preventScreenOn().
2012-09-28 19:08:17 -07:00
Jeff Brown
7f813202cb
Merge "Get rid of preventScreenOn()." into jb-mr1-dev
2012-09-28 19:05:52 -07:00
Jeff Brown
120664816a
Get rid of preventScreenOn().
...
Bug: 7165399
Change-Id: I1968265ecd74fff4d85efd2ca03b1983425ea518
2012-09-28 18:21:36 -07:00
Dianne Hackborn
66e9275226
am 84215565: Merge "Fix issue #7255954 : API Review: rename Dream to DreamService" into jb-mr1-dev
...
* commit '84215565dd5dda84db7fd35b8ae4ccb571465cd2':
Fix issue #7255954 : API Review: rename Dream to DreamService
2012-09-28 18:20:02 -07:00
Dianne Hackborn
84215565dd
Merge "Fix issue #7255954 : API Review: rename Dream to DreamService" into jb-mr1-dev
2012-09-28 18:17:13 -07:00
Dianne Hackborn
be87e2f588
Fix issue #7255954 : API Review: rename Dream to DreamService
...
Change-Id: I89ecf2c3ec4fef09c0495aa68de11576f9cfd872
2012-09-28 17:42:39 -07:00
Svetoslav Ganov
45cde607d5
am c5211780: Merge "Sending interaction end event at the end of a drag." into jb-mr1-dev
...
* commit 'c5211780ce60cd77d31b4df0f708bb760daddd5d':
Sending interaction end event at the end of a drag.
2012-09-28 17:41:04 -07:00
Svetoslav Ganov
c5211780ce
Merge "Sending interaction end event at the end of a drag." into jb-mr1-dev
2012-09-28 17:38:33 -07:00
Dianne Hackborn
752cb20245
am 3ff8e1a8: Merge "Fix issue #7211769 and #7244492 , thrash around on #7226656." into jb-mr1-dev
...
* commit '3ff8e1a80058e5557d13693d3223e1aa011c0038':
Fix issue #7211769 and #7244492 , thrash around on #7226656 .
2012-09-28 17:09:37 -07:00
Svetoslav Ganov
46824214bb
Sending interaction end event at the end of a drag.
...
1. In explore-by-touch when the user slides two fingers in the same
direction we consider it a drag gesture. We merge the pointers into
one and deliver a touch event. When one of the pointers goes up
we were transitioning into touch exploring state. This means that
were transitioning to another state in the middle of a gesture which
creates complications and leads for interaction end event not being
sent.
This change transitions out of dragging state when all pointers go up
- simple and all events are properly sent. Consequentially, staring a
drag the user has to lift all pointers to touch explore. Since usually
users either drags or touch explores this seems the simplest and
*least risky* fix.
bug:7253731
Change-Id: Ie8588fbe9b26cb81312bd7fd377c94732e41e3f8
2012-09-28 17:04:14 -07:00
Robert Greenwalt
a6c9a612af
resolved conflicts for merge of 925a659d to jb-mr1-aah-dev
...
Change-Id: I520c5df139c88cc0fecaeffdc9e2b5eb8dd352aa
2012-09-28 17:00:00 -07:00
Dianne Hackborn
3ff8e1a800
Merge "Fix issue #7211769 and #7244492 , thrash around on #7226656." into jb-mr1-dev
2012-09-28 15:54:44 -07:00
Robert Greenwalt
925a659d82
Merge "Use updatable file for premium-sms filter" into jb-mr1-dev
2012-09-28 15:47:20 -07:00
Dianne Hackborn
d4ac8d7b3d
Fix issue #7211769 and #7244492 , thrash around on #7226656 .
...
Issue #7211769 : Crash dialog from background user has non-working "report"
The report button now launches the issue reporter for the correct user.
Also for crashes on background users, either disable the report button,
or simply don't show the dialog depending on the build config.
Issue #7244492 : Bugreport button in Quick Settings doesn't actually do anything
Now they do.
Issue #7226656 : second user seeing primary user's apps
I haven't had any success at reproducing this. I have tried to tighten up
the path where we create the user to ensure nothing could cause the
user's applications to be accessed before the user it fully created and thus
make them installed... but I can't convince myself that is the actual problem.
Also tightened up the user switch code to use forground broadcasts for all
of the updates about the switch (since this is really a foreground operation),
added a facility to have BOOT_COMPELTED broadcasts not get launched for
secondary users and use that on a few key system receivers, fixed some debug
output.
Change-Id: Iadf8f8e4878a86def2e495e9d0dc40c4fb347021
2012-09-28 15:37:22 -07:00
Andy McFadden
b22bf34e91
am 94ffe873: Merge "Pass display arg to blank/unblank" into jb-mr1-dev
...
* commit '94ffe8739e2b0a9a7d2f0daa0bb90652fbdfd33b':
Pass display arg to blank/unblank
2012-09-28 13:08:49 -07:00