Joe Onorato
10f4126a36
resolved conflicts for merge of faf083ef to master
...
Change-Id: I316a1b4356f6dba6c3880ccb02dbb2fa00d21a85
2011-01-24 13:16:08 -08:00
Adam Powell
a19ca02ce2
am b4ae633d: am 2bed570b: Fix bug 3367627 - spontaneous crash
...
* commit 'b4ae633df775f99c4c0e47da228d71489d44b353':
Fix bug 3367627 - spontaneous crash
2011-01-23 23:44:35 -08:00
Joe Onorato
c8146b5308
am 680e7711: am 2cd06609: Merge "Fix typo that causes brigtness to be wrong." into honeycomb
...
* commit '680e77116cbe34ce0f012639bf074abe1253d53c':
Fix typo that causes brigtness to be wrong.
2011-01-23 23:44:30 -08:00
Adam Powell
8aca17f1e0
am 9c01f219: am 7ed3d005: Merge "Fix bug 3380292 - long title in actionbar context mode pushes buttons over edge" into honeycomb
...
* commit '9c01f219503e9bd62127fb85e1d4f5c7f59291cb':
Fix bug 3380292 - long title in actionbar context mode pushes buttons over edge
2011-01-23 23:44:24 -08:00
Joe Onorato
faf083ef0b
am 4c541b13: Merge "visibility ("lights out") API." into honeycomb
...
* commit '4c541b1303b0ee2b9b0d19bee85d3780c5c4c110':
visibility ("lights out") API.
2011-01-23 23:36:57 -08:00
Adam Powell
b4ae633df7
am 2bed570b: Fix bug 3367627 - spontaneous crash
...
* commit '2bed570bba183249c6ca9ca1151d1d23808de8c1':
Fix bug 3367627 - spontaneous crash
2011-01-23 23:36:52 -08:00
Joe Onorato
680e77116c
am 2cd06609: Merge "Fix typo that causes brigtness to be wrong." into honeycomb
...
* commit '2cd06609b4564d4991e9bf79301fde0bb53833ed':
Fix typo that causes brigtness to be wrong.
2011-01-23 23:36:37 -08:00
Adam Powell
9c01f21950
am 7ed3d005: Merge "Fix bug 3380292 - long title in actionbar context mode pushes buttons over edge" into honeycomb
...
* commit '7ed3d005ac5ed26221ccc3596c0b81522909ca76':
Fix bug 3380292 - long title in actionbar context mode pushes buttons over edge
2011-01-23 23:36:25 -08:00
Joe Onorato
4c541b1303
Merge "visibility ("lights out") API." into honeycomb
2011-01-23 19:26:13 -08:00
Joe Onorato
664644d9e0
visibility ("lights out") API.
...
1. Views may setSystemUiVisibility() to recommend that
the system chrome (status bar or other UI) show or hide
itself. (This functionality was previously available only
via the FLAG_FULLSCREEN window flag for some SystemUI
implementations.)
2. Views may register a OnSystemUiVisibilityChangedListener
on a view, and find out when the system UI actually
appears or disappears, allowing apps to coordinate the
appearance of their own UI if desired.
Bug: 3241144
Change-Id: Ia1758d94099182d49a1e3688ea2738ae4995b829
2011-01-23 19:22:52 -08:00
Adam Powell
2bed570bba
Fix bug 3367627 - spontaneous crash
...
Fix a little-traversed codepath that could cause some grief.
Change-Id: I75e6931c3208a0f18b40446f23a2fdd5a0065ce8
2011-01-23 19:20:43 -08:00
Joe Onorato
2cd06609b4
Merge "Fix typo that causes brigtness to be wrong." into honeycomb
2011-01-23 18:26:02 -08:00
Adam Powell
7ed3d005ac
Merge "Fix bug 3380292 - long title in actionbar context mode pushes buttons over edge" into honeycomb
2011-01-23 18:16:09 -08:00
Adam Powell
b0ff6f9955
Fix bug 3380292 - long title in actionbar context mode pushes buttons over edge
...
Also adjust default web text selection menu to allow overflow, preventing items
from being cut off in portrait or on smaller screens.
Change-Id: I686c9a8daab31a38c2fcb75ee1402f09f568c238
2011-01-23 18:07:45 -08:00
Dianne Hackborn
ee18bc7e3c
am 802fb15d: am 9476f045: Merge "Fix issue #3215261 : NPE in WiFi Settings" into honeycomb
...
* commit '802fb15d2a9d6e094627c561100aabbac3689d94':
Fix issue #3215261 : NPE in WiFi Settings
2011-01-23 17:50:23 -08:00
Dianne Hackborn
802fb15d2a
am 9476f045: Merge "Fix issue #3215261 : NPE in WiFi Settings" into honeycomb
...
* commit '9476f04590ebea2d74ebb60775f2648323239512':
Fix issue #3215261 : NPE in WiFi Settings
2011-01-23 17:48:23 -08:00
Dianne Hackborn
9476f04590
Merge "Fix issue #3215261 : NPE in WiFi Settings" into honeycomb
2011-01-23 17:45:59 -08:00
Dianne Hackborn
89ba6750e5
Fix issue #3215261 : NPE in WiFi Settings
...
And also fix #3343369 : EGL_BAD_DISPLAY and/or broadcast intent
TIME_SET before boot completion
And a few more tweaks to animations to keep the wallpaper displayed
when needed.
And make more use of the drag and drop "rotation disabled" thing to
also use it while animating the screen rotation, since if we try to
start a new rotation while doing the animation we end up with a mess.
Change-Id: I373af305a6e23a92835abed96229a83e173f67ce
2011-01-23 17:35:08 -08:00
Adam Powell
bb5536015a
am ab847acd: am 12e2500b: Merge "Fix bug 3381563 - fix segmented button styles" into honeycomb
...
* commit 'ab847acd5e116cc60efbc6ac5a332ee5353966c0':
Fix bug 3381563 - fix segmented button styles
2011-01-23 17:13:34 -08:00
Adam Powell
ab847acd5e
am 12e2500b: Merge "Fix bug 3381563 - fix segmented button styles" into honeycomb
...
* commit '12e2500b27cf53880baff5bcdc6c30868ecde744':
Fix bug 3381563 - fix segmented button styles
2011-01-23 17:10:57 -08:00
Jim Miller
6cda2dd5f8
am 62a01eca: am 93727e84: Merge "Fix 3373106: add hint text to PasswordUnlock" into honeycomb
...
* commit '62a01eca1d40217ce9bcae0734168b98f0534fb3':
Fix 3373106: add hint text to PasswordUnlock
2011-01-23 17:10:24 -08:00
Jim Miller
62a01eca1d
am 93727e84: Merge "Fix 3373106: add hint text to PasswordUnlock" into honeycomb
...
* commit '93727e845fa73f3397ccbe4416a5781bb5003883':
Fix 3373106: add hint text to PasswordUnlock
2011-01-23 17:08:43 -08:00
Adam Powell
12e2500b27
Merge "Fix bug 3381563 - fix segmented button styles" into honeycomb
2011-01-23 17:07:59 -08:00
Jim Miller
93727e845f
Merge "Fix 3373106: add hint text to PasswordUnlock" into honeycomb
2011-01-23 17:06:42 -08:00
Adam Powell
3169a0860c
Fix bug 3381563 - fix segmented button styles
...
Change-Id: Ie191ef55548f2035012f643ad6ef434a4b10fff0
2011-01-23 17:03:48 -08:00
Joe Onorato
fac86056b2
Fix typo that causes brigtness to be wrong.
...
Bug: 3351558
Change-Id: I4409c44db15a35be98ba0b0f2c28ed939494495a
2011-01-23 17:03:36 -08:00
Jesse Wilson
dbdba33f95
am 9fa533c2: am e2be3416: Merge "Don\'t call broken+deprecated SamplingProfiler.writeHprofData" into honeycomb
...
* commit '9fa533c26e4597edc3d09bad3bc43bf11313eab6':
Don't call broken+deprecated SamplingProfiler.writeHprofData
2011-01-23 17:01:33 -08:00
Romain Guy
8d1a57de92
am 65cd377a: am 60c06092: Merge "Fix bitmap meshes to work in display lists." into honeycomb
...
* commit '65cd377a9f843e8baf9f12b94ef0b6dcda3beeac':
Fix bitmap meshes to work in display lists.
2011-01-23 17:01:27 -08:00
Dianne Hackborn
4b70481d4b
am c55d2b66: am 781955ea: Merge "aapt: Allow raw "%" in unformatted string-arrays" into honeycomb
...
* commit 'c55d2b6680e1085ce0b95fd7df0b18393f0324b6':
aapt: Allow raw "%" in unformatted string-arrays
2011-01-23 17:01:22 -08:00
Justin Ho
b7b005c7c9
am 37f78275: am e0164cd5: Updated legacy radio buttons (mdpi)
...
* commit '37f78275ffc18ca1149c52f98c257ebad22fd433':
Updated legacy radio buttons (mdpi)
2011-01-23 17:01:18 -08:00
Romain Guy
e3ba084285
am ff42d952: am 502d41d8: Merge "Add support for arcs." into honeycomb
...
* commit 'ff42d952ebb1d5393951f1644ee3d1b9e0fbc9e5':
Add support for arcs.
2011-01-23 17:00:57 -08:00
Adam Powell
02b74a07de
am b2d7b02c: am 8ccea78c: Merge "Fix bug 3299208 - Some apps\' dialogs aren\'t show()ing successfully" into honeycomb
...
* commit 'b2d7b02c4f3e2a43e65985edc70db52e257dd673':
Fix bug 3299208 - Some apps' dialogs aren't show()ing successfully
2011-01-23 17:00:52 -08:00
Dianne Hackborn
0a10bab2b9
am 8c92a342: am 9d97b63d: Honeycomb is now officially API 11.
...
* commit '8c92a3429403a158ce10295131f221e2f683c575':
Honeycomb is now officially API 11.
2011-01-23 17:00:31 -08:00
Dianne Hackborn
a0d161d07e
am 38433e2d: am b4ca900d: Merge "Final (hopefully) API cleanup." into honeycomb
...
* commit '38433e2dae1dcb8645c9f1b77445513156d88a7c':
Final (hopefully) API cleanup.
2011-01-23 17:00:01 -08:00
Jesse Wilson
9fa533c26e
am e2be3416: Merge "Don\'t call broken+deprecated SamplingProfiler.writeHprofData" into honeycomb
...
* commit 'e2be3416f2851a5bc482ad103c771f212e88ef20':
Don't call broken+deprecated SamplingProfiler.writeHprofData
2011-01-23 16:42:58 -08:00
Jesse Wilson
e2be3416f2
Merge "Don't call broken+deprecated SamplingProfiler.writeHprofData" into honeycomb
2011-01-23 16:40:53 -08:00
Romain Guy
65cd377a9f
am 60c06092: Merge "Fix bitmap meshes to work in display lists." into honeycomb
...
* commit '60c060929f41447c5ac3a75c1cd6cfb60b139200':
Fix bitmap meshes to work in display lists.
2011-01-23 16:35:56 -08:00
Romain Guy
60c060929f
Merge "Fix bitmap meshes to work in display lists." into honeycomb
2011-01-23 16:34:08 -08:00
Romain Guy
a566b7c3aa
Fix bitmap meshes to work in display lists.
...
Change-Id: Ie226d049840942d9ad9cf58e0c19132f49d62a75
2011-01-23 16:36:11 -08:00
Dianne Hackborn
c55d2b6680
am 781955ea: Merge "aapt: Allow raw "%" in unformatted string-arrays" into honeycomb
...
* commit '781955eae61a2464ff1a7a06602038b0c7f6d7a4':
aapt: Allow raw "%" in unformatted string-arrays
2011-01-23 16:32:43 -08:00
Dianne Hackborn
781955eae6
Merge "aapt: Allow raw "%" in unformatted string-arrays" into honeycomb
2011-01-23 16:30:53 -08:00
Justin Ho
37f78275ff
am e0164cd5: Updated legacy radio buttons (mdpi)
...
* commit 'e0164cd5630d53f0543f4c05b78016087797fe25':
Updated legacy radio buttons (mdpi)
2011-01-23 16:19:19 -08:00
Justin Ho
e0164cd563
Updated legacy radio buttons (mdpi)
...
Change-Id: Id17077b8f216d193eb6f6ae65b5d4e158116aeef
2011-01-23 16:16:03 -08:00
Romain Guy
8b2f5267f1
Add support for arcs.
...
Change-Id: I96c057ff4eb1b464b03f132da0b85333777bee4f
2011-01-23 16:15:02 -08:00
Romain Guy
ff42d952eb
am 502d41d8: Merge "Add support for arcs." into honeycomb
...
* commit '502d41d85958fb729a17e0651e80134e1c41c621':
Add support for arcs.
2011-01-23 16:14:49 -08:00
Romain Guy
502d41d859
Merge "Add support for arcs." into honeycomb
2011-01-23 16:12:50 -08:00
Adam Powell
b2d7b02c4f
am 8ccea78c: Merge "Fix bug 3299208 - Some apps\' dialogs aren\'t show()ing successfully" into honeycomb
...
* commit '8ccea78c01a6098e96189799b46b72cbfeba7bae':
Fix bug 3299208 - Some apps' dialogs aren't show()ing successfully
2011-01-23 16:12:45 -08:00
Jim Miller
a1224a684d
Fix 3373106: add hint text to PasswordUnlock
...
Change-Id: Ie0a5081cf74da551a161f46457b987bcdcef2127
2011-01-23 16:11:44 -08:00
Adam Powell
8ccea78c01
Merge "Fix bug 3299208 - Some apps' dialogs aren't show()ing successfully" into honeycomb
2011-01-23 16:09:54 -08:00
Josh Stone
02feeb4b2b
aapt: Allow raw "%" in unformatted string-arrays
...
Commit 15fe2cb added format checking for translatable strings, enforcing
the use of positional args. This check can be disabled on <string>
values with translatable="false" or formatted="false". But they didn't
check for those attributes on <string-array>, so some of CM's strings
fail when they're not really format strings, just because they contain
percent signs. (e.g. brightness widget's "Auto/Dim/40%/100%")
So now the formatted/translatable attributes are checked in string-array
too, and we can restore our proper percent signs.
Change-Id: I3478ab7e0b939e61fe0cec20201ac55096264080
2011-01-23 16:00:36 -08:00