OSDN Git Service
Gilles Debunne [Wed, 25 Jan 2012 23:26:47 +0000 (15:26 -0800)]
Handle tap and move cursor before showing suggestions
Otherwise the suggestions do not correspond to the tapped location.
Change-Id: Id0bd87931e73513ca7e50c6212a17b0fc7d6179d
Jean-Baptiste Queru [Wed, 25 Jan 2012 18:33:42 +0000 (10:33 -0800)]
am
95306d85: am
64085d03: am
12045502: Merge "stagefright aacenc: Fix type definitions for 64 bit platforms"
* commit '
95306d85005f165e10a25ad45cadadec6e1f6a31':
stagefright aacenc: Fix type definitions for 64 bit platforms
Jean-Baptiste Queru [Wed, 25 Jan 2012 18:30:31 +0000 (10:30 -0800)]
am
64085d03: am
12045502: Merge "stagefright aacenc: Fix type definitions for 64 bit platforms"
* commit '
64085d03efcd2abf3b8cd64f4e6344a1ece014c3':
stagefright aacenc: Fix type definitions for 64 bit platforms
Jean-Baptiste Queru [Wed, 25 Jan 2012 18:27:41 +0000 (10:27 -0800)]
am
12045502: Merge "stagefright aacenc: Fix type definitions for 64 bit platforms"
* commit '
12045502c49bfee40d7d3cb806d9b70d3b5d3ed3':
stagefright aacenc: Fix type definitions for 64 bit platforms
Jean-Michel Trivi [Wed, 25 Jan 2012 17:46:01 +0000 (09:46 -0800)]
Merge "Update AudioTrack.stop() javadoc"
Jean-Baptiste Queru [Wed, 25 Jan 2012 17:17:45 +0000 (09:17 -0800)]
Merge "stagefright aacenc: Fix type definitions for 64 bit platforms"
Roman Nurik [Wed, 25 Jan 2012 16:57:45 +0000 (08:57 -0800)]
am
92aaf243: am
cf077fdd: Merge "docs: Android Design typo and grammar fixes" into ics-mr1
* commit '
92aaf2431ccb8d5ef1eb456646742c736fa70266':
docs: Android Design typo and grammar fixes
Jean-Baptiste Queru [Wed, 25 Jan 2012 16:57:36 +0000 (08:57 -0800)]
am
e2594b85: am
4cd2b343: am
98539a4e: Merge "stagefright amrwbenc: Make the mem_malloc function 64-bit safe"
* commit '
e2594b85093441e03150c7cfc540abc626884eaf':
stagefright amrwbenc: Make the mem_malloc function 64-bit safe
Jean-Baptiste Queru [Wed, 25 Jan 2012 16:57:32 +0000 (08:57 -0800)]
am
a3946104: am
fc2ea24b: am
d80cbb8c: Merge "stagefright aacenc: Add missing newlines at the end of files"
* commit '
a39461047eae6022e2c0ef873ffa2c7241b393a9':
stagefright aacenc: Add missing newlines at the end of files
Daniel Sandler [Wed, 25 Jan 2012 16:57:27 +0000 (08:57 -0800)]
am
416a1c1a: am
185c0ef7: Merge "Stop showing "No internet connection" when there is one." into ics-mr1
* commit '
416a1c1ada0ad553613eb439823a68d3f51b1579':
Stop showing "No internet connection" when there is one.
Eric Laurent [Wed, 25 Jan 2012 16:57:23 +0000 (08:57 -0800)]
am
535b0264: am
7eeaf3f0: Merge "AudioFlinger: refine mixer sleep time logic" into ics-mr1
* commit '
535b0264a4cfa790e549bd9cd09980788f1375f4':
AudioFlinger: refine mixer sleep time logic
Eric Laurent [Wed, 25 Jan 2012 16:57:20 +0000 (08:57 -0800)]
am
dd347d51: (-s ours) am
41773d46: Merge "DO NOT MERGE Revert "Revert "AudioFlinger: mix track only when really ready (2)""" into ics-mr1
* commit '
dd347d515d4a4e42b2aba89a8e471392026b7824':
DO NOT MERGE Revert "Revert "AudioFlinger: mix track only when really ready (2)""
Robert Greenwalt [Wed, 25 Jan 2012 16:54:59 +0000 (08:54 -0800)]
Merge "resolved conflicts for merge of
67cda1a0 to master"
George Mount [Wed, 25 Jan 2012 15:37:30 +0000 (07:37 -0800)]
Merge "Fix auto-complete for content-editable fields."
satok [Wed, 25 Jan 2012 07:05:11 +0000 (16:05 +0900)]
Do not spell check when the keyboard language is not supported by the current spell checker
Bug:
5787064
Change-Id: I54a3955220bbe3dae999f6634ccd734e658e45c0
Mathias Agopian [Wed, 25 Jan 2012 03:22:08 +0000 (19:22 -0800)]
Merge changes Ib6b6da1d,I6d9a466a
* changes:
improve SurfaceFlinger dumpsys
hack up frame latency measurement
Mathias Agopian [Fri, 20 Jan 2012 02:34:40 +0000 (18:34 -0800)]
improve SurfaceFlinger dumpsys
It is now possible to say:
dumpsys SurfaceFlinger --latency
to print latency information about all windows
dumpsys SurfaceFlinger --latency window-name
to print the latency stats of the specified window
for instance: dumpsys SurfaceFlinger --latency SurfaceView
The data consists of one line containing global stats, followed by
128 lines of tab separated timestamps in nanosecond.
The first line currently contains the refresh period in nanosecond.
Each 128 following line contains 3 timestamps, of respectively
the app draw time, the vsync timestamp just prior the call to set and
the timestamp of the call to set.
Change-Id: Ib6b6da1d7e2e6ba49c282bdbc0b56a7dc203343a
Roman Nurik [Wed, 25 Jan 2012 02:11:12 +0000 (18:11 -0800)]
am
cf077fdd: Merge "docs: Android Design typo and grammar fixes" into ics-mr1
* commit '
cf077fdd79853dd4778598a623dc2f469c1a8934':
docs: Android Design typo and grammar fixes
Roman Nurik [Wed, 25 Jan 2012 02:08:52 +0000 (18:08 -0800)]
Merge "docs: Android Design typo and grammar fixes" into ics-mr1
Roman Nurik [Mon, 23 Jan 2012 19:23:46 +0000 (11:23 -0800)]
docs: Android Design typo and grammar fixes
Change-Id: Ice0eb216c985183e2f41c287ea5d1cc7af1f31f2
Jim Miller [Wed, 25 Jan 2012 01:41:04 +0000 (17:41 -0800)]
Merge "Fix
5907237: dismiss keyguard after the camera app launches."
Svetoslav Ganov [Wed, 25 Jan 2012 01:02:23 +0000 (17:02 -0800)]
Merge "Fixing a typo in the NumberPicker documentation."
Jim Miller [Tue, 24 Jan 2012 22:47:57 +0000 (14:47 -0800)]
Fix
5907237: dismiss keyguard after the camera app launches.
This fixes a bug where either the home screen or the last app run shows
briefly while we wait for the camera app to launch. Instead, we have
ActivityManager dismiss keyguard once the camera app is up and running.
Change-Id: I1c2986ad84024dce675216a76c19c937c3e2828d
Fabrice Di Meglio [Wed, 25 Jan 2012 00:57:21 +0000 (16:57 -0800)]
Merge "Fix bug #
5901103 all_source_project_146981_Android - Android ICS LQA Regression:FA, AR, HE and TH - Font Corruption"
Jean-Michel Trivi [Wed, 25 Jan 2012 00:20:31 +0000 (16:20 -0800)]
Update AudioTrack.stop() javadoc
Add more information on the behavior of
android.media.AudioTrack.stop()
Change-Id: Id0f968e6bb8fe38765a86c43fc065908ee84edf1
Fabrice Di Meglio [Wed, 25 Jan 2012 00:44:00 +0000 (16:44 -0800)]
Fix bug #
5901103 all_source_project_146981_Android - Android ICS LQA Regression:FA, AR, HE and TH - Font Corruption
- use the first char of the "run" instead of the "string" for the BaseGlyphCount
Change-Id: I647528ec912bb69655cf301bbc73b66dc1a6fc82
Jean-Michel Trivi [Wed, 25 Jan 2012 00:23:22 +0000 (16:23 -0800)]
Merge "More AudioManager tests"
Winson Chung [Tue, 24 Jan 2012 23:51:53 +0000 (15:51 -0800)]
Merge "Call ActivityManager to get the proper icon dpi."
Jamie Gennis [Mon, 16 Jan 2012 02:54:57 +0000 (18:54 -0800)]
hack up frame latency measurement
Change-Id: I6d9a466a23285304f0e229a5649815636ab5d6af
Jeff Sharkey [Tue, 24 Jan 2012 23:38:54 +0000 (15:38 -0800)]
Merge "Match WIFI_P2P data usage."
Jeff Sharkey [Tue, 24 Jan 2012 23:37:07 +0000 (15:37 -0800)]
Match WIFI_P2P data usage.
Bug:
5405891
Change-Id: I5b815d6fc25a2f26a86c39a43fde305fcc3fb65c
Winson Chung [Tue, 24 Jan 2012 23:26:59 +0000 (15:26 -0800)]
Call ActivityManager to get the proper icon dpi.
Change-Id: Iaec2a9a3cc1ea5febe60e0b675f1deff8e77d011
Svetoslav Ganov [Tue, 24 Jan 2012 23:27:12 +0000 (15:27 -0800)]
Merge "NumberPicker should not throw an exception if no enough values for wrapping."
Jean-Baptiste Queru [Tue, 24 Jan 2012 23:15:36 +0000 (15:15 -0800)]
am
4cd2b343: am
98539a4e: Merge "stagefright amrwbenc: Make the mem_malloc function 64-bit safe"
* commit '
4cd2b343272429adae1fc68e0ec0628c69e88e6d':
stagefright amrwbenc: Make the mem_malloc function 64-bit safe
Jean-Baptiste Queru [Tue, 24 Jan 2012 23:15:33 +0000 (15:15 -0800)]
am
fc2ea24b: am
d80cbb8c: Merge "stagefright aacenc: Add missing newlines at the end of files"
* commit '
fc2ea24b024f7a015d67054adb7bb09ff3a0a97b':
stagefright aacenc: Add missing newlines at the end of files
Jean-Baptiste Queru [Tue, 24 Jan 2012 23:13:45 +0000 (15:13 -0800)]
am
98539a4e: Merge "stagefright amrwbenc: Make the mem_malloc function 64-bit safe"
* commit '
98539a4eba7677c0b1ddc12f800c7075851ef302':
stagefright amrwbenc: Make the mem_malloc function 64-bit safe
Jean-Baptiste Queru [Tue, 24 Jan 2012 23:13:42 +0000 (15:13 -0800)]
am
d80cbb8c: Merge "stagefright aacenc: Add missing newlines at the end of files"
* commit '
d80cbb8c7b13203704c00e2f5941588811c15665':
stagefright aacenc: Add missing newlines at the end of files
Robert Greenwalt [Tue, 24 Jan 2012 23:02:06 +0000 (15:02 -0800)]
resolved conflicts for merge of
67cda1a0 to master
Change-Id: I5ea4398b209faa381f1c50ed6d51fed06d245af1
Svetoslav Ganov [Tue, 24 Jan 2012 22:32:20 +0000 (14:32 -0800)]
Fixing a typo in the NumberPicker documentation.
Change-Id: I3a76923d468ddd01cd1ed5521992479cee82c6f0
Jean-Baptiste Queru [Tue, 24 Jan 2012 22:26:30 +0000 (14:26 -0800)]
Merge "stagefright amrwbenc: Make the mem_malloc function 64-bit safe"
Chris Craik [Tue, 24 Jan 2012 22:15:25 +0000 (14:15 -0800)]
Merge "Allow profiling of animation performance"
Adam Powell [Tue, 24 Jan 2012 21:58:41 +0000 (13:58 -0800)]
Merge "Update ShareActionProvider to clear the sharing activity when the task is reset."
Svetoslav Ganov [Tue, 24 Jan 2012 21:57:05 +0000 (13:57 -0800)]
Merge "Removing unused imports and swiching off deprecated APIs"
Svetoslav Ganov [Tue, 24 Jan 2012 21:55:35 +0000 (13:55 -0800)]
Removing unused imports and swiching off deprecated APIs
Change-Id: I08fd2c17bcad42f0216b140c0511f48a782c8018
Adam Powell [Tue, 24 Jan 2012 21:33:09 +0000 (13:33 -0800)]
Update ShareActionProvider to clear the sharing activity when the task
is reset.
As per platform guidelines, when launching a sharing activity the Intent
flag FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET should be used.
Change-Id: I30bd3d20eb75aee7943b681dc2d9c7f44a04e919
Chris Craik [Tue, 24 Jan 2012 01:29:12 +0000 (17:29 -0800)]
Allow profiling of animation performance
Also fixes manual testing mode
Depends on external/webkit change: https://android-git.corp.google.com/g/#/c/159794/
Change-Id: I169e80f9b5328b1b5a7b0aeaf09652de67febd8d
Daniel Sandler [Tue, 24 Jan 2012 20:57:14 +0000 (12:57 -0800)]
am
185c0ef7: Merge "Stop showing "No internet connection" when there is one." into ics-mr1
* commit '
185c0ef7e4aaa4bb978a6eb5c93c569585a07f56':
Stop showing "No internet connection" when there is one.
Daniel Sandler [Tue, 24 Jan 2012 20:54:48 +0000 (12:54 -0800)]
Merge "Stop showing "No internet connection" when there is one." into ics-mr1
Svetoslav Ganov [Tue, 24 Jan 2012 20:02:31 +0000 (12:02 -0800)]
NumberPicker should not throw an exception if no enough values for wrapping.
1. The selector wheel was throwing an exception if a client requires that it
wraps its selector wheel if the number of values is less that the number
of values shown in the wheel. While wrapping makes no sense if the all
possible values are already shown, we should not throw an exception,
rather to ignore the request.
bug:
5911190
Change-Id: Icd90cd39f66d9f39939801752bf1eb1eef8fe757
Eric Laurent [Tue, 24 Jan 2012 19:51:50 +0000 (11:51 -0800)]
am
7eeaf3f0: Merge "AudioFlinger: refine mixer sleep time logic" into ics-mr1
* commit '
7eeaf3f07aa6fb10639d9f96c1367eb98c3e8839':
AudioFlinger: refine mixer sleep time logic
Eric Laurent [Tue, 24 Jan 2012 19:51:47 +0000 (11:51 -0800)]
am
41773d46: Merge "DO NOT MERGE Revert "Revert "AudioFlinger: mix track only when really ready (2)""" into ics-mr1
* commit '
41773d46556aa47d4322ff89fdaf7d1345c2d1f2':
DO NOT MERGE Revert "Revert "AudioFlinger: mix track only when really ready (2)""
Jeff Sharkey [Tue, 24 Jan 2012 19:49:51 +0000 (11:49 -0800)]
Merge "Move network stats to FileRotator pattern."
Eric Laurent [Tue, 24 Jan 2012 19:49:39 +0000 (11:49 -0800)]
Merge "AudioFlinger: refine mixer sleep time logic" into ics-mr1
Eric Laurent [Tue, 24 Jan 2012 19:49:16 +0000 (11:49 -0800)]
Merge "DO NOT MERGE Revert "Revert "AudioFlinger: mix track only when really ready (2)""" into ics-mr1
Daniel Sandler [Tue, 24 Jan 2012 19:45:40 +0000 (14:45 -0500)]
Stop showing "No internet connection" when there is one.
In particular, even though the mobile data network isn't
routing packets (and therefore is not an internet
connection), we want to show the PLMN anyway:
[MOBILE RSSI] Carrier [WIFI RSSI] WiFi SSID
This change also improves the following cases:
- Combines "No internet connection" from wifi and mobile
into one single string in airplane mode:
[AIRPLANE] No internet connection.
- Removes "No internet connection" from the mobile string
when wifi is on in airplane mode, making a nice compact
display in this case:
[AIRPLANE] [WIFI RSSI] WiFi SSID
Bug:
5903914
Change-Id: I477821d2c5e9922252dd6bcb3ed494c8c57d99b0
George Mount [Fri, 20 Jan 2012 21:08:50 +0000 (13:08 -0800)]
Fix auto-complete for content-editable fields.
Bug
5608192
Text content for content-editable fields is
retrieved and given to the WebViewInputConnection
so that suggestions will work appropriately.
Edits with WebViewInputConnection uses
replaceTextfieldText just like WebTextView.
Webkit Change: Idcf8d99d9e844669ea68122a7509990f5ce8dcca
Change-Id: I5f1fcc13a0abe204db301e027954dc47c3a48db0
Robert Greenwalt [Tue, 24 Jan 2012 19:42:21 +0000 (11:42 -0800)]
am
f449ea9e: Merge "Use the carrier-given dns addrs for tethering." into ics-mr1
* commit '
f449ea9e96162698f4ec6d62c70750eb50744da7':
Use the carrier-given dns addrs for tethering.
Robert Greenwalt [Tue, 24 Jan 2012 19:40:19 +0000 (11:40 -0800)]
Merge "Use the carrier-given dns addrs for tethering." into ics-mr1
Dianne Hackborn [Tue, 24 Jan 2012 19:39:49 +0000 (11:39 -0800)]
am
a5853595: am
47163685: Merge "Another attempt at issue #
5823276: home repaints after full-screen app is exited" into ics-mr1
* commit '
a5853595165a6395ca41bbc17a3dd88e12259ad1':
Another attempt at issue #
5823276: home repaints after full-screen app is exited
Dianne Hackborn [Tue, 24 Jan 2012 19:37:24 +0000 (11:37 -0800)]
am
29cd79c7: am
c986d6f0: Merge "Fix issue #
5906017: Missing menu entries in portrait when in compatibility mode" into ics-mr1
* commit '
29cd79c7b0fecd2753fc27405794c0d5b5314302':
Fix issue #
5906017: Missing menu entries in portrait when in compatibility mode
Daniel Sandler [Tue, 24 Jan 2012 19:37:21 +0000 (11:37 -0800)]
am
9dc211af: am
a4474ae0: Merge "Detect and repair invalid layouts in the navigation bar." into ics-mr1
* commit '
9dc211afbf3201a23a29cf7cd02ce575c6dbe094':
Detect and repair invalid layouts in the navigation bar.
Dianne Hackborn [Tue, 24 Jan 2012 19:37:02 +0000 (11:37 -0800)]
am
47163685: Merge "Another attempt at issue #
5823276: home repaints after full-screen app is exited" into ics-mr1
* commit '
47163685eb90f9520e7ae0ac0984b4e1535e8e5b':
Another attempt at issue #
5823276: home repaints after full-screen app is exited
Dianne Hackborn [Tue, 24 Jan 2012 19:34:49 +0000 (11:34 -0800)]
am
c986d6f0: Merge "Fix issue #
5906017: Missing menu entries in portrait when in compatibility mode" into ics-mr1
* commit '
c986d6f01b00dd760ba1650918baadd24a6dc838':
Fix issue #
5906017: Missing menu entries in portrait when in compatibility mode
Daniel Sandler [Tue, 24 Jan 2012 19:34:47 +0000 (11:34 -0800)]
am
a4474ae0: Merge "Detect and repair invalid layouts in the navigation bar." into ics-mr1
* commit '
a4474ae02546d725686f9c08113c16a84aca912c':
Detect and repair invalid layouts in the navigation bar.
Dianne Hackborn [Tue, 24 Jan 2012 19:33:15 +0000 (11:33 -0800)]
Merge "Another attempt at issue #
5823276: home repaints after full-screen app is exited" into ics-mr1
Dianne Hackborn [Tue, 24 Jan 2012 19:33:06 +0000 (11:33 -0800)]
Merge "Fix issue #
5906017: Missing menu entries in portrait when in compatibility mode" into ics-mr1
Daniel Sandler [Tue, 24 Jan 2012 19:32:31 +0000 (11:32 -0800)]
Merge "Detect and repair invalid layouts in the navigation bar." into ics-mr1
Jeff Sharkey [Thu, 12 Jan 2012 02:38:16 +0000 (18:38 -0800)]
Move network stats to FileRotator pattern.
Split existing network stats into two separate classes: a recorder
which generates historical data based on periodic counter snapshots,
and a collection of historical data with persistance logic.
Recorder keeps a pending history in memory until outstanding data
crosses a specific threshold. Persisting is handled through a given
FileRotator. This pattern significantly reduces disk churn and
memory overhead. Separate UID data from UID tag data, enabling a
shorter rotation cycle. Migrate existing stats into new structure.
Remove "xt" stats until iptables hooks are ready. Avoid consuming
Entry values when recording into NetworkStatsHistory. Assign
operation counts to default route interface.
Introduce "Rewriter" interface in FileRotator with methods to enable
rewriteAll(). Introduce IndentingPrintWriter to handle indenting in
dump() methods.
Bug:
5386531
Change-Id: Ibe086230a17999a197206ca62d45f266225fdff1
Dianne Hackborn [Tue, 24 Jan 2012 19:12:37 +0000 (11:12 -0800)]
Merge "Add new test for showing very slow animations."
Dianne Hackborn [Mon, 9 Jan 2012 20:05:26 +0000 (12:05 -0800)]
Add new test for showing very slow animations.
Change-Id: Ibcc3e46a72210cf8a8e4cf5a932e2c9a7995f0f1
Scott Main [Tue, 24 Jan 2012 19:05:02 +0000 (11:05 -0800)]
am
e7dc2898: am
4809f09f: docs: update fujitsu id, capitalize
* commit '
e7dc2898c099bb1673f4bb0074b4d3b697699176':
docs: update fujitsu id, capitalize
Scott Main [Tue, 24 Jan 2012 19:02:25 +0000 (11:02 -0800)]
am
b790d1aa: am
cdf14454: docs: add fujitsu/toshiba USB vendor id
* commit '
b790d1aa2f741813b1556b71875dc453bc8c8010':
docs: add fujitsu/toshiba USB vendor id
Scott Main [Tue, 24 Jan 2012 19:01:49 +0000 (11:01 -0800)]
am
4809f09f: docs: update fujitsu id, capitalize
* commit '
4809f09f55a6177bd69303630dc42cc738f71116':
docs: update fujitsu id, capitalize
Scott Main [Tue, 24 Jan 2012 18:59:23 +0000 (10:59 -0800)]
am
cdf14454: docs: add fujitsu/toshiba USB vendor id
* commit '
cdf14454326dcb2f43ae0da208a8ed65a38f2897':
docs: add fujitsu/toshiba USB vendor id
Scott Main [Tue, 24 Jan 2012 18:58:06 +0000 (10:58 -0800)]
docs: update fujitsu id, capitalize
Change-Id: I776bdf0af37baa98b2b2dd70c5950ea1e98d36ec
Scott Main [Tue, 24 Jan 2012 18:54:50 +0000 (10:54 -0800)]
docs: add fujitsu/toshiba USB vendor id
Change-Id: I7917035d8c3f4b0fc80b7c992fcdf085aa984b4f
Gilles Debunne [Tue, 24 Jan 2012 18:46:58 +0000 (10:46 -0800)]
Merge "Fix for AOOB in MeasuredText"
Gilles Debunne [Tue, 24 Jan 2012 18:42:09 +0000 (10:42 -0800)]
Merge "Restored selectAllOnFocus"
Jean-Baptiste Queru [Tue, 24 Jan 2012 18:34:24 +0000 (10:34 -0800)]
Merge "stagefright aacenc: Add missing newlines at the end of files"
Jean-Michel Trivi [Tue, 17 Jan 2012 19:49:08 +0000 (11:49 -0800)]
More AudioManager tests
Add tests for AudioFocus:
- create a looper for AudioManager to use so listener callbacks can be used
- test each type of audio focus gain causes the expected type of focus loss
- stress test audio focus request and abandon, with and without a listener
Change-Id: I7d9c84ccd8ea49cf20ede57b1245899a81e99ab0
Jean-Baptiste Queru [Tue, 24 Jan 2012 16:46:26 +0000 (08:46 -0800)]
am
10c4641c: am
2ae5805c: am
164a9842: Merge "stagefright aacenc: Properly terminate a comment"
* commit '
10c4641c2e2f747f8fef7d217d550b7f9a6de588':
stagefright aacenc: Properly terminate a comment
Jean-Baptiste Queru [Tue, 24 Jan 2012 16:43:14 +0000 (08:43 -0800)]
am
2ae5805c: am
164a9842: Merge "stagefright aacenc: Properly terminate a comment"
* commit '
2ae5805cf18ad6bdbea5def03a488e14c1a8804c':
stagefright aacenc: Properly terminate a comment
Jean-Baptiste Queru [Tue, 24 Jan 2012 16:40:50 +0000 (08:40 -0800)]
am
164a9842: Merge "stagefright aacenc: Properly terminate a comment"
* commit '
164a984224f5d430757628028f2522329987350f':
stagefright aacenc: Properly terminate a comment
Jean-Baptiste Queru [Tue, 24 Jan 2012 15:51:11 +0000 (07:51 -0800)]
Merge "stagefright aacenc: Properly terminate a comment"
Adam Cohen [Tue, 24 Jan 2012 03:23:06 +0000 (19:23 -0800)]
Merge "Fix issue
5905210, AdapterViewAnimator sending negative index to Adapter"
Dianne Hackborn [Tue, 24 Jan 2012 03:15:27 +0000 (19:15 -0800)]
Another attempt at issue #
5823276: home repaints after full-screen app is exited
This is between the two previous attempts. I returned the part from the
original that was breaking gallery, but have some new code to detect when
something about the window params has changed that would require a
layout pass to make sure we still do a layout then, even if the window is
not currently visible.
Change-Id: I07745e1f66022583e3076b84cc8bbe8bd2acd48f
Adam Cohen [Tue, 24 Jan 2012 03:12:22 +0000 (19:12 -0800)]
Fix issue
5905210, AdapterViewAnimator sending negative index to Adapter
Change-Id: I6c1a3c17f1009d9512328f5844e17025f95a216c
Fabrice Di Meglio [Tue, 24 Jan 2012 02:59:17 +0000 (18:59 -0800)]
Merge "Fix bug #
5863709 API request: Change param names of deleteSurroundingText to "before" and "after""
Eric Laurent [Tue, 24 Jan 2012 02:56:59 +0000 (18:56 -0800)]
AudioFlinger: refine mixer sleep time logic
When an AudioTrack is in underrun state, the AudioFlinger mixer will
sleep for a short period of time to give the app a chance to fill the
AudioTrack buffer. If the AudioTrack is still not ready during next mixing round,
the mixer will proceed with other tracks.
If an application keeps a steady underrun condition, the AudioFlinger mixer will
alternate between ready and not ready states. In the longer term this will cause the
audio HAL to underrun.
There is a mechanism to reduce the sleep period if the mixer is not ready several times in a
row but this mechanism is defeated by the alternating ready/not ready conditions.
The fix consists in only increasing sleep time if the mixer is ready for at least two
consecutive times.
Issue
5904527.
Change-Id: Id0139bca9be8c4e425ec6d428515c4d8f718e8c9
Chia-chi Yeh [Tue, 24 Jan 2012 02:40:52 +0000 (18:40 -0800)]
Merge "VpnDialogs: fix screen flickering when popping up dialogs."
Eric Laurent [Tue, 24 Jan 2012 02:35:10 +0000 (18:35 -0800)]
DO NOT MERGE Revert "Revert "AudioFlinger: mix track only when really ready (2)""
This reverts commit
b918035d34422a2041b6ec8c09c566bb93345b40.
Change-Id: I093bcfa56ad54a080b930208b6b79169d33581fb
Gilles Debunne [Tue, 24 Jan 2012 02:35:32 +0000 (18:35 -0800)]
Restored selectAllOnFocus
Bug introduced in recent refactoring
https://android-git.corp.google.com/g/#/c/158896/
Do not move cursor when selectAllOnFocus and focus just happened.
The didTouchFocusSelect() condition was not copied over from ArrowKeyMM.
Change-Id: Id01d225c436ae3dd97c5d77d5dac5d0690d7de76
Chia-chi Yeh [Tue, 24 Jan 2012 02:33:26 +0000 (18:33 -0800)]
VpnDialogs: fix screen flickering when popping up dialogs.
Bug:
5699057
Change-Id: Iad1b32cafa32f98b27b6c96a63e1e9d97908983a
Daniel Sandler [Tue, 24 Jan 2012 02:08:36 +0000 (21:08 -0500)]
Detect and repair invalid layouts in the navigation bar.
It seems that something (probably layout transitions)
occasionally leaves the navigation bar layout in a weird
state such that most of the buttons are offscreen. For
example, the portrait nav bar might have buttons with widths
matching the nav bar's old width from landscape; the
clickable regions will therefore be far off the right edge
of the display.
The navigation bar now looks for this situation when the
size of the view changes and corrects for it.
Bug:
5549288
Change-Id: I8464ac9fd64cb64ec18baf51478dd0f6564a2284
Dianne Hackborn [Tue, 24 Jan 2012 01:23:08 +0000 (17:23 -0800)]
Fix issue #
5906017: Missing menu entries in portrait when in compatibility mode
This was a bug only when the status bar was hidden, the screen space for
the nav bar would not be correctly removed for all frames used in layout
computation.
This code really $*#&^!! needs to be cleaned up, the whole "status bar
is the system bar when on a tablet so it should take space from apps,
but status bar doesn't do that on phones but on phones there is a nav
bar that does the same thing" thing is whacked.
Proof that evolution DOESN'T WORK!!!!!!!!!!
Change-Id: I24e4994328480820cb638e7a40aa0b65b7ae2003
Jeff Brown [Tue, 24 Jan 2012 01:36:06 +0000 (17:36 -0800)]
Merge "Inform ContentObservers about the changed content Uri."
Jeff Brown [Tue, 24 Jan 2012 01:35:50 +0000 (17:35 -0800)]
Merge "Clean up content observer code."
Jeff Brown [Mon, 23 Jan 2012 23:51:41 +0000 (15:51 -0800)]
Inform ContentObservers about the changed content Uri.
Added a new method ContentObserver.onChange(boolean, Uri) that
receives the changed content Uri. This can help applications make
better decisions about how to interpret a change notification.
Change-Id: I8e35378b6485fe22c5bc240ba07557d269af0836
Romain Guy [Tue, 24 Jan 2012 01:10:42 +0000 (17:10 -0800)]
Merge "Add full support for Canvas.setDrawFilter()"
Romain Guy [Tue, 24 Jan 2012 01:09:05 +0000 (17:09 -0800)]
Add full support for Canvas.setDrawFilter()
Change-Id: I0ad35d0603c4eeda469014803be14c1dcdde918c