7551 Commits

Author SHA1 Message Date
Svetoslav Ganov
fda63b2655 am 9dbe4143: am 52763734: Merge "Dragging in touch explore mode should not become exploring." into ics-mr0
* commit '9dbe41432c1a580b33f8820a2712e0a4d1c9fad4':
  Dragging in touch explore mode should not become exploring.
2011-10-12 19:38:27 -07:00
Jeff Sharkey
a2c6f16047 am 69f364ae: Merge "Update internal state when iface is removed."
* commit '69f364ae879cfde8716de07cc3358a4bc515a05b':
  Update internal state when iface is removed.
2011-10-12 12:37:23 -07:00
Svetoslav Ganov
9dbe41432c am 52763734: Merge "Dragging in touch explore mode should not become exploring." into ics-mr0
* commit '5276373430af24448324941af6b911d90a3ddd10':
  Dragging in touch explore mode should not become exploring.
2011-10-11 18:41:05 -07:00
Svetoslav Ganov
2e1c66bd53 Dragging in touch explore mode should not become exploring.
In touch exploration two fingers in the same direction drag and if one of them
goes up the other starts to touch explore. This however causes inadvertent touch
exploring to happen on almost every scroll causing confusion. Now two finger
drag and they should both go up to allow exploring. This way the inadvertent
exploring is gone and user experience is much better.

bug:5440411

Change-Id: Id8aaece92e5dea1fc740400d2adc9dd63a1674e4
2011-10-11 18:22:16 -07:00
Jeff Sharkey
69f364ae87 Merge "Update internal state when iface is removed." 2011-10-11 14:54:08 -07:00
Jeff Sharkey
89b8a2161a Update internal state when iface is removed.
Bug: 5433432
Change-Id: I7eb0ffe3ae07f42d5c47fe4082f490478c5099bf
2011-10-11 11:58:11 -07:00
Mathias Agopian
7031b8e67e am 5c3bea70: Merge "fix an issue where the screen could stay off"
* commit '5c3bea702276bed21234715b497d683ef1b1f012':
  fix an issue where the screen could stay off
2011-10-10 22:24:06 -07:00
Mathias Agopian
5c3bea7022 Merge "fix an issue where the screen could stay off" 2011-10-10 22:21:57 -07:00
Mathias Agopian
919139247c fix an issue where the screen could stay off
this would happen when toggling on/off/on very fast, the screen
could stay black (while the panel is on).

Bug: 5429724
Change-Id: Ic8aa6aff066e6267923c0d47ef65e314e7bb6d41
2011-10-10 22:18:55 -07:00
Dianne Hackborn
0e00b30822 am 9f4021d8: Merge "Keep screen brightness at 0 while waiting for the UI to be displayed."
* commit '9f4021d86a92355539844623b782331006926a4e':
  Keep screen brightness at 0 while waiting for the UI to be displayed.
2011-10-10 19:19:15 -07:00
Dianne Hackborn
9f4021d86a Merge "Keep screen brightness at 0 while waiting for the UI to be displayed." 2011-10-10 19:16:52 -07:00
Mathias Agopian
4a0970fc0a am 9c518d1f: Merge "Fix screen off animation when in landscape"
* commit '9c518d1f16850ba1036bab5d731cad9dacd1b6fa':
  Fix screen off animation when in landscape
2011-10-10 19:06:47 -07:00
Mathias Agopian
9c518d1f16 Merge "Fix screen off animation when in landscape" 2011-10-10 19:05:23 -07:00
Mathias Agopian
b946a56b69 Fix screen off animation when in landscape
Change-Id: I4bc5b12d7a64a4bf8b9a851594be4d60b790d1ed
2011-10-10 19:02:07 -07:00
Dianne Hackborn
474fd74b88 Keep screen brightness at 0 while waiting for the UI to be displayed.
Change-Id: I957135c5423db6d83f4f30232481a1b6d77165fa
2011-10-10 18:40:22 -07:00
Jeff Sharkey
78d8308677 am 338140f7: Merge "Over-limit within handful of MTU\'s, update assets."
* commit '338140f7340a5471b5c5e8152405bc810fe56769':
  Over-limit within handful of MTU's, update assets.
2011-10-10 17:49:04 -07:00
Jeff Sharkey
338140f734 Merge "Over-limit within handful of MTU's, update assets." 2011-10-10 17:47:46 -07:00
Christopher Tate
a16ee2642d am b765e45f: Merge "Gracefully handle "needs init" transport errors at finish"
* commit 'b765e45f007a97c5b624f27a9368164ad03a4fee':
  Gracefully handle "needs init" transport errors at finish
2011-10-10 17:28:52 -07:00
Christopher Tate
b765e45f00 Merge "Gracefully handle "needs init" transport errors at finish" 2011-10-10 17:27:05 -07:00
Jeff Sharkey
50e7e51d68 Over-limit within handful of MTU's, update assets.
Consider a network over-limit when it's measured usage is within a
handful of MTU's, since kernel completely drops packets that trigger
limit alert.

Update notification drawables.

