Mike Cleron
0fd713ca12
Merge "Exception in the touch explorer when dragging." into jb-mr1-dev
2012-10-03 17:07:05 -07:00
Svetoslav Ganov
ec33d56300
Exception in the touch explorer when dragging.
...
1. During a drag in touch exploration we have two pointers moving in the same
direction but inject only one of them. If the dragging pointer goes up we
send an up to the view system and wait for all pointers to go up to transition
to touch exploring state. At this point the dragging pointer id is cleared
and if a new pointer goes down we are trying to send up (rather do nothing)
for the dragging pointer which we already did and due to the invalid pointer
id we get an exception when splitting the motion event.
bug:7282053
Change-Id: I690bf8bdf6e2e5851ee46a322c4a1bb7d484b53a
2012-10-03 17:05:57 -07:00
Jeff Brown
1de7438d17
am 564538c6: am 6ae69899: am 8abd7021: Merge "Ensure dreams can be started when not powered." into jb-mr1-dev
...
* commit '564538c6cdc77ef20081e09bd181aaf05033872e':
Ensure dreams can be started when not powered.
2012-10-03 15:33:33 -07:00
Jeff Brown
564538c6cd
am 6ae69899: am 8abd7021: Merge "Ensure dreams can be started when not powered." into jb-mr1-dev
...
* commit '6ae69899becea7e0c21ab24e802df92de695b44e':
Ensure dreams can be started when not powered.
2012-10-03 15:30:30 -07:00
Jeff Brown
6ae69899be
am 8abd7021: Merge "Ensure dreams can be started when not powered." into jb-mr1-dev
...
* commit '8abd7021a681dd9db355ad7b17e0249200d6cc17':
Ensure dreams can be started when not powered.
2012-10-03 15:27:55 -07:00
Jeff Brown
8abd7021a6
Merge "Ensure dreams can be started when not powered." into jb-mr1-dev
2012-10-03 15:24:45 -07:00
rich cannings
e4c8452664
am 6c6b124d: am 723c5b85: am 70bf7d2f: Merge "Fix PackageInstaller displays with multi-user" into jb-mr1-dev
...
* commit '6c6b124d43327718040ac692cea10a18d172bfd1':
Fix PackageInstaller displays with multi-user
2012-10-03 15:24:01 -07:00
rich cannings
6c6b124d43
am 723c5b85: am 70bf7d2f: Merge "Fix PackageInstaller displays with multi-user" into jb-mr1-dev
...
* commit '723c5b8587a7b9d9287b2c8a8168eaaf128b8837':
Fix PackageInstaller displays with multi-user
2012-10-03 15:21:36 -07:00
rich cannings
723c5b8587
am 70bf7d2f: Merge "Fix PackageInstaller displays with multi-user" into jb-mr1-dev
...
* commit '70bf7d2f641401abb745bcc0aee242ff6030d72b':
Fix PackageInstaller displays with multi-user
2012-10-03 15:19:09 -07:00
Jeff Brown
645832dd2b
Ensure dreams can be started when not powered.
...
Previously dreams could not be started unless plugged in.
Now we allow them to start but they will eventually stop
if a user activity timeout occurs and no screen wakelocks
are held.
Bug: 7253639
Change-Id: I84703e144ca6d4aba1ef9437f04a201c3dde8a49
2012-10-03 14:57:03 -07:00
rich cannings
cdf932e050
Fix PackageInstaller displays with multi-user
...
With this fix, when all users cancel installing an app they were warned about,
then the "Installing..." screen disappears, as desired.
Bug: 7255231
Change-Id: I2475fa790a5d09abbf94411c696682502fb1e8df
2012-10-03 14:32:38 -07:00
Victoria Lease
f45567ba3b
am 4d6c0fa0: am cfebfb68: am fc6770e7: Merge "Remove checkPermission() call in getAllProviders()." into jb-mr1-dev
...
* commit '4d6c0fa06af7bcf9592b3351592e9f9ac87110e6':
Remove checkPermission() call in getAllProviders().
2012-10-03 08:52:03 -07:00
Victoria Lease
4d6c0fa06a
am cfebfb68: am fc6770e7: Merge "Remove checkPermission() call in getAllProviders()." into jb-mr1-dev
...
* commit 'cfebfb6802c24b4b1166b95bd07b5865f847f9f1':
Remove checkPermission() call in getAllProviders().
2012-10-03 08:49:52 -07:00
Victoria Lease
cfebfb6802
am fc6770e7: Merge "Remove checkPermission() call in getAllProviders()." into jb-mr1-dev
...
* commit 'fc6770e748bb69f80b7b68942a273335b165000a':
Remove checkPermission() call in getAllProviders().
2012-10-03 08:46:15 -07:00
Victoria Lease
fc6770e748
Merge "Remove checkPermission() call in getAllProviders()." into jb-mr1-dev
2012-10-03 08:43:43 -07:00
Jeff Brown
3ef7315c95
am d79d97ff: am 47029c2d: am 3f0a57dc: Merge changes Iccea764b,I624b559e into jb-mr1-dev
...
* commit 'd79d97ff1d3023ecd635c57c7a1110cee6b1951b':
Improve the screen dim duration calculation.
Implement screen on hack for wireless chargers.
2012-10-02 23:36:47 -07:00
Jeff Brown
d79d97ff1d
am 47029c2d: am 3f0a57dc: Merge changes Iccea764b,I624b559e into jb-mr1-dev
...
* commit '47029c2ddbb4b075dea55c28388e6a9f41533257':
Improve the screen dim duration calculation.
Implement screen on hack for wireless chargers.
2012-10-02 23:33:48 -07:00
Jeff Brown
c31882b038
am 2e9b86fa: am f1d95f59: am 5558b79e: Merge "Fix some synchronization issues in BatteryService." into jb-mr1-dev
...
* commit '2e9b86fa7352232a90c1efa3fb5d4a048fb7c376':
Fix some synchronization issues in BatteryService.
2012-10-02 23:33:43 -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
47029c2ddb
am 3f0a57dc: Merge changes Iccea764b,I624b559e into jb-mr1-dev
...
* commit '3f0a57dcd9a060bb3b2b35da4d2ac6cb42733fef':
Improve the screen dim duration calculation.
Implement screen on hack for wireless chargers.
2012-10-02 23:31:41 -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
3f0a57dcd9
Merge changes Iccea764b,I624b559e into jb-mr1-dev
...
* changes:
Improve the screen dim duration calculation.
Implement screen on hack for wireless chargers.
2012-10-02 23:29:47 -07:00
Jeff Brown
5558b79e7a
Merge "Fix some synchronization issues in BatteryService." into jb-mr1-dev
2012-10-02 23:28:02 -07:00
Jeff Brown
ff532540f1
Improve the screen dim duration calculation.
...
Take into account whether the screen off timeout is very short.
If so, we use a shorter dim timeout. Don't allow the dim
time to be more than 20% of the total screen on time so that
the screen remains bright at least 80% of the time even when
the timeout is short.
Bug: 7273646
Change-Id: Iccea764b90f0d8b1df7009d26160c6bcf6eabe5b
2012-10-02 21:18:04 -07:00
Jeff Brown
f3fb895269
Implement screen on hack for wireless chargers.
...
We can't accurately detect whether the device is resting
on a wireless charger unless it is actually charging.
So we need to tweak the screen on when plugged / unplugged
policy accordingly to avoid spurious wakeups.
Bug: 7234284
Change-Id: I624b559e2e92b8813b12090bc20eca5f5158997e
2012-10-02 20:57:05 -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
Dianne Hackborn
369a7f493e
am 25772a57: am 99e3c488: am 75b694f1: Merge "Fix issue #7274813 : A few sticky broadcasts aren\'t being sent to all users" into jb-mr1-dev
...
* commit '25772a57d1a6609008443e82f409479f17303778':
Fix issue #7274813 : A few sticky broadcasts aren't being sent to all users
2012-10-02 19:27:24 -07:00
Dianne Hackborn
25772a57d1
am 99e3c488: am 75b694f1: Merge "Fix issue #7274813 : A few sticky broadcasts aren\'t being sent to all users" into jb-mr1-dev
...
* commit '99e3c4887e1775fa991653dc5018f26375116cbd':
Fix issue #7274813 : A few sticky broadcasts aren't being sent to all users
2012-10-02 19:25:00 -07:00
Dianne Hackborn
99e3c4887e
am 75b694f1: Merge "Fix issue #7274813 : A few sticky broadcasts aren\'t being sent to all users" into jb-mr1-dev
...
* commit '75b694f1d6038edee8b071df1e339b81d7960e97':
Fix issue #7274813 : A few sticky broadcasts aren't being sent to all users
2012-10-02 19:22:21 -07:00
Craig Mautner
222c91696a
am d23b3e57: am e60f8ce1: am 3e2358a0: Merge "Delay setting hidden until after isVisibleNow test." into jb-mr1-dev
...
* commit 'd23b3e579d0e8aceeed5e35c551641e083fc923a':
Delay setting hidden until after isVisibleNow test.
2012-10-02 19:21:07 -07:00
Dianne Hackborn
75b694f1d6
Merge "Fix issue #7274813 : A few sticky broadcasts aren't being sent to all users" into jb-mr1-dev
2012-10-02 19:19:41 -07:00
Craig Mautner
d23b3e579d
am e60f8ce1: am 3e2358a0: Merge "Delay setting hidden until after isVisibleNow test." into jb-mr1-dev
...
* commit 'e60f8ce1c9c3db51ba0997210b2cd073da68ae81':
Delay setting hidden until after isVisibleNow test.
2012-10-02 19:18:46 -07:00
Craig Mautner
e60f8ce1c9
am 3e2358a0: Merge "Delay setting hidden until after isVisibleNow test." into jb-mr1-dev
...
* commit '3e2358a0e677ad1c88d677919aa9b8d7b2fb4eb2':
Delay setting hidden until after isVisibleNow test.
2012-10-02 19:16:56 -07:00
Craig Mautner
3e2358a0e6
Merge "Delay setting hidden until after isVisibleNow test." into jb-mr1-dev
2012-10-02 19:14: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
Jeff Sharkey
929ff8ece1
am 4bf59f7d: am fbbcffeb: am 1ed299f8: Merge "Make USB services multi-user aware." into jb-mr1-dev
...
* commit '4bf59f7dd9fbfe608853de7c639d719d25c07318':
Make USB services multi-user aware.
2012-10-02 18:19:41 -07:00
Jeff Sharkey
4bf59f7dd9
am fbbcffeb: am 1ed299f8: Merge "Make USB services multi-user aware." into jb-mr1-dev
...
* commit 'fbbcffebc0caf1d19c60b41e1e40708963717850':
Make USB services multi-user aware.
2012-10-02 18:18:33 -07:00
Jeff Sharkey
fbbcffebc0
am 1ed299f8: Merge "Make USB services multi-user aware." into jb-mr1-dev
...
* commit '1ed299f822b22998b7236e3147d8cf4707bced08':
Make USB services multi-user aware.
2012-10-02 18:15:51 -07:00
Jeff Sharkey
1ed299f822
Merge "Make USB services multi-user aware." into jb-mr1-dev
2012-10-02 18:11:48 -07:00
Craig Mautner
4b5aa78c89
Delay setting hidden until after isVisibleNow test.
...
Setting hidden prior to test guarantees the test will fail. This
then causes the exit animation to not be loaded and consequently
the window is immediately hidden. Then, when the window is removed
later it reappears in order to animate away. The consequent flash
is undesirable.
Bug: 7242373 fixed.
Change-Id: I56966bd9060124be372702090f86b29b4deea8c0
2012-10-02 18:11:25 -07:00
Jeff Sharkey
fc3f24b4b6
Make USB services multi-user aware.
...
USB settings are now isolated per-user, since they revolve around
installed packages. User-specific settings are returned based on
calling user, or referenced by UserHandle passed to SystemUI. Each
settings Context is wrapped as a specific user, so all broadcasts are
sent correctly. Upgrades any existing USB settings to OWNER.
Physical events, like new devices, are routed to the currently active
user. Switch to using AtomicFile when persisting settings.
Bug: 7244888
Change-Id: I8a723ad3d55ac1bff99276c5f3a3f5e8f013432f
2012-10-02 18:09:10 -07:00
Jeff Brown
fdf2451371
am 87e81fbc: am 18be68f7: am 031e9d2e: Merge changes I0ed9ba00,Ia8c6d7fe into jb-mr1-dev
...
* commit '87e81fbca386ee9ec1fb6b51945cb94314fc2c24':
Fix bug removing all windows that belong to a display.
Add some missing debug output.
2012-10-02 17:16:44 -07:00
Jeff Brown
87e81fbca3
am 18be68f7: am 031e9d2e: Merge changes I0ed9ba00,Ia8c6d7fe into jb-mr1-dev
...
* commit '18be68f707ddc9699719d105089a78efcf379d4c':
Fix bug removing all windows that belong to a display.
Add some missing debug output.
2012-10-02 17:14:12 -07:00
Jeff Brown
18be68f707
am 031e9d2e: Merge changes I0ed9ba00,Ia8c6d7fe into jb-mr1-dev
...
* commit '031e9d2e21797fd668404be407dcc625f3b149c1':
Fix bug removing all windows that belong to a display.
Add some missing debug output.
2012-10-02 17:12:09 -07:00
Jeff Brown
031e9d2e21
Merge changes I0ed9ba00,Ia8c6d7fe into jb-mr1-dev
...
* changes:
Fix bug removing all windows that belong to a display.
Add some missing debug output.
2012-10-02 17:08:07 -07:00
Jeff Brown
a3164eaad4
am eaf36658: am 709b9434: am bcbe9cf4: Merge "Add new Display API for secure video capabilities." into jb-mr1-dev
...
* commit 'eaf366586179554b624aff6e586f1a7b17b8dd4d':
Add new Display API for secure video capabilities.
2012-10-02 16:45:58 -07:00
Svetoslav Ganov
6c0b04b037
am a790a83c: am c458f323: am 9bfb8bcf: Merge "Up motion event not injected by the touch explorer at the end of a drag." into jb-mr1-dev
...
* commit 'a790a83c134c91a828a32059b429142bff1b1de5':
Up motion event not injected by the touch explorer at the end of a drag.
2012-10-02 16:44:03 -07:00
Jeff Brown
eaf3665861
am 709b9434: am bcbe9cf4: Merge "Add new Display API for secure video capabilities." into jb-mr1-dev
...
* commit '709b943475e3395b580451911557f894480e3133':
Add new Display API for secure video capabilities.
2012-10-02 16:44:02 -07:00
Svetoslav Ganov
a790a83c13
am c458f323: am 9bfb8bcf: Merge "Up motion event not injected by the touch explorer at the end of a drag." into jb-mr1-dev
...
* commit 'c458f3235cfceb87093d3e5408b38ff982e3e060':
Up motion event not injected by the touch explorer at the end of a drag.
2012-10-02 16:41:58 -07:00
Jeff Brown
709b943475
am bcbe9cf4: Merge "Add new Display API for secure video capabilities." into jb-mr1-dev
...
* commit 'bcbe9cf475835102ae2490dc9f067a3ac78a9551':
Add new Display API for secure video capabilities.
2012-10-02 16:41:30 -07:00