Peter Ng
cb61187783
Merge "Keyguard padding fixes"
2011-09-19 19:01:58 -07:00
Justin Ho
f2ff20e05b
Merge "Tuning Overscroller's scroll curve Softer end + rounder curve with less contrast Bug: 5200575"
2011-09-19 18:06:13 -07:00
Justin Ho
a181bb4b8c
Tuning Overscroller's scroll curve
...
Softer end + rounder curve with less contrast
Bug: 5200575
Change-Id: Icff6ba3cf7ae052c80b2e80e2d2b07085fcb40ce
2011-09-19 17:52:06 -07:00
Fred Quintana
029749e2ad
am acfd5ebb: Merge "An extra is being written as one type and read as the wrong type." into ics-factoryrom
...
* commit 'acfd5ebb49bde9f64c604dfca5cbed8cafa64594':
An extra is being written as one type and read as the wrong type.
2011-09-19 17:33:20 -07:00
Fred Quintana
acfd5ebb49
Merge "An extra is being written as one type and read as the wrong type." into ics-factoryrom
2011-09-19 17:30:44 -07:00
Fred Quintana
a77253a417
An extra is being written as one type and read as the wrong type.
...
Bug: 5342556
Change-Id: I664bd84546cb8da2936c5afe65381336a97ef5cd
2011-09-19 16:26:37 -07:00
Jeff Brown
4b5441a720
Merge "TextLayoutCacheKey needs to store start and count."
2011-09-19 16:25:51 -07:00
Jeff Brown
7aac297960
TextLayoutCacheKey needs to store start and count.
...
Bad merge.
Change-Id: Id6507b3a7e35808a6d34501a45d79fcb7470657d
2011-09-19 16:19:13 -07:00
Jean-Michel Trivi
dede70744a
am 6c038506: Merge "Fix bug 5300223 Lockscreen should recycle bitmaps" into ics-factoryrom
...
* commit '6c03850616a6e87de3e1943e47605cc5ebb20e2b':
Fix bug 5300223 Lockscreen should recycle bitmaps
2011-09-19 15:39:31 -07:00
Jean-Michel Trivi
6c03850616
Merge "Fix bug 5300223 Lockscreen should recycle bitmaps" into ics-factoryrom
2011-09-19 15:37:23 -07:00
John Reck
50f95b42cc
Merge "Disable extract mode in find on page"
2011-09-19 15:27:07 -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
John Reck
9a2183f7a9
Disable extract mode in find on page
...
Bug: 2641348
Change-Id: Ib3ad0d5f47b5269cebff855a269eac8b3b11756a
2011-09-19 14:26:11 -07:00
Dianne Hackborn
2c2ab5864f
Fix issue #5260129 : Suggestion strip in Talk app not showing all the time
2011-09-19 13:59:39 -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
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
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
Jean-Michel Trivi
01d96bd2af
Fix bug 5300223 Lockscreen should recycle bitmaps
...
When receiving a new bitmap to display, the lockscreen should
recycle the old bitmap (if any).
Change-Id: Ic4f65a797dfe7e3cae7a0559f6333cc99e2ae1e7
2011-09-19 11:17:02 -07:00
John Reck
2210fff475
Merge "Bringing back the 'cache"
2011-09-19 11:07:28 -07:00
Gilles Debunne
c630eb6a9a
Merge "Bug 5290461: change voice IME underline span color"
2011-09-19 10:50:16 -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
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
a93909792c
Merge "Fix for http://b/issue?id=5297155 "
2011-09-19 10:18:36 -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
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
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
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
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
Dianne Hackborn
2f7d7c9bdb
Merge "Fix issue #5242779 : Device not responding to touch on unlock screen"
2011-09-18 14:53:27 -07:00
Dianne Hackborn
38e29a61d0
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
2011-09-18 14:52:52 -07:00
Fabrice Di Meglio
e74fef3b55
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
2011-09-18 14:30:21 -07:00
Irfan Sheriff
04e3bb6d32
Merge "Retain DNS information from DHCP request"
2011-09-18 13:31:12 -07:00