Bug: 5433359, 5224629
Change-Id: I10b19cc34c34b47775904229829a25208cd85d25
2011-10-10 16:57:21 -07:00
Christopher Tate
e659fb9275 Gracefully handle "needs init" transport errors at finish
Although it's typical for a backup transport to report that it
needs an explicit initialization opportunity when the backup is
initiated, it can sometimes come to pass that the "needs init"
error condition is reported at backup *finish*.  In this case the
framework side was failing to properly reset all of the relevant
state.  The end result was to spin hard forever, holding wakelocks
and continually failing to actually perform the necessary init
operation, possibly continuing even after a reboot.  Fixed.

Bug 5434579

Change-Id: If1d72c338526e4019ea524c48a11e71e44e77f71
2011-10-10 16:34:50 -07:00
Dianne Hackborn
091ff486ab am 94e8471a: Merge "Fix issue #5405788: Device continuously opening and closing..."
* commit '94e8471a956d46f4fae3da2b1e79862e07209efa':
  Fix issue #5405788: Device continuously opening and closing...
2011-10-10 16:10:02 -07:00
Dianne Hackborn
58f42a59bd Fix issue #5405788: Device continuously opening and closing...
...the "Complete action using" dialog

When an application goes idle, it sends back to the activity manager
the configuration it last used, to make sure the two don't get out
of sync.  Fix a bunch of edge cases here in dealing with that, and
be sure to also send the current configuration when launching an
activity so the client is always up-to-date when launching.

Also a small fix to not show the upgrading dialog during first boot.

Change-Id: I14ed366a87cd689d1c78787369e052422290ac6f
2011-10-10 14:53:08 -07:00
Mathias Agopian
c6af3967bd am 5872a775: Merge "enable EGL_IMG_context_priority for the omap4 platform"
* commit '5872a7758b15f98fcd37e7f1cd357328932f7bf5':
  enable EGL_IMG_context_priority for the omap4 platform
2011-10-10 12:40:12 -07:00
Mathias Agopian
5872a7758b Merge "enable EGL_IMG_context_priority for the omap4 platform" 2011-10-10 12:38:16 -07:00
satok
413d00c2d7 am af8139ee: Merge "Fix the behavior for choosing new default IME not to choose an auxiliary IME as the default IME"
* commit 'af8139ee9b97c031e5b45ac9f1175ef4794c39ee':
  Fix the behavior for choosing new default IME not to choose an auxiliary IME as the default IME
2011-10-10 01:16:17 -07:00
satok
af8139ee9b Merge "Fix the behavior for choosing new default IME not to choose an auxiliary IME as the default IME" 2011-10-10 00:59:41 -07:00
satok
dc9ddaee9a Fix the behavior for choosing new default IME not to choose an auxiliary IME as the default IME
Bug: 5420127

Change-Id: I3649de36806fc24e1c85c2b15db5e37acad1f120
2011-10-10 15:49:22 +09:00
Jeff Sharkey
1825da11a9 am d78a38ca: Merge "Move battery stats to xt_qtaguid for data stats."
* commit 'd78a38cae2f041629326d475333f43fd81ae4137':
  Move battery stats to xt_qtaguid for data stats.
2011-10-09 17:10:15 -07:00
Jeff Sharkey
1059c3c30a Move battery stats to xt_qtaguid for data stats.
Replace TrafficStats calls by reading values from xt_qtaguid kernel
module. To keep BatteryStatsImpl changes lightweight, cache recently
parsed stats. Tracks mobile ifaces from ConnectivityService.

Refactor xt_qtaguid parsing into factory outside of NMS. Add stats
grouping based on UID, and total based on limiting filters like iface
prefix and UID.

Bug: 4902271
Change-Id: I533f116c434b77f93355bf95b839e7478528505b
2011-10-09 13:49:08 -07:00
James Dong
8d7956d368 am 650c53aa: Merge "SurfaceFlinger: screenshots w/ protected buffers"
* commit '650c53aad5a49c793bbcddad9bfce63a3b3d0360':
  SurfaceFlinger: screenshots w/ protected buffers
2011-10-09 09:18:47 -07:00
Jamie Gennis
830d083bf7 SurfaceFlinger: screenshots w/ protected buffers
This change modifies SurfaceFlinger's screenshot behavior when a layer
with a protected buffer is visible.  The previous behavior was to simply
fail the screenshot.  The new behavior is to render the screenshot using
a placeholder texture where the protected buffer would have been.

Change-Id: I5e50cb2f3b31b2ea81cfe291c9b4a42e9ee71874
2011-10-07 17:53:37 -07:00
Mathias Agopian
184df101c0 enable EGL_IMG_context_priority for the omap4 platform
Bug: 5311015
Change-Id: Icaad3d1c963d382ac0a4b9121fe20d3408846c2b
2011-10-07 15:42:53 -07:00
Dianne Hackborn
be870e81e8 am ba8ecd20: Merge "Fix how we hide and show the nav bar."
* commit 'ba8ecd206cc6f175767f952d380c88f70ece04cf':
  Fix how we hide and show the nav bar.
