summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Full support for Canvas.drawPosText"Romain Guy2012-01-186-75/+217
|\
| * Full support for Canvas.drawPosTextRomain Guy2012-01-186-75/+217
| | | | | | | | | | | | This also introduces a small optimization when rendering text. Change-Id: Iff620ac97bf878eaac406bccc6daa07052c93890
* | am 7b6231a4: am aba79851: Merge "Use new preferredAPN URI avoiding ↵Wink Saville2012-01-181-4/+11
|\ \ | | | | | | | | | | | | | | | | | | onApnChanged() call with self-change" into ics-mr1 * commit '7b6231a44e21fbf5b2bc2a5eff2231139ac4088f': Use new preferredAPN URI avoiding onApnChanged() call with self-change
| * \ am aba79851: Merge "Use new preferredAPN URI avoiding onApnChanged() call ↵Wink Saville2012-01-181-4/+11
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | with self-change" into ics-mr1 * commit 'aba798510129327a046d57844381382fb1faa3ba': Use new preferredAPN URI avoiding onApnChanged() call with self-change
| | * \ Merge "Use new preferredAPN URI avoiding onApnChanged() call with ↵Wink Saville2012-01-181-4/+11
| | |\ \ | | | | | | | | | | | | | | | self-change" into ics-mr1
| | | * | Use new preferredAPN URI avoiding onApnChanged() call with self-changeWink Saville2012-01-171-4/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Solving the issue that setting preferred APN from GDCT triggers back APN change event and force unnecessary data call disconnects and setups. The new URI is added in Telephony Provider so ContentObserver callback (results in onApnChanged) will not be triggered. Bug:5448858 Change-Id: I4c0bcf32cec69cf1d0a0430f7a27495b89e93625
* | | | | Merge "Fix edge cases leading to backup hanging forever"Christopher Tate2012-01-182-5/+98
|\ \ \ \ \
| * | | | | Fix edge cases leading to backup hanging foreverChristopher Tate2012-01-182-5/+98
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Plug a couple of apparent code paths (one not obviously reachable, but fixed here on general principles) that could lead to a backup pass getting confused partway through and simply never properly completing. In this state it would leave its wakelock held forever until next reboot. Bug 5828859. Those fixes are a total of two lines of code. The rest of the patch adds a textual journal of the most recently completed (or ongoing!) backup pass's progress, with an eye to being able to isolate any such issues that may crop up in the future. Change-Id: If8a5e8aba11db5a1e618d8b9c9ba3038dd5377a1
* | | | | | Merge "Run ComputePerf multiple times."Stephen Hines2012-01-182-13/+28
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Run ComputePerf multiple times.Stephen Hines2012-01-182-13/+28
| | |_|_|/ | |/| | | | | | | | | | | | | Change-Id: I715c726f15416685b715a14a25c9595d9a9a124b
* | | | | am a6a0d134: am 04f38489: Merge "Fix DeviceDefault theme/style bugs where ↵Adam Powell2012-01-182-4/+4
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | parent styles were incorrectly specified." into ics-mr1 * commit 'a6a0d134ebfb0931473c5e54f21ff543e08b4a91': Fix DeviceDefault theme/style bugs where parent styles were incorrectly specified.
| * | | | am 04f38489: Merge "Fix DeviceDefault theme/style bugs where parent styles ↵Adam Powell2012-01-182-4/+4
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | were incorrectly specified." into ics-mr1 * commit '04f3848986efda8cf006f575d2e4990f120a1bc8': Fix DeviceDefault theme/style bugs where parent styles were incorrectly specified.
| | * | | Merge "Fix DeviceDefault theme/style bugs where parent styles were ↵Adam Powell2012-01-182-4/+4
| | |\ \ \ | | | | | | | | | | | | | | | | | | incorrectly specified." into ics-mr1
| | | * | | Fix DeviceDefault theme/style bugs where parent styles wereAdam Powell2012-01-172-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | incorrectly specified. This affected search bars and alert dialogs spawned from activities using Theme.DeviceDefault.Light as a base. Change-Id: I219d38d486498db5b4b283560256afd7d6051535
* | | | | | Merge "Improve heuristics for orientation detection."Jeff Brown2012-01-182-199/+303
|\ \ \ \ \ \
| * | | | | | Improve heuristics for orientation detection.Jeff Brown2012-01-172-199/+303
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Except as otherwise indicated, orientation change happens once the predicted rotation has been stable for 40ms. Noise is suppressed by a low-pass filter with a 200ms time constant which seems to be about as small as is practical given the quality of the sensor data. 2. If the magnitude exceeds a threshold (excessive noise or freefall), resets the predicted orientation. Doesn't happen very often even when shaking the device. This heuristic mainly protects the detector from spurious tilt due to inaccurate determination of the gravity vector. 3. If the device was previously in a flat posture (on a table for at least 1000ms), then it must move out of that posture for at least 500ms before the next orientation change will happen. This heuristic suppresses most spurious rotations that happen while picking up the device. 4. If the device is tilted away from the user by 20 degrees within a span of 300ms, the device is said to be swinging and at least 300ms must elapse after the device stops swinging before the next orientation change will happen. This heuristic suppresses some but not all spurious rotations that happen while putting down a device. Unfortunately, this heuristic sometimes triggers a false positive when turning the device very rapidly due to accelerometer noise. The 300ms pause is a compromise so that occasional mispredicted swings don't significantly delay the rotation. Bug: 5796249 Change-Id: Id7b36c4c563e35b70d6a7ac36d04f3c3d6ea5811
* | | | | | | Merge "Prevent IME from popping up on startup"Michael Kolb2012-01-181-6/+4
|\ \ \ \ \ \ \
| * | | | | | | Prevent IME from popping up on startupMichael Kolb2012-01-181-6/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5869028 Change-Id: Ie5c7004def16eeac4147d19fb00fc9631a17579e
* | | | | | | | am c891c6ef: am 013dbcf0: Merge "docs: adding rs api docs" into ics-mr1Robert Ly2012-01-1854-0/+14374
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | * commit 'c891c6eff7ab320092af4ec5b235f83866f66261': docs: adding rs api docs
| * | | | | | | am 013dbcf0: Merge "docs: adding rs api docs" into ics-mr1Robert Ly2012-01-1854-0/+14374
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | * commit '013dbcf0783f55efbb75e6c2794478c27d172c8c': docs: adding rs api docs
| | * | | | | | Merge "docs: adding rs api docs" into ics-mr1Robert Ly2012-01-1854-0/+14374
| | |\ \ \ \ \ \
| | | * | | | | | docs: adding rs api docsRobert Ly2012-01-1754-0/+14374
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib56ee177439e9c124d0ac4053ed4173f8a4be1aa
* | | | | | | | | am 43fda84e: am 6ad9ea7d: Merge "update overview page for rs api docs to ↵Robert Ly2012-01-181-3/+3
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | open iframe links in parent" into ics-mr1 * commit '43fda84e91b1fe356af35386d2f304d3ab71529e': update overview page for rs api docs to open iframe links in parent
| * | | | | | | | am 6ad9ea7d: Merge "update overview page for rs api docs to open iframe ↵Robert Ly2012-01-181-3/+3
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | links in parent" into ics-mr1 * commit '6ad9ea7deb669eca68c58f001c935255c3294cfe': update overview page for rs api docs to open iframe links in parent
| | * | | | | | | Merge "update overview page for rs api docs to open iframe links in parent" ↵Robert Ly2012-01-181-3/+3
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into ics-mr1
| | | * | | | | | | update overview page for rs api docs to open iframe links in parentRobert Ly2012-01-131-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic0aa77192fa19b045a7fd9df5926255511fdc3be
* | | | | | | | | | Merge "Remove LlcpPacket from public namespace."Martijn Coenen2012-01-182-107/+0
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Remove LlcpPacket from public namespace.Martijn Coenen2012-01-132-107/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a left-over, unused by the public API's. Change-Id: I3ccccd58a6c52caeb476a6972126eb034a0ff917
* | | | | | | | | | | am 58f9c3da: am dd41d360: Merge "docs: Android API 15 SDK r2 Release Notes" ↵Joe Fernandez2012-01-181-5/+22
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into ics-mr1 * commit '58f9c3da340eb36051bc20d6b8cec6b982852ee0': docs: Android API 15 SDK r2 Release Notes
| * | | | | | | | | | am dd41d360: Merge "docs: Android API 15 SDK r2 Release Notes" into ics-mr1Joe Fernandez2012-01-181-5/+22
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'dd41d360eac45ceae92963ed3f100f1c39dd5db2': docs: Android API 15 SDK r2 Release Notes
| | * | | | | | | | | Merge "docs: Android API 15 SDK r2 Release Notes" into ics-mr1Joe Fernandez2012-01-181-5/+22
| | |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / | | |/| | | | | | | |
| | | * | | | | | | | docs: Android API 15 SDK r2 Release NotesJoe Fernandez2012-01-171-5/+22
| | | | |_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ifadc7c464ea624a2e989e9050f2acc1e0d4d1c2c
* | | | | | | | | | Merge "Temporarily restore AudioSystem/AudioTrack APIs with their former ↵Andreas Huber2012-01-184-0/+47
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | signatures"
| * | | | | | | | | | Temporarily restore AudioSystem/AudioTrack APIs with their former signaturesAndreas Huber2012-01-184-0/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | until we get updated prebuilts from vendor. Change-Id: I8aae81d2513edca0ab268053a11c8c4206879e61
* | | | | | | | | | | Add tapHighlightColor supportJohn Reck2012-01-182-10/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I419eb3d8f1050efd05bb989a6b353ad45ee77acf
* | | | | | | | | | | Merge "AVIExtractor: adding a H264 fourCC which is also specified in the ↵Andreas Huber2012-01-181-0/+1
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | reference. (H264 code can be found avi file which is encoded with FFmpeg.)"
| * | | | | | | | | | | AVIExtractor: adding a H264 fourCC which is also specified in the reference.Dongwon Kang2012-01-151-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (H264 code can be found avi file which is encoded with FFmpeg.) Change-Id: Id9eccd4580443f42b2afa491c94ac2c2faa37f87
* | | | | | | | | | | | Merge "Make sure seek triggers a reconnect if needed."Bryan Mawhinney2012-01-181-2/+3
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Make sure seek triggers a reconnect if needed.Bryan Mawhinney2012-01-181-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, if we had disconnected at the high watermark, the read immediately following a seek would fail, and would not be retried, resulting in an error. Change-Id: I45a53563fe17d6b54893815abc7750a7dfb0a124
* | | | | | | | | | | | Merge "Track volume cleanup"Glenn Kasten2012-01-183-15/+35
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Track volume cleanupGlenn Kasten2012-01-173-15/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Always read and write track volumes atomically. In most places this was already being done, but there were a couple places where the left and right channels were read independently. Changed constant MAX_GAIN_INT to be a uint32_t instead of a float. It is always used as a uint32_t in comparisons and assignments. Use MAX_GAIN_INT in more places. Now that volume is always accessed atomically, removed the union and alias for uint16_t volume[2], and kept only volumeLR. Removed volatile as it's meaningless. In AudioFlinger, clamp the track volumes read from shared memory before applying master and stream volume. Change-Id: If65e2b27e5bc3db5bf75540479843041b58433f0
* | | | | | | | | | | | Add methods to support shortcuts in user dict.Jean Chalard2012-01-182-18/+65
| |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds the new interface to the user dictionary, which includes a clean way of inserting words in any locale and support for shortcuts. Change Ib318c047 implements the provider part of this. Bug: 4646172 Change-Id: Id3ca792f2555fac46728f9d404ab0199971f6503
* | | | | | | | | | | Merge "First pass at implementing Canvas.drawPosText() in GL"Romain Guy2012-01-176-3/+128
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | First pass at implementing Canvas.drawPosText() in GLRomain Guy2012-01-176-3/+128
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia3ac347e95d57eb86c63045156c8dbc0572b03cb
* | | | | | | | | | | | Merge "audio framework: manage stream volume per device"Eric Laurent2012-01-179-143/+422
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | audio framework: manage stream volume per deviceEric Laurent2012-01-179-143/+422
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve volume management by keeping track of volume for each type of device independently. Volume for each stream (MUSIC, RINGTONE, VOICE_CALL...) is now maintained per device. The main changes are: - AudioService now keeps tracks of stream volumes per device: volume indexes are kept in a HashMap < device , index>. active device is queried from policy manager when a volume change request is received initalization, mute and unmute happen on all device simultaneously - Settings: suffixes is added to volume keys to store each device volume independently. - AudioSystem/AudioPolicyService/AudioPolicyInterface: added a device argument to setStreamVolumeIndex() and getStreamVolumeIndex() to address each device independently. - AudioPolicyManagerBase: keep track of stream volumes for each device and apply volume according to current device selection. Change-Id: I61ef1c45caadca04d16363bca4140e0f81901b3f
* | | | | | | | | | | | | Merge "Free optimization"Romain Guy2012-01-171-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Free optimizationRomain Guy2012-01-171-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using the TextLayoutCache with the GL renderer should help... Change-Id: I73a19be040165212839e2a40d4183e998f9dfb7f
* | | | | | | | | | | | | Merge "AccessibilityEvent/AccessibilityNodeInfo class name property should ↵Svetoslav Ganov2012-01-1759-34/+724
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | be set to only framework classes."
| * | | | | | | | | | | | | AccessibilityEvent/AccessibilityNodeInfo class name property should be set ↵Svetoslav Ganov2012-01-1759-34/+724
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to only framework classes. AccessibilityEvent and AccessibilityNodeInfo have a property className which is set to the source Java class. This is problematic since leads to leaking private classes which would allow an accessibility service to load classes from other packages. This is strongly undesirable since not trusted code can be loaded, and hence executed, in the accessibility service. To address that the class name is set to the most concrete framework class extended by the info/event source. bug:5878943 Change-Id: I7b3114ece8772ea2773f5151e21b8a6f2006882a