Commit Graph

55864 Commits

Author SHA1 Message Date
Mike Lockwood
e2e7b1e2dc Merge "Add support for localizing order of day of week and date in status bar date view" 2011-08-03 18:35:23 -07:00
Jaikumar Ganesh
8c90038503 Merge "Fix PAN bug for reverse tethering." 2011-08-03 18:15:11 -07:00
Mathias Agopian
452f035c31 Merge changes I689cb0c0,I09603218
* changes:
  Add a 'release' method to the SurfaceTexture public Java API
  Mark Window-Manager-specific APIs on android.view.Surface as @hide
2011-08-03 18:12:36 -07:00
Jean-Baptiste Queru
a164690a34 am a598d144: am 3a5e36f9: (-s ours) am 98c531dc: am 9b0c6bee: Merge "Fix a compiling error when trying to use setBufferCount"
* commit 'a598d144e8c9722ff83e38cd8a70bc15a00bcdf3':
  Fix a compiling error when trying to use setBufferCount
2011-08-03 17:42:20 -07:00
Christopher Tate
ab104b2c03 Merge "Make backup/restore confirmation UI landscape-friendly" 2011-08-03 17:37:56 -07:00
Christopher Tate
31deacf6f5 Make backup/restore confirmation UI landscape-friendly
Now the textual content and password fields are placed in scroll view,
and the confirm/deny buttons pinned at the bottom of the layout.
Previously, in landscape mode on some devices the buttons would be
pushed off screen.

Bug 5115411

Change-Id: I8bf8fd1516735bf6111893df79636b519dbfb803
2011-08-03 17:31:52 -07:00
Matthew Xie
cffb287b44 Merge "Add a timeout for disconnecting devices to recover from error situation" 2011-08-03 17:31:11 -07:00
Chris Craik
351c73a0f6 Merge "TileBenchmark label addition" 2011-08-03 17:29:03 -07:00
Mathias Agopian
ec46b4e1ca Add a 'release' method to the SurfaceTexture public Java API
Bug: 5063618
Change-Id: I689cb0c01c14e597ccfb4eb0972e64fa570bd4e8
2011-08-03 17:23:44 -07:00
Jaikumar Ganesh
b389bdfba2 Merge "Enforce permission for changeApplicationState function." 2011-08-03 17:20:52 -07:00
Romain Guy
e28cde6253 Merge "Added Device Default Themes." 2011-08-03 17:16:02 -07:00
Kenny Root
01704e76fa Merge "Better error codes for missing files" 2011-08-03 17:09:38 -07:00
Matthew Xie
9a943a6420 Add a timeout for disconnecting devices to recover from error situation
Start the timer (3 second) just after calling disconnect devices.
If the timer expires, it indicates an error condition. we don't wait
on the ALL_DEVICES_DISCONNECTED event upon the error. Instead, get out of
switching state and turn off BT to reset out of the error condition.

Change-Id: I27aa8cd7b6fe50d9191e2d32fc2d6eac50424403
2011-08-03 17:08:55 -07:00
Jeff Sharkey
a841e52401 Merge "Expose quota status for active network." 2011-08-03 17:05:21 -07:00
Andrew Sapperstein
d31d3887bb Added Device Default Themes.
Now we have device default themes that OEMs
can change without affecting the Holo theme
or its derivatives. Additionally, the device
default themes point to device default styles
that have stubs (while inheriting from their
holo analogs).

Change-Id: I91f4a828eca1ba4da1d5b073dd04a34e52534aa4
2011-08-03 17:02:01 -07:00
Adam Powell
1824a62bc1 Merge "Fix bug 5044737 - Compatibility menus should be as wide as the screen width" 2011-08-03 16:57:07 -07:00
Chris Craik
1d36d0fc7f TileBenchmark label addition
bug:5062896

Now uses previously unused methods, and has better labelling.

Change-Id: Icc6ec7d1ac915b594c26854aea31710e3f23633c
2011-08-03 16:54:23 -07:00
Adam Powell
dc5facd476 Fix bug 5044737 - Compatibility menus should be as wide as the screen
width

Change-Id: I96f4d6d41fe490845a1e7dd40c9f1a38f01781b7
2011-08-03 16:45:45 -07:00
Jaikumar Ganesh
2cbb33c362 Fix PAN bug for reverse tethering.
We were the setting the iface as null while disconnecting
and so when disconnected the iface used was null - which would
lead to a crash. During connecting we don't know the interface,
so we use null.

Change-Id: I970f2f1886fa32237936eff439c359187a798832
2011-08-03 16:42:55 -07:00
Romain Guy
8c8333c80e Merge "Destroy the EGL surface when the ViewRootImpl surface is invalid Bug #5109839" 2011-08-03 16:23:35 -07:00
Romain Guy
1d0c708961 Destroy the EGL surface when the ViewRootImpl surface is invalid
Bug #5109839

Change-Id: Icebde9abf43b852397a73ffef519004993b46901
2011-08-03 16:22:24 -07:00
Kenny Root
1ebd74acf9 Better error codes for missing files
Make sure that files that don't exist aren't returning bogus 'out of
space' error codes.

Add some Javadoc so I can remember what each thing does in an IDE.

Add copyright header to NativeLibraryHelper

Bug: 3375299
Change-Id: Iac46019160921daca65b21d38897e5165063316e
2011-08-03 16:03:42 -07:00
Philip Milne
271865565a Merge "Tidy." 2011-08-03 16:01:59 -07:00
Chia-chi Yeh
b375caa589 Merge "NativeDaemonConnector: offload callbacks to another thread." 2011-08-03 15:53:43 -07:00
Gloria Wang
6d899a61a8 Merge "Check the syncword for each frame. Fix for bug 5117233." 2011-08-03 15:37:24 -07:00
Philip Milne
4c8cf4c933 Tidy.
Simplify logic for alignment modes.
Simplify drawing of rectangles.
Remove redundant code that was generating warnings in IDEA.
Remove the flexibility variable from Spec as it always has the value UNDEFINED.
Supress remaining inspection warning for clean (green) inspection status.

Change-Id: I2ddd80c68e7a6db0877648c2fdecefe9dbe7d32f
2011-08-03 15:37:05 -07:00
Gloria Wang
3c10b01551 Check the syncword for each frame.
Fix for bug 5117233.

Change-Id: I714c9b671832c9606cabdfe6bb21697c08de2eff
2011-08-03 15:06:35 -07:00
Gilles Debunne
eba69ac070 Merge "A tap on the insertion handle is only handled if it has not been moved" 2011-08-03 15:01:50 -07:00
Jaikumar Ganesh
f5fb6c8ce3 Enforce permission for changeApplicationState function.
The ADMIN permission is for use cases where we want to manage BT connection
at a deeper level. So just the Bluetooth permission is good enough here.

Change-Id: Iddd038fe9f9a26f155b4edc9484ba1fe27b178ba
2011-08-03 15:00:07 -07:00
Mathias Agopian
b923066dee Mark Window-Manager-specific APIs on android.view.Surface as @hide
Bug: 5063337
Change-Id: I096032186acfc6b6a032636188e4d44907e46233
2011-08-03 14:44:48 -07:00
Chia-chi Yeh
e5750a344a NativeDaemonConnector: offload callbacks to another thread.
Now callbacks can communicate to the same daemon without causing a
deadlock. This also improves the latency of calls because they no
longer need to wait for the callbacks for the pending events.

Change-Id: I153fcf16bd64de79ee1c1a57d3cfdb12b354cf47
2011-08-03 14:42:11 -07:00
Dianne Hackborn
bac9cd68a0 Merge "Put back the status bar animations." 2011-08-03 14:01:55 -07:00
Gilles Debunne
c0e74ca822 Merge "Bug 5050963: Suggestion popup moves with its associated TextView" 2011-08-03 13:58:49 -07:00
Mike Lockwood
ec9a50bccf Add support for localizing order of day of week and date in status bar date view
In Japanese, the day of week should follow the date

Bug: 4606219

Change-Id: If385b3f9989bbe5f1b4bc21293d9be651e187c1f
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-08-03 15:29:02 -04:00
Adam Powell
5254d5edee Merge "Fix bug 5093394 - Double SearchView!! What does it mean!?" 2011-08-03 12:16:58 -07:00
Adam Powell
6b0e97c7c4 Fix bug 5093394 - Double SearchView!! What does it mean!?
It means we should collapse any expanded action items when we
clear out all items from a MenuBuilder.

Change-Id: I59cacd862a89b3a50c61b02c64b1ea71907af83f
2011-08-03 12:07:30 -07:00
Eric Laurent
045d179ff6 Merge "AudioService: ignore NOTIFICATIONS_USE_RING_VOLUME." 2011-08-03 11:51:55 -07:00
Eric Laurent
ea45a89b79 Merge "AudioFlinger: disable AEC and NS with BT headsets" 2011-08-03 11:51:35 -07:00
Eric Laurent
6639b559bb AudioFlinger: disable AEC and NS with BT headsets
Disable AEC and NS when the Bluetooth SCO headset in use indicates it
implements those pre processings.

Change-Id: I93f3d10b0a27243d5dbff7182639576fc0c6d862
2011-08-03 11:47:45 -07:00
Jaikumar Ganesh
adcea06113 Merge "Fix PAN bugs." 2011-08-03 11:16:18 -07:00
Romain Guy
590840ff54 Merge "Don't recreate the EGL surface if the surface is not ready Bug #5114545" 2011-08-03 11:16:01 -07:00
Romain Guy
d3facf341b Don't recreate the EGL surface if the surface is not ready
Bug #5114545

Change-Id: I95149dc18e0582ca358716a6b0d89a4edc8fca26
2011-08-03 11:14:38 -07:00
Steve Block
cb484804e0 Merge "In DeviceMotionService, handle the fact that we may receive updates from SensorManager after unregistering." 2011-08-03 10:48:07 -07:00
Eric Laurent
e096f9fa3d Merge "Audio Effect Framework: add effect suspend/restore" 2011-08-03 10:38:04 -07:00
Chris Craik
62c7b37590 Merge "Added automated performance test to TileBenchmark" 2011-08-03 09:46:15 -07:00
Jaikumar Ganesh
e3b79ca1b9 Fix PAN bugs.
1. The interface was null for reverse tethering.
2. When disconnecting the server, we were passing the address instead of the
interface.

Change-Id: I6004cdf1eed000211cddc6b120e0aded5758eb1e
2011-08-03 09:15:41 -07:00
Jean-Michel Trivi
4415629112 Merge "Remote control display API and implementation" 2011-08-03 09:09:43 -07:00
Steve Block
d09001fea4 In DeviceMotionService, handle the fact that we may receive updates from SensorManager after unregistering.
Bug: 5110230
Change-Id: I9be502538517a094c83d2d1a9073dfaee3b436e7
2011-08-03 14:18:20 +01:00
Debashish Chatterjee
3f76ca47e2 Merge "Step1 of renaming READ_WRITE_OWN_VOICEMAIL to ADD_VOICEMAILS." 2011-08-03 06:06:30 -07:00
Debashish Chatterjee
766839cb6f Step1 of renaming READ_WRITE_OWN_VOICEMAIL to ADD_VOICEMAILS.
READ_WRITE_OWN_VOICEMAIL sounds a confusing name. Dianne recommened to
rename it to ADD_VOICEMAILS as this simply allows 3rd party apps to add
new voicemails to the system. The fact that we allow the app to acces
only its own voicemail is implicit and need not be highlighted in the
permission name. See bug: 5098551 for more details

This CL implements the 1st step of this change by adding the permission
ADD_VOICEMAILS. A follow up CL will remove READ_WRITE_OWN_VOICEMAIL once
content provider and contacts app have been modified to start using the
new ADD_VOICEMAILS permission instead.

Bug: 5098551
Change-Id: I515e7967bdb0e8498a60a32983f9122ce10dcc4a
2011-08-03 10:48:58 +01:00