Fabrice Di Meglio
447e482771
am 6c2d9a14: Merge "TextLayoutCache code refactoring"
...
* commit '6c2d9a14bf6048c5a1217d61246874c076eb9d20':
TextLayoutCache code refactoring
2011-09-19 15:08:52 -07:00
Fabrice Di Meglio
4dd99e5912
TextLayoutCache code refactoring
...
- use vector (instead of array) for advances and glyphs
- reverse glyphs directly in computeRunValuesWithHarfbuzz() (instead of reversing them after)
Change-Id: I716a8f914fd043818d7cb80cca76ee5fb0effb96
2011-09-19 14:46:37 -07:00
Fred Quintana
577f439ed4
am d30d2aae: am d88324d8: Fixed the javadoc for AccountManager.newChooseAccountIntent()
...
* commit 'd30d2aae108a132ac6ee04cdf29cbec50cc73320':
Fixed the javadoc for AccountManager.newChooseAccountIntent()
2011-09-19 14:02:09 -07:00
Fred Quintana
d30d2aae10
am d88324d8: Fixed the javadoc for AccountManager.newChooseAccountIntent()
...
* commit 'd88324d8ab8b98bbc2c21551be3a8981ee431181':
Fixed the javadoc for AccountManager.newChooseAccountIntent()
2011-09-19 13:59:21 -07:00
Dianne Hackborn
e649ce8138
am 735e8576: Merge "Maybe fix issue #5340190 : java.lang.RuntimeException: Unable to start..."
...
* commit '735e85769f10966267afd490204de6e388307fe5':
Maybe fix issue #5340190 : java.lang.RuntimeException: Unable to start...
2011-09-19 13:36:08 -07:00
Dianne Hackborn
735e85769f
Merge "Maybe fix issue #5340190 : java.lang.RuntimeException: Unable to start..."
2011-09-19 13:34:15 -07:00
Dianne Hackborn
2ee1ffb144
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
2011-09-19 13:18:42 -07:00
Fred Quintana
d88324d8ab
Fixed the javadoc for AccountManager.newChooseAccountIntent()
...
Change-Id: Ieb358fa3be46d793de1e04452819477cec786b5b
2011-09-19 11:46:33 -07:00
Fabrice Di Meglio
8ab6a05283
am e0d558ac: Merge "Fix potential leak in TextLayouCache"
...
* commit 'e0d558ac92cd9e550b3d08bf09d9bb12c2a506c6':
Fix potential leak in TextLayouCache
2011-09-19 11:43:04 -07:00
Fabrice Di Meglio
91199ad130
am 42b04f6f: Merge "Make TextLayoutCache no more dependent on ICU"
...
* commit '42b04f6fa8629dd480ab824d41c544a28e1c83a8':
Make TextLayoutCache no more dependent on ICU
2011-09-19 11:43:01 -07:00
Fabrice Di Meglio
e0d558ac92
Merge "Fix potential leak in TextLayouCache"
2011-09-19 11:41:01 -07:00
Fabrice Di Meglio
42b04f6fa8
Merge "Make TextLayoutCache no more dependent on ICU"
2011-09-19 11:40:51 -07:00
John Reck
9ac88c4de0
am 2210fff4: Merge "Bringing back the \'cache"
...
* commit '2210fff475e2d4ef6f5cf20eaa0a183058bfb68a':
Bringing back the 'cache
2011-09-19 11:09:36 -07:00
John Reck
2210fff475
Merge "Bringing back the 'cache"
2011-09-19 11:07:28 -07:00
Gilles Debunne
9dcf4762f7
am c630eb6a: Merge "Bug 5290461: change voice IME underline span color"
...
* commit 'c630eb6a9ae3e3a088223263ae2ee5213c7614b4':
Bug 5290461: change voice IME underline span color
2011-09-19 10:51:29 -07:00
Gilles Debunne
c630eb6a9a
Merge "Bug 5290461: change voice IME underline span color"
2011-09-19 10:50:16 -07:00
Fred Quintana
9bb9cdd17f
am 45ae3e50: am 79a33ad4: Merge "Continuation of the unified account chooser flow." into ics-factoryrom
...
* commit '45ae3e50ec8672a85edfd89827334987d0862ee0':
Continuation of the unified account chooser flow.
2011-09-19 10:47:44 -07:00
Fred Quintana
45ae3e50ec
am 79a33ad4: Merge "Continuation of the unified account chooser flow." into ics-factoryrom
...
* commit '79a33ad49e8dd54f36ea7ea5f1a275bf38daf5e8':
Continuation of the unified account chooser flow.
2011-09-19 10:46:03 -07:00
Dianne Hackborn
b2aef1bcbd
am ada259eb: Merge "Fix issue #5260129 : Suggestion strip in Talk app not showing all the time"
...
* commit 'ada259ebeec388183c7341c95331e59802b70281':
Fix issue #5260129 : Suggestion strip in Talk app not showing all the time
2011-09-19 10:45:30 -07:00
Fred Quintana
79a33ad49e
Merge "Continuation of the unified account chooser flow." into ics-factoryrom
2011-09-19 10:43:59 -07:00
Dianne Hackborn
bc82385706
Fix issue #5260129 : Suggestion strip in Talk app not showing all the time
...
Change-Id: Ibac6138f3b3b0c3850a30d2c432495aa57b7f3f1
2011-09-19 10:41:43 -07:00
Philip Milne
cfb1805e49
am a9390979: Merge "Fix for http://b/issue?id=5297155 "
...
* commit 'a93909792c6f9657780a4cc358c20eda88a94a1b':
Fix for http://b/issue?id=5297155
2011-09-19 10:19:50 -07:00
Philip Milne
a93909792c
Merge "Fix for http://b/issue?id=5297155 "
2011-09-19 10:18:36 -07:00
Amith Yamasani
2da3f88571
am 4943b3aa: Merge "Make Volume control non-modal and allow touches underneath to take effect."
...
* commit '4943b3aa360033c0eae9e5b67c7491b25ea9ae07':
Make Volume control non-modal and allow touches underneath to take effect.
2011-09-19 10:06:02 -07:00
Jean-Michel Trivi
84c7e31d7d
am b3e6eab1: am 2f153169: Merge "Bug 5300223 RemoteControlClient uses PendingIntent for media button events" into ics-factoryrom
...
* commit 'b3e6eab16153c28a30525a7c26fb7a153a5548f4':
Bug 5300223 RemoteControlClient uses PendingIntent for media button events
2011-09-19 10:03:56 -07:00
Amith Yamasani
4943b3aa36
Merge "Make Volume control non-modal and allow touches underneath to take effect."
2011-09-19 10:03:14 -07:00
Jean-Michel Trivi
b3e6eab161
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
2011-09-19 09:51:29 -07:00
Adam Powell
ff1a816657
am bd1bb1d0: Merge "Fix bug 5143751 - cts errors in android.app.cts.AlertDialog_BuilderTest"
...
* commit 'bd1bb1d07530b1cee4b7e395f8bf3c67c5db3f7f':
Fix bug 5143751 - cts errors in android.app.cts.AlertDialog_BuilderTest
2011-09-19 09:50:41 -07:00
Adam Powell
bd1bb1d075
Merge "Fix bug 5143751 - cts errors in android.app.cts.AlertDialog_BuilderTest"
2011-09-19 09:47:01 -07:00
Jean-Michel Trivi
2f15316959
Merge "Bug 5300223 RemoteControlClient uses PendingIntent for media button events" into ics-factoryrom
2011-09-19 09:46:32 -07:00
Jeff Sharkey
e56156eee5
am 4f92c9bb: Merge "Sample atomic network stats buckets, full poll."
...
* commit '4f92c9bb8d8484fc9a0dfc1549beedbd1ae8bf01':
Sample atomic network stats buckets, full poll.
2011-09-19 09:44:06 -07:00
Justin Ho
333cab9351
am b9285599: am 31f971b5: Merge "Properly adding scrubber pressed/selected state" into ics-factoryrom
...
* commit 'b9285599ab7cb9f735ab57821c30a841a5170eba':
Properly adding scrubber pressed/selected state
2011-09-19 09:44:03 -07:00
Adam Powell
60b4ac64ba
am 932ec7de: Merge "Fix bug 5279720 - Legacy theme EditText coloring"
...
* commit '932ec7deaddbd958229693d96e481c88c9afe124':
Fix bug 5279720 - Legacy theme EditText coloring
2011-09-19 09:43:59 -07:00
John Reck
0966dd22ec
Bringing back the 'cache
...
Bug: 5333083
Change-Id: I9b693ad0a0d4ee2979a7dabad6575ffada962b16
2011-09-19 09:12:27 -07:00
Adam Powell
cbff417962
Fix bug 5143751 - cts errors in android.app.cts.AlertDialog_BuilderTest
...
Change-Id: Ic532785d2c52bf65c3884665ffc53aabdf3253b9
2011-09-18 17:49:27 -07:00
Jeff Sharkey
4f92c9bb8d
Merge "Sample atomic network stats buckets, full poll."
2011-09-18 17:03:15 -07:00
Justin Ho
b9285599ab
am 31f971b5: Merge "Properly adding scrubber pressed/selected state" into ics-factoryrom
...
* commit '31f971b57f526e2688241080b30c7e8df33bf62d':
Properly adding scrubber pressed/selected state
2011-09-18 16:58:20 -07:00
Justin Ho
31f971b57f
Merge "Properly adding scrubber pressed/selected state" into ics-factoryrom
2011-09-18 16:56:12 -07:00
Adam Powell
932ec7dead
Merge "Fix bug 5279720 - Legacy theme EditText coloring"
2011-09-18 16:52:12 -07:00
Adam Powell
ac0f0d5792
Fix bug 5279720 - Legacy theme EditText coloring
...
Change-Id: Iced9d4d34b48bcf5d060a82fefd6d70a8c921e3f
2011-09-18 16:28:16 -07:00
Jeff Sharkey
34c73acf88
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
2011-09-18 16:27:21 -07:00
Jeff Sharkey
aaf301736e
Merge "DO NOT MERGE: Sample atomic network stats buckets, full poll." into ics-factoryrom
2011-09-18 16:20:00 -07:00
Jeff Sharkey
c57f411211
am ff2aff2a: am 3d1d57dc: Merge "Collect and persist tethering stats." into ics-factoryrom
...
* commit 'ff2aff2ac18daa758e5d51a4fd58976ce5f66d46':
Collect and persist tethering stats.
2011-09-18 16:19:42 -07:00
Jeff Sharkey
1f0b13b9d6
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
2011-09-18 16:17:51 -07:00
Jeff Sharkey
ff2aff2ac1
am 3d1d57dc: Merge "Collect and persist tethering stats." into ics-factoryrom
...
* commit '3d1d57dcdb02ace6af5810bd4ec3f8fad5fc1799':
Collect and persist tethering stats.
2011-09-18 16:17:39 -07:00
Jeff Sharkey
3d1d57dcdb
Merge "Collect and persist tethering stats." into ics-factoryrom
2011-09-18 16:15:51 -07:00
Adam Powell
e891e7ab87
am d413eb38: Merge "Fix bug 5333962 - Problems with no action bar/overlay action mode"
...
* commit 'd413eb3861aae87386d418e9af4875f6f330cd05':
Fix bug 5333962 - Problems with no action bar/overlay action mode
2011-09-18 15:40:41 -07:00
Adam Powell
d413eb3861
Merge "Fix bug 5333962 - Problems with no action bar/overlay action mode"
2011-09-18 15:39:05 -07:00
Fabrice Di Meglio
54dc642cc1
Make TextLayoutCache no more dependent on ICU
...
- move ICU call to TextLayout
Change-Id: Id5a21e7b69e484536cfb5b86fbb0c112fb661dfa
2011-09-18 15:38:08 -07:00
Adam Powell
8ee6d7c20e
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
2011-09-18 15:34:00 -07:00