2011-10-07 15:14:55 -07:00
Dianne Hackborn
ba8ecd206c Merge "Fix how we hide and show the nav bar." 2011-10-07 15:12:17 -07:00
Dianne Hackborn
df89e65bf0 Fix how we hide and show the nav bar.
The PhoneWindowManager is now responsible for hiding and showing
the nav bar.

For hiding, it just moves it off the screen (easy way to get a
nice slide animation on and off).  At the same time, we use a
new WM facility to put up a fake input window to capture all
touch events.

When a touch event is received, we force the system UI to clear
the navigation hiding bit so it will be shown again.

This removes a bunch of code from the system UI for hiding and
showing the nav bar.  Also removes the code calling from userActivity()
to the system UI, which was bad.  (Also no longer using userActivity()
fixes bugs around re-showing the nav bar due to key presses and
other wrong things.)

Change-Id: I8c3174873b5bcaa36a92322a51e8f7993e88e551
2011-10-07 14:32:01 -07:00
Christopher Tate
b317fde4a1 am e47b89ca: Merge "Fix wallpaper restore"
* commit 'e47b89cabe38bb0a711c3b2a87be9696c7a1f074':
  Fix wallpaper restore
2011-10-07 13:38:37 -07:00
Christopher Tate
e47b89cabe Merge "Fix wallpaper restore" 2011-10-07 13:36:09 -07:00
Christopher Tate
bf6ee4f509 Fix wallpaper restore
Following a restore of the wallpaper data files, the settingsRestored()
method was binding the new wallpaper by passing null as the component,
because once upon a time that meant just use the configuration that had
just been loaded from the [newly restored] settings filed.  However, at
some point this broke when the load from settings was made a staging
operation, not also the commitment of the changes.

This CL passes the newly-determined component configuration explicitly
to the bind, overriding the product default that may already have been
emplaced by the time the restore happens.

It also turns off the (minor) debugging that had been enabled in
WallpaperBackupHelper while digging into the issue.

Bug 5416839

Change-Id: I963893c236e24c75d10dde75836805295ea42cbb
2011-10-07 12:37:42 -07:00
Iliyan Malchev
cd041d53e0 am 851a14eb: Merge "Add initialize method to CameraHardwareInterface"
* commit '851a14eb9443996f29617e84dd8b66281876ae8e':
  Add initialize method to CameraHardwareInterface
2011-10-07 09:58:26 -07:00
Tyler Luu
7b6da3c7a2 Add initialize method to CameraHardwareInterface
Add intialize() method to CameraHardwareInterface so we can
return a proper error value to CameraService if open of camera
hardware module fails.

b/5405235

Change-Id: I09c627034ddd22a5753c5163392c4fcff301e0b9
Signed-off-by: Tyler Luu <tluu@ti.com>
Signed-off-by: Iliyan Malchev <malchev@google.com>
2011-10-07 09:24:05 -07:00
Chih-Chung Chang
de21b164b2 am 17f25410: Merge "Allow shutter/recording sound to be adjusted unless it\'s forced."
* commit '17f254105b399c7a4216da2d477e7f9cbdbd7319':
  Allow shutter/recording sound to be adjusted unless it's forced.
2011-10-07 05:46:43 -07:00
Wu-cheng Li
2574798cf1 am 3c02c12c: Merge "Allow Camera.setDisplayOrientation to be called when preview is active."
* commit '3c02c12c73fa8719e49a5da6534750196efe3eba':
  Allow Camera.setDisplayOrientation to be called when preview is active.
2011-10-07 05:46:42 -07:00
Chih-Chung Chang
17f254105b Merge "Allow shutter/recording sound to be adjusted unless it's forced." 2011-10-07 03:20:26 -07:00
Wu-cheng Li
3c02c12c73 Merge "Allow Camera.setDisplayOrientation to be called when preview is active." 2011-10-07 03:08:23 -07:00
Wu-cheng Li
d303362ac2 Allow Camera.setDisplayOrientation to be called when preview is active.
bug:5422679

Change-Id: I4c936ab00428fc158b5947fe8f10b1028869bbdb
2011-10-07 18:01:09 +08:00
Chih-Chung Chang
9143aaafee Allow shutter/recording sound to be adjusted unless it's forced.
Change-Id: I7080d5f50a87f92c8e9395d4cf8f927a6760fa70
2011-10-07 13:39:18 +08:00
Svetoslav Ganov
e99b6895ba am 31743d8c: Merge "Accessibility test automation API not working."
* commit '31743d8cbbd0d54bfe8d2a43154a2b9615c8f282':
  Accessibility test automation API not working.
2011-10-06 17:30:52 -07:00
Svetoslav Ganov
31743d8cbb Merge "Accessibility test automation API not working." 2011-10-06 17:28:51 -07:00
Chia-chi Yeh
0158b427e7 am b7493155: Merge "VPN: temporarily disable the default proxy when VPN is active."
* commit 'b74931559b9e95b22ea632c243acda19fe8ea82c':
  VPN: temporarily disable the default proxy when VPN is active.
2011-10-06 15:32:27 -07:00