OSDN Git Service
Eric Laurent [Fri, 23 Sep 2011 15:40:41 +0000 (08:40 -0700)]
Fix issue
5355047: Automated effect tests fail.
Fixed several regressions in automated audio effect tests due
to changes in effect framework and visualizer FFT output range.
- Do not suspend Volume effect on session 0 when effects are
enabled on specific sessions.
- Adapt energy detection thresholds to new visualizer FFT range.
- Leave more time for BassBoost and Virtualizer effects to ramp up
before measuring the effect.
- Removed second insert reverb left by mistake on the player session
in preset reverb test.
Change-Id: I7a1ad1372d783fa7900eb9dd1d3b47f54d8d766f
Fred Quintana [Mon, 19 Sep 2011 20:59:21 +0000 (13:59 -0700)]
am
d88324d8: Fixed the javadoc for AccountManager.newChooseAccountIntent()
* commit '
d88324d8ab8b98bbc2c21551be3a8981ee431181':
Fixed the javadoc for AccountManager.newChooseAccountIntent()
Dianne Hackborn [Mon, 19 Sep 2011 20:34:15 +0000 (13:34 -0700)]
Merge "Maybe fix issue #
5340190: java.lang.RuntimeException: Unable to start..."
Andreas Huber [Mon, 19 Sep 2011 20:28:47 +0000 (13:28 -0700)]
Merge "Remove an O(n^2) algorithm in MPEG4Extractor.cpp to speed up seeks in long streams"
Dianne Hackborn [Mon, 19 Sep 2011 20:18:42 +0000 (13:18 -0700)]
Maybe fix issue #
5340190: java.lang.RuntimeException: Unable to start...
...activity ComponentInfo{com.google.android.apps.genie.geniewidget
Caused by: android.content.res.Resources$NotFoundException: Resource is not a ColorStateList (color or path): TypedValue{t=0x2/d=0x1010351 a=1}
at android.content.res.Resources.loadColorStateList(Resources.java:2042)
at android.content.res.TypedArray.getColorStateList(TypedArray.java:342)
at android.widget.TextView.<init>(TextView.java:763)
at android.widget.EditText.<init>(EditText.java:58)
at android.widget.EditText.<init>(EditText.java:54)
at android.preference.EditTextPreference.<init>(EditTextPreference.java:56)
at android.preference.EditTextPreference.<init>(EditTextPreference.java:71)
Change-Id: I55470759c8d08521630c7afaf4b303836c8011e0
David Brown [Mon, 19 Sep 2011 19:26:14 +0000 (12:26 -0700)]
Merge "Update code to use location aware isEmergencyNumber."
Andreas Huber [Mon, 19 Sep 2011 19:18:47 +0000 (12:18 -0700)]
Remove an O(n^2) algorithm in MPEG4Extractor.cpp to speed up seeks in long streams
containing B-frames.
Change-Id: Ie4dc734d2c2d5a5ce84674bb883f4b27e2278642
related-to-bug:
5336497
David Hu [Mon, 19 Sep 2011 19:11:11 +0000 (12:11 -0700)]
Merge "Return the bundle object"
Fred Quintana [Mon, 19 Sep 2011 18:43:05 +0000 (11:43 -0700)]
Fixed the javadoc for AccountManager.newChooseAccountIntent()
Change-Id: Ieb358fa3be46d793de1e04452819477cec786b5b
Fabrice Di Meglio [Mon, 19 Sep 2011 18:41:01 +0000 (11:41 -0700)]
Merge "Fix potential leak in TextLayouCache"
Fabrice Di Meglio [Mon, 19 Sep 2011 18:40:51 +0000 (11:40 -0700)]
Merge "Make TextLayoutCache no more dependent on ICU"
David Hu [Sat, 17 Sep 2011 01:08:35 +0000 (18:08 -0700)]
Return the bundle object
Added the ability for the test runner to return the bundle object
so the tests can get access to input arguments
Change-Id: I73a704bb2279238bd91a376aacecbe5f607af649
John Reck [Mon, 19 Sep 2011 18:07:28 +0000 (11:07 -0700)]
Merge "Bringing back the 'cache"
Gilles Debunne [Mon, 19 Sep 2011 17:50:16 +0000 (10:50 -0700)]
Merge "Bug
5290461: change voice IME underline span color"
Fred Quintana [Mon, 19 Sep 2011 17:46:03 +0000 (10:46 -0700)]
am
79a33ad4: Merge "Continuation of the unified account chooser flow." into ics-factoryrom
* commit '
79a33ad49e8dd54f36ea7ea5f1a275bf38daf5e8':
Continuation of the unified account chooser flow.
Fred Quintana [Mon, 19 Sep 2011 17:43:59 +0000 (10:43 -0700)]
Merge "Continuation of the unified account chooser flow." into ics-factoryrom
Dianne Hackborn [Mon, 19 Sep 2011 17:42:52 +0000 (10:42 -0700)]
Merge "Fix issue #
5260129: Suggestion strip in Talk app not showing all the time"
Dianne Hackborn [Mon, 19 Sep 2011 00:19:50 +0000 (17:19 -0700)]
Fix issue #
5260129: Suggestion strip in Talk app not showing all the time
Change-Id: Ibac6138f3b3b0c3850a30d2c432495aa57b7f3f1
Michael Jurka [Mon, 19 Sep 2011 17:34:39 +0000 (10:34 -0700)]
am
b0a1f197: Merge "Added "No recent apps" message on phones" into ics-factoryrom
* commit '
b0a1f197303d520d788ba11fcb0ac56f3a3c8604':
Added "No recent apps" message on phones
Michael Jurka [Mon, 19 Sep 2011 17:33:08 +0000 (10:33 -0700)]
Merge "Added "No recent apps" message on phones" into ics-factoryrom
Philip Milne [Mon, 19 Sep 2011 17:18:36 +0000 (10:18 -0700)]
Merge "Fix for http://b/issue?id=
5297155"
Amith Yamasani [Mon, 19 Sep 2011 17:03:14 +0000 (10:03 -0700)]
Merge "Make Volume control non-modal and allow touches underneath to take effect."
Jean-Michel Trivi [Mon, 19 Sep 2011 16:51:29 +0000 (09:51 -0700)]
am
2f153169: Merge "Bug
5300223 RemoteControlClient uses PendingIntent for media button events" into ics-factoryrom
* commit '
2f153169594249738d63aa6e2897d257f6b7d71e':
Bug
5300223 RemoteControlClient uses PendingIntent for media button events
Adam Powell [Mon, 19 Sep 2011 16:47:01 +0000 (09:47 -0700)]
Merge "Fix bug
5143751 - cts errors in android.app.cts.AlertDialog_BuilderTest"
Jean-Michel Trivi [Mon, 19 Sep 2011 16:46:32 +0000 (09:46 -0700)]
Merge "Bug
5300223 RemoteControlClient uses PendingIntent for media button events" into ics-factoryrom
John Reck [Sun, 18 Sep 2011 18:03:00 +0000 (11:03 -0700)]
Bringing back the 'cache
Bug:
5333083
Change-Id: I9b693ad0a0d4ee2979a7dabad6575ffada962b16
Andreas Huber [Mon, 19 Sep 2011 15:54:59 +0000 (08:54 -0700)]
Merge "In order to recover from video lagging behind audio, drop avc frames"
The Android Open Source Project [Mon, 19 Sep 2011 15:00:42 +0000 (08:00 -0700)]
Reconcile with ics-factoryrom-release
Change-Id: Ic1b2b256832ba7fc797180de3c0b29380f6355d9
The Android Automerger [Mon, 19 Sep 2011 13:28:09 +0000 (06:28 -0700)]
merge in ics-factoryrom-release history after reset to ics-factoryrom
Adam Powell [Mon, 19 Sep 2011 00:48:35 +0000 (17:48 -0700)]
Fix bug
5143751 - cts errors in android.app.cts.AlertDialog_BuilderTest
Change-Id: Ic532785d2c52bf65c3884665ffc53aabdf3253b9
Jeff Sharkey [Mon, 19 Sep 2011 00:03:15 +0000 (17:03 -0700)]
Merge "Sample atomic network stats buckets, full poll."
Justin Ho [Sun, 18 Sep 2011 23:58:20 +0000 (16:58 -0700)]
am
31f971b5: Merge "Properly adding scrubber pressed/selected state" into ics-factoryrom
* commit '
31f971b57f526e2688241080b30c7e8df33bf62d':
Properly adding scrubber pressed/selected state
Justin Ho [Sun, 18 Sep 2011 23:56:12 +0000 (16:56 -0700)]
Merge "Properly adding scrubber pressed/selected state" into ics-factoryrom
Adam Powell [Sun, 18 Sep 2011 23:52:12 +0000 (16:52 -0700)]
Merge "Fix bug
5279720 - Legacy theme EditText coloring"
Adam Powell [Sun, 18 Sep 2011 23:28:16 +0000 (16:28 -0700)]
Fix bug
5279720 - Legacy theme EditText coloring
Change-Id: Iced9d4d34b48bcf5d060a82fefd6d70a8c921e3f
Jeff Sharkey [Sun, 18 Sep 2011 20:30:23 +0000 (13:30 -0700)]
Sample atomic network stats buckets, full poll.
When sampling network stats, always use atomic buckets instead of
interpolating. Always poll iface and UID together so we distribute
into buckets equally. Move stale bucket trimming to just before
writing stats.
Bug:
5321340
Change-Id: I78a2226778a79c875f3668336e39ea24a7b4d5c4
Jeff Sharkey [Sun, 18 Sep 2011 23:21:38 +0000 (16:21 -0700)]
am
aaf30173: (-s ours) Merge "DO NOT MERGE: Sample atomic network stats buckets, full poll." into ics-factoryrom
* commit '
aaf301736e923db15918617145069658696be453':
DO NOT MERGE: Sample atomic network stats buckets, full poll.
Jeff Sharkey [Sun, 18 Sep 2011 23:20:00 +0000 (16:20 -0700)]
Merge "DO NOT MERGE: Sample atomic network stats buckets, full poll." into ics-factoryrom
Jeff Sharkey [Sun, 18 Sep 2011 20:30:23 +0000 (13:30 -0700)]
DO NOT MERGE: Sample atomic network stats buckets, full poll.
When sampling network stats, always use atomic buckets instead of
interpolating. Always poll iface and UID together so we distribute
into buckets equally. Move stale bucket trimming to just before
writing stats.
Bug:
5321340
Change-Id: I78a2226778a79c875f3668336e39ea24a7b4d5c4
Jeff Sharkey [Sun, 18 Sep 2011 23:17:39 +0000 (16:17 -0700)]
am
3d1d57dc: Merge "Collect and persist tethering stats." into ics-factoryrom
* commit '
3d1d57dcdb02ace6af5810bd4ec3f8fad5fc1799':
Collect and persist tethering stats.
Jeff Sharkey [Sun, 18 Sep 2011 23:15:51 +0000 (16:15 -0700)]
Merge "Collect and persist tethering stats." into ics-factoryrom
Adam Powell [Sun, 18 Sep 2011 22:39:05 +0000 (15:39 -0700)]
Merge "Fix bug
5333962 - Problems with no action bar/overlay action mode"
Fabrice Di Meglio [Sun, 18 Sep 2011 22:38:08 +0000 (15:38 -0700)]
Make TextLayoutCache no more dependent on ICU
- move ICU call to TextLayout
Change-Id: Id5a21e7b69e484536cfb5b86fbb0c112fb661dfa
Adam Powell [Sun, 18 Sep 2011 21:59:28 +0000 (14:59 -0700)]
Fix bug
5333962 - Problems with no action bar/overlay action mode
Change the standalone action mode window for overlay mode to be of
TYPE_APPLICATION. (This also fixes a bug where overflow menus would
not work properly on these types of action mode bars.)
Set exitFadeDuration on btn_cab_done_holo_* drawables.
Remove no-window-focus override selector states for selectable item
backgrounds to allow proper touch feedback on windows that do not have
focus but that the user can interact with.
Change-Id: Ib504866238708150d21e6183ff7b695869c05d3e
Dianne Hackborn [Sun, 18 Sep 2011 22:22:24 +0000 (15:22 -0700)]
Fix build.
Change-Id: Ife2b4b207270f8017d3acd80c76eaf1c7a50986d
Dianne Hackborn [Sun, 18 Sep 2011 21:53:27 +0000 (14:53 -0700)]
Merge "Fix issue #
5242779: Device not responding to touch on unlock screen"
Dianne Hackborn [Sun, 18 Sep 2011 21:43:08 +0000 (14:43 -0700)]
Fix issue #
5242779: Device not responding to touch on unlock screen
Rework how we decide when it is okay to turn on the screen by having
the policy call back to the power manager when it knows the lock screen
has been drawn.
Change-Id: Ie8f3f72111dcf7f168723e6dce24e0343b4afe5d
Fabrice Di Meglio [Sun, 18 Sep 2011 21:30:21 +0000 (14:30 -0700)]
Fix potential leak in TextLayouCache
- need a copy constructor for the key as the GenerationCache we are using
is actually a KeyedVector<K, sp<Entry<K, V> > >
- use the getText() API to access the text in the cache key
Change-Id: I5b60ebc062b62308ed7ac1284cfe2a9f28e2b8b1
Irfan Sheriff [Sun, 18 Sep 2011 20:31:12 +0000 (13:31 -0700)]
Merge "Retain DNS information from DHCP request"
Gilles Debunne [Sun, 18 Sep 2011 20:20:31 +0000 (13:20 -0700)]
Bug
5290461: change voice IME underline span color
Change-Id: I072cc480bfaabe9486261c695c88e845bfcd842e
Philip Milne [Sun, 18 Sep 2011 18:36:57 +0000 (11:36 -0700)]
Fix for http://b/issue?id=
5297155
. Make GridLayout dynamic (see below)
. Change access modifiers from private to package private
(to remove access$XX methods generated by compiler)
. Make private internal classes final (+10% perf)
. Update javadoc and add limitations section
. Improve error diagnostics
The bug above highlights the fact that GridLayout is a static
rather than dynamic layout - i.e. that the structure of the
grid could not be changed once it had been set up. This fix changes
GridLayout to a dynamic layout in which changes to its orientation,
rowCount and columnCount properties may be effected between layout
operations.
This change does not require a change to GridLayout's public API.
Change-Id: If5643574422dcfd3a557ce4db2bb19498dc6ecd8
Fabrice Di Meglio [Sun, 18 Sep 2011 19:58:47 +0000 (12:58 -0700)]
Merge "Revert "Fix bug #
5332081 TextLayoutCache needs to be able to have more cache hits""
Fabrice Di Meglio [Sun, 18 Sep 2011 19:54:38 +0000 (12:54 -0700)]
Revert "Fix bug #
5332081 TextLayoutCache needs to be able to have more cache hits"
This reverts commit
d686d76814f18061e06995df0d5de9feb9f70a7e
The Android Automerger [Sun, 18 Sep 2011 13:27:55 +0000 (06:27 -0700)]
merge in ics-factoryrom-release history after reset to ics-factoryrom
Dirk Dougherty [Sat, 17 Sep 2011 23:10:28 +0000 (16:10 -0700)]
Merge "doc change: fix attr name"
Dirk Dougherty [Sat, 17 Sep 2011 23:08:53 +0000 (16:08 -0700)]
doc change: fix attr name
Change-Id: Ida73a3f94f9abf969ebf3b44b07495bca924de10
Dirk Dougherty [Sat, 17 Sep 2011 22:57:55 +0000 (15:57 -0700)]
doc change: fix typo
Change-Id: Ib0e21fb53d3986ebb9f76dadc291ce9dfa42adf7
The Android Automerger [Sat, 17 Sep 2011 15:25:18 +0000 (08:25 -0700)]
Revert "work around a problem where fp registers get corrupted (DO NOT MERGE)"
This reverts commit
cc262b2b7b517a633c2c5936b71c1ab2551d5b2b.
Jeff Brown [Sat, 17 Sep 2011 06:30:52 +0000 (23:30 -0700)]
am
79aa4030: Merge "Can\'t stop the fling! Bug:
5335420" into ics-factoryrom
* commit '
79aa40302b643ee6c6227ee354a1b1378e721568':
Can't stop the fling! Bug:
5335420
Jeff Brown [Sat, 17 Sep 2011 06:29:15 +0000 (23:29 -0700)]
Merge "Can't stop the fling! Bug:
5335420" into ics-factoryrom
Fred Quintana [Sat, 17 Sep 2011 04:17:21 +0000 (21:17 -0700)]
Continuation of the unified account chooser flow.
- made the UI match the spec
- added ability to force the account chooser to appear
- added ability to pass in a description that will override the stock one
- added ability to pass in requiredFeatures for addAccount
- added ability to pass in an authTokenType for addAccount
Bug:
5293377
Change-Id: I243c0fd6598c943b1f65753e1f5d3c86629f64f5
Irfan Sheriff [Sat, 17 Sep 2011 05:03:09 +0000 (22:03 -0700)]
Retain DNS information from DHCP request
DHCP renewal can fail to fill DNS information. In such
a case retain info from DHCP request
Bug:
5314392
Change-Id: I2413f738be7c8c965ef9e7ffbc348e2738aa68b5
Wink Saville [Sat, 17 Sep 2011 05:02:31 +0000 (22:02 -0700)]
am
259db3f6: Merge "Have all connections disconnected before turning off radio." into ics-factoryrom
* commit '
259db3f66f8cbbf1eadec9c6b76d7e476318486c':
Have all connections disconnected before turning off radio.
Wink Saville [Sat, 17 Sep 2011 05:00:34 +0000 (22:00 -0700)]
Merge "Have all connections disconnected before turning off radio." into ics-factoryrom
Jeff Brown [Sat, 17 Sep 2011 04:40:49 +0000 (21:40 -0700)]
Can't stop the fling!
Bug:
5335420
Fixed a bug in VelocityTracker where the output velocity was
not being set to zero when not available.
Added a condition to ensure that the velocity is at least
the minimum fling velocity before continuing. If not, then
the user is trying to stop the fling and scroll more precisely.
Change-Id: I36634b0c3f7a9a09cf20c33f71d41163a8e33eed
Jeff Brown [Sat, 17 Sep 2011 04:03:15 +0000 (21:03 -0700)]
Merge "Revert "Forces AsyncTask to use the main looper Bug #
5333924""
Jeff Brown [Sat, 17 Sep 2011 03:44:06 +0000 (20:44 -0700)]
Revert "Forces AsyncTask to use the main looper Bug #
5333924"
This reverts commit
6dafefb0f44c4e57384e2ec3e08fefac5cc7e071
This change is breaking the system on startup with an NPE. Need to fix that first then resubmit.
Amith Yamasani [Sat, 17 Sep 2011 01:24:47 +0000 (18:24 -0700)]
Make Volume control non-modal and allow touches underneath to take effect.
Bug:
5308506 "Video" App halts playback when volume slider is present
Change-Id: Ib0672384b9074af73d729d1f64db62e5a8882d80
Wink Saville [Sat, 17 Sep 2011 00:53:50 +0000 (17:53 -0700)]
Have all connections disconnected before turning off radio.
Bug:
5306201
Change-Id: I8a121e5ed951f286b6f3edc70c468e86ccedfbf0
Tsu Chiang Chuang [Sat, 17 Sep 2011 00:48:35 +0000 (17:48 -0700)]
Merge "Force an update before we poll for the data."
Tsu Chiang Chuang [Sat, 17 Sep 2011 00:48:17 +0000 (17:48 -0700)]
Merge "add upload capabilities to data test."
Michael Jurka [Sat, 17 Sep 2011 00:04:40 +0000 (17:04 -0700)]
Added "No recent apps" message on phones
Change-Id: I00bf163369775b79377090b7a9dae0c94ce5d0ac
Mathias Agopian [Fri, 16 Sep 2011 23:59:52 +0000 (16:59 -0700)]
work around a problem where fp registers get corrupted (DO NOT MERGE)
Bug:
5331198
Change-Id: I1f9b4a79d34d63f8adb0555909998664ea2ea9ca
Mathias Agopian [Sat, 17 Sep 2011 00:09:33 +0000 (17:09 -0700)]
am
1afeea0f: (-s ours) Merge "work around a problem where fp registers get corrupted (DO NOT MERGE)" into ics-factoryrom
* commit '
1afeea0f207f8b8b781f799f5d150b70495abb1a':
work around a problem where fp registers get corrupted (DO NOT MERGE)
Mathias Agopian [Sat, 17 Sep 2011 00:08:21 +0000 (17:08 -0700)]
Merge "work around a problem where fp registers get corrupted (DO NOT MERGE)" into ics-factoryrom
Fabrice Di Meglio [Sat, 17 Sep 2011 00:07:08 +0000 (17:07 -0700)]
Merge "Fix bug #
5332081 TextLayoutCache needs to be able to have more cache hits"
Mathias Agopian [Fri, 16 Sep 2011 23:59:52 +0000 (16:59 -0700)]
work around a problem where fp registers get corrupted (DO NOT MERGE)
Bug:
5331198
Change-Id: I1f9b4a79d34d63f8adb0555909998664ea2ea9ca
Romain Guy [Fri, 16 Sep 2011 23:50:22 +0000 (16:50 -0700)]
Merge "Forces AsyncTask to use the main looper Bug #
5333924"
Romain Guy [Fri, 16 Sep 2011 23:20:17 +0000 (16:20 -0700)]
Merge "Clarify documentation of AdapterView.OnItemSelectedListener Bug #
5331587"
Justin Ho [Fri, 16 Sep 2011 23:19:47 +0000 (16:19 -0700)]
Properly adding scrubber pressed/selected state
Change-Id: Iea2e65bd8c00b56dd2828de03946ee1257547944
Eric Fischer [Fri, 16 Sep 2011 23:19:19 +0000 (16:19 -0700)]
am
a2a960b4: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-factoryrom
* commit '
a2a960b4a14f473f7677694973b5b9274eccc516':
Import revised translations. DO NOT MERGE
Eric Fischer [Fri, 16 Sep 2011 23:17:45 +0000 (16:17 -0700)]
Merge "Import revised translations. DO NOT MERGE" into ics-factoryrom
Romain Guy [Fri, 16 Sep 2011 23:16:36 +0000 (16:16 -0700)]
Clarify documentation of AdapterView.OnItemSelectedListener
Bug #
5331587
Change-Id: Ic3d6aca573639d6cae3abb45bfe821f5fd31f1bc
Jeff Sharkey [Fri, 16 Sep 2011 08:52:49 +0000 (01:52 -0700)]
Collect and persist tethering stats.
Use new "gettetherstats" netd command to retrieve statistics for
active tethering connections. Keep tethering poll events separate
from UID poll, even though they end up same historical structures.
Bug:
5244846
Change-Id: Ia0c5165f6712c12b51586f86c331a2aad4ad6afb
Romain Guy [Fri, 16 Sep 2011 23:00:59 +0000 (16:00 -0700)]
Forces AsyncTask to use the main looper
Bug #
5333924
This might break applications trying to use AsyncTask on a looper
that is not the main thread, but such apps would already have
issues (AsyncTask has a single static handler and attempting to
use AsyncTask outside of the main thread would likely result
in weird threading issues in other parts of the app.)
Change-Id: Ibbf480627fc7b91326a27d4f5e5af49e8c5b5115
Andreas Huber [Fri, 16 Sep 2011 22:09:22 +0000 (15:09 -0700)]
In order to recover from video lagging behind audio, drop avc frames
that are not referenced by other frames before feeding them into the decoder.
Change-Id: I822190af8f8329567bff8da1ea23136d0a765481
Eric Fischer [Fri, 16 Sep 2011 22:18:46 +0000 (15:18 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: Ibae2079f2de6ae74d12a88e3c6f6f52b3010990f
Jeff Sharkey [Fri, 16 Sep 2011 22:11:06 +0000 (15:11 -0700)]
Merge "Fix "am profile" when run on system_server."
Jean-Michel Trivi [Fri, 16 Sep 2011 22:02:43 +0000 (15:02 -0700)]
am
f79ec360: Merge "Fix bug
5327199 Recycle bitmaps in RemoteControlClient" into ics-factoryrom
* commit '
f79ec360984011c49c52b7a19b96cbbc932df4be':
Fix bug
5327199 Recycle bitmaps in RemoteControlClient
Jean-Michel Trivi [Fri, 16 Sep 2011 22:01:06 +0000 (15:01 -0700)]
Merge "Fix bug
5327199 Recycle bitmaps in RemoteControlClient" into ics-factoryrom
Justin Ho [Fri, 16 Sep 2011 21:49:17 +0000 (14:49 -0700)]
am
218148f1: Merge "Revert "Adding selected state for scrubber control"" into ics-factoryrom
* commit '
218148f1ffb574282bdc72a1a4cc97b7129cf043':
Revert "Adding selected state for scrubber control"
Justin Ho [Fri, 16 Sep 2011 21:47:54 +0000 (14:47 -0700)]
Merge "Revert "Adding selected state for scrubber control"" into ics-factoryrom
Justin Ho [Fri, 16 Sep 2011 21:47:40 +0000 (14:47 -0700)]
Revert "Adding selected state for scrubber control"
This reverts commit
a11aeeb36560959db321f9757d4c5eccfdfa7f63
John Reck [Fri, 16 Sep 2011 21:24:33 +0000 (14:24 -0700)]
Merge "Don't switch to handle drag mode when starting selection"
Justin Ho [Fri, 16 Sep 2011 21:16:53 +0000 (14:16 -0700)]
am
5855c0ca: Merge "Adding selected state for scrubber control" into ics-factoryrom
* commit '
5855c0ca68de7103e59e4a6e6996fba528cabd9a':
Adding selected state for scrubber control
Justin Ho [Fri, 16 Sep 2011 21:15:04 +0000 (14:15 -0700)]
Merge "Adding selected state for scrubber control" into ics-factoryrom
Justin Ho [Fri, 16 Sep 2011 19:59:05 +0000 (12:59 -0700)]
Adding selected state for scrubber control
Change-Id: I63147c80f7849d28ffe15d97e0b7e3f5c7bea5e1
Nick Kralevich [Fri, 16 Sep 2011 20:56:16 +0000 (13:56 -0700)]
Merge "AudioResampler: use relative instead of absolute labels"
Fabrice Di Meglio [Wed, 14 Sep 2011 19:10:00 +0000 (12:10 -0700)]
Fix bug #
5332081 TextLayoutCache needs to be able to have more cache hits
- makes TextLayoutCache not carring about start/count. Basically he will cache the result for
the full string and gives back the "chunk" corresponding to start/count
- changed the TextLayoutCacheValue API to take start/count parameters
- added the Harfbuzz LogClusters in TextLayoutCacheValue as it is needed for extracting the start/count "chunk"
- fix potential issue of cache key leaking
Change-Id: I9276f9bec744e8de36349acfba8429f7c6f83394
Jeff Brown [Fri, 16 Sep 2011 20:44:40 +0000 (13:44 -0700)]
am
a82f4483: (-s ours) Merge "Make LTE_FLOAT a strict weak order. (DO NOT MERGE) Bug:
5327776" into ics-factoryrom
* commit '
a82f448373ca0f0e67fb52a2bdc489c4ed0b17ac':
Make LTE_FLOAT a strict weak order. (DO NOT MERGE) Bug:
5327776