Mike Dodd
9568a5ab2e
Merge "HardwareRenderer: When throwing an exception because of an EGL error, include the specific error."
2010-10-08 15:33:45 -07:00
Joe Onorato
8885321046
Merge "Allow notifications to not specify a contentIntent."
2010-10-08 15:16:14 -07:00
Alex Sakhartchouk
61b8aaadd7
Merge "Removing fixed size arrays."
2010-10-08 15:04:29 -07:00
Alex Sakhartchouk
6f91cb6af7
Removing fixed size arrays.
...
Change-Id: I5c65b29a197013de2517cfb6dbe7abb9e24a688b
2010-10-08 15:00:05 -07:00
Joe Onorato
80a752c537
Allow notifications to not specify a contentIntent.
...
If they don't, the click events will be passed through to the individual
views in the notification view, which may have their own PendingIntents
attached.
Previously, it was against the UX spec to allow this, but now we are
changing that and will have buttons in there.
Change-Id: Ie3b2e96c6a1c4449fa86ed571f3ad0f047320d31
2010-10-08 17:57:18 -04:00
Gil Dobjanschi
bced934da0
Merge "Hide project media by creating the .nomedia file"
2010-10-08 14:57:05 -07:00
Vasu Nori
ee7e28e20d
Merge "when printing requery on UI warning, include additional info"
2010-10-08 14:50:59 -07:00
Vasu Nori
f0808f810e
when printing requery on UI warning, include additional info
...
this hsould help figure out which module is doing query on UI thread.
Change-Id: If3062a35fa1fb50063b678c3c9311d6b1504fa9b
2010-10-08 14:48:48 -07:00
Gil Dobjanschi
ce52d1ff76
Hide project media by creating the .nomedia file
...
Change-Id: I4ef1f16ceaa211b7f614cb3dfffa5beb4ae3e8de
2010-10-08 14:44:36 -07:00
Mike Dodd
5d3e2ea6f3
HardwareRenderer: When throwing an exception because of an EGL
...
error, include the specific error.
Change-Id: I8e4b0cdbc207824df4f4bb55c3b379b0ee4aeec2
2010-10-08 14:43:16 -07:00
Irfan Sheriff
8163315095
Merge "Use LinkProperties for IP and proxy configuration"
2010-10-08 14:09:49 -07:00
Adam Powell
c459622dd1
Merge "Holo theme progress and assets!"
2010-10-08 13:52:55 -07:00
Mathias Agopian
118c8490da
Merge "fix a bug where timeouts would only be handled when a message was delivered"
2010-10-08 13:46:07 -07:00
Joe Onorato
481bbb9c11
Merge "Get rid of the global actions menu on tablets."
2010-10-08 13:29:37 -07:00
Joe Onorato
d208e70926
Get rid of the global actions menu on tablets.
...
We have the system tray for that stuff. Make long press on power
go directly to the shut down confirmation dialog. Make that dialog
auto dismiss when the screen goes off. Reword it when we're skipping
the global actions menu, because it feels too abrupt to say "The
phone will shut down" when they haven't clearly pressed a button
that says shut down.
Change-Id: I8c92a1362bd4ed242e6cd94c2dae6d9ff9c4c34d
2010-10-08 16:28:05 -04:00
Adam Powell
2fbf4de64f
Holo theme progress and assets!
...
* Light and dark dialogs
* Checkboxes and radio buttons
* Toggle buttons
Warning! This is still a work in progress. This does not include final metrics.
Some assets (specifically dialogs) are currently misaligned.
2010-10-08 13:25:17 -07:00
Jason Chen
c8cc6580eb
Merge "Resolved conflicts for merge of 2bd6afed to master"
2010-10-08 13:15:11 -07:00
Mike Lockwood
c3f8f2bef3
Merge "MTP: Throw a NullPointerException if client is null in MtpCursor constructor"
2010-10-08 13:12:39 -07:00
Jason Chen
1a469ca1cb
Resolved conflicts for merge of 2bd6afed to master
...
Change-Id: Ic9e854838004e9c5505cc1df8399cee3caa5e4e9
2010-10-08 13:09:31 -07:00
Elliott Hughes
6190ba5a94
Merge "NIOTest fixes."
2010-10-08 12:59:43 -07:00
Jim Miller
e6089612ec
Merge "Fix RecentApps to properly load new thumbnails."
2010-10-08 12:53:14 -07:00
Jim Miller
1657f43095
Merge "Fix 3061025: Extend wave lockscreen timeout while grabbed."
2010-10-08 12:52:24 -07:00
Mathias Agopian
fe0ed4575e
Merge "Fix a null dereference"
2010-10-08 12:44:19 -07:00
Irfan Sheriff
96ca91761e
Use LinkProperties for IP and proxy configuration
...
Change-Id: I4ae817fb00141e9a742216b7fd02dca1ed228270
2010-10-08 12:41:11 -07:00
Mike Lockwood
069ead3adc
MTP: Throw a NullPointerException if client is null in MtpCursor constructor
...
Change-Id: Ia2a19ddcc5cacb54d9fcbe55bce1de1aed515424
Signed-off-by: Mike Lockwood <lockwood@google.com>
2010-10-08 15:39:48 -04:00
Dianne Hackborn
c4dfe3d5c0
am 92d29c66: am a2a0a98a: Merge "Fix NPE if there is no accelerometer." into gingerbread
...
Merge commit '92d29c66f5cb69627172d21057e672eaba2eb03f'
* commit '92d29c66f5cb69627172d21057e672eaba2eb03f':
Fix NPE if there is no accelerometer.
2010-10-08 12:39:14 -07:00
Dianne Hackborn
a1b0d6966e
resolved conflicts for merge of efa4f7f8 to master
...
Change-Id: I00dff76594326a6f6e69515a9cba673602ed269d
2010-10-08 11:09:38 -07:00
Hung-ying Tyan
026284745b
am 88b4bd5f: am fc7e7766: Merge "CallManager/SipPhone: fix reject a ringing call" into gingerbread
...
Merge commit '88b4bd5f3e8d6e68541eec4a603b1df83291cf1f'
* commit '88b4bd5f3e8d6e68541eec4a603b1df83291cf1f':
CallManager/SipPhone: fix reject a ringing call
2010-10-08 10:25:50 -07:00
Fred Quintana
c6a69559cb
Add getCurrentSyncs() to the SDK, which replaces the deprecated
...
getCurrentSync().
Change-Id: I1112df41e48ed93ff4c0c5af4825dbdce0c4cccc
2010-10-08 09:50:45 -07:00
Gilles Debunne
fdcd2660ec
Merge "resolved conflicts for merge of ba04dbc6 to master"
2010-10-08 09:20:57 -07:00
Daniel Sandler
e7aa07852d
Merge "Start of input method control on system bar."
2010-10-08 08:14:12 -07:00
Daniel Sandler
a84a69f2eb
Start of input method control on system bar.
...
This change creates a new icon to the right of the
notification area for the IMM to expose control over the
current IME. Currently it shows the IME subtype picker.
TODO: Connect directly to the IMMService to show the correct
icon (and hide the icon entirely when the input panel is not
visible).
Bug: 2975425
Change-Id: If07f30867b81950a0a86b00807a41e2ff2af389c
2010-10-08 10:39:46 -04:00
Patrick Scott
5fe721f5f5
Fix NPE in addMessageToConsole.
...
CallbackProxy should always check for client during handleMessage.
Bug: 3060412
Change-Id: I0a84fa2ce21cc46d9b215b18a700119c7c12a7f2
2010-10-08 10:06:07 -04:00
Shih-wei Liao
3ca506b6d4
Merge "Move rsDebug from rs_math.rsh to rs_core.rsh: rsDebug is more like core functionalities instead of math functionalities. Also portions of rsDebug implementation has been in rs_core.rsh already. Add #define guard for rs_types.rsh to prevent multiple inclusion."
2010-10-08 02:20:13 -07:00
satok
0ff647b030
Add a cancel button to InputMethodPicker and InputMethodSubtypePicker
...
Change-Id: Ia64b9716c18da5a541c7fc04a507541d2ab952da
2010-10-08 13:49:28 +09:00
Gilles Debunne
cf1e925aa1
resolved conflicts for merge of ba04dbc6 to master
...
Change-Id: I175aa21ef01b98b0c3c46aea0b754d14984128b9
2010-10-07 20:46:03 -07:00
Mathias Agopian
ad8d48a6b6
fix a bug where timeouts would only be handled when a message was delivered
...
Change-Id: Id3127b21c1a1a1afab32911a8edbb202360d7c9b
2010-10-07 19:59:06 -07:00
satok
26b29d1b87
Merge "Show "more" button in the dialog of InputMethodSubtypePicker"
2010-10-07 19:48:43 -07:00
Robert Greenwalt
4c1a013472
Merge "Stop using unauthorized dns"
2010-10-07 18:56:14 -07:00
Elliott Hughes
ddd49c28b0
NIOTest fixes.
...
I've also broken the test up a bit, so it's easier to see what's failing.
(For the particular bug I'm investigating, only heap byte[]-backed Buffers
are broken.)
Bug: 3066167
Change-Id: I2f747414bd48eb8c666da5b31870bf39601911e2
2010-10-07 18:33:43 -07:00
Shih-wei Liao
708e04ff41
Move rsDebug from rs_math.rsh to rs_core.rsh: rsDebug is more like core functionalities instead of math functionalities. Also portions of rsDebug implementation has been in rs_core.rsh already.
...
Add #define guard for rs_types.rsh to prevent multiple inclusion.
Change-Id: I1db6dac9825c2618db3660e22c8791aff08d6243
2010-10-07 18:21:32 -07:00
Jim Miller
4139b5505c
Fix 3061025: Extend wave lockscreen timeout while grabbed.
...
This fix extends the lockscreen timeout to 30s while the
handle is being held. As a precaution, it will still timeout
after 30s of not completing the lock. Once the handle is
released, the screen will go dark after 5s, which gives
it enough time to finish pending animations.
Change-Id: Ie89449b6b09de06ca8a88702cc85085b2556903c
2010-10-07 18:04:33 -07:00
Brian Carlstrom
c4838afb34
Merge "Move LOG_ALWAYS_FATAL to end of app_process"
2010-10-07 16:32:02 -07:00
Romain Guy
ecd31740a0
Merge "Add 3D transforms support to all gradients."
2010-10-07 16:20:20 -07:00
Mike Lockwood
170bf59c7c
Merge "MediaScanner: don't call pruneDeadThumbnailFiles unless the images table is empty"
2010-10-07 16:15:33 -07:00
Brian Carlstrom
de6d1d889e
Move LOG_ALWAYS_FATAL to end of app_process
...
Since LOG_ALWAYS_FATAL is always fatal and code after it is by
definition unreachable, put the call after other diagnostic output.
Change-Id: Ib3a515a04125d8e4f6e8af3a6f59226e8f0dd9cd
2010-10-07 16:02:11 -07:00
Robert Greenwalt
df255c2283
Stop using unauthorized dns
...
We were using somebody elses dns without permission - rude. Switch to using
secondary google public dns.
bug:3045768
Change-Id: I042262bb96d3efed4c0265dc7ff6ac418e4d4f1e
2010-10-07 15:32:08 -07:00
Romain Guy
14830948d0
Add 3D transforms support to all gradients.
...
Change-Id: I61409edd00dab3a11684a3f5e4f7df0afc734758
2010-10-07 15:07:45 -07:00
Mathias Agopian
3e1a18ac6d
Fix a null dereference
...
Change-Id: I3df446b90c1607782778749de7ba0f8c00698c33
2010-10-07 14:57:04 -07:00
Mike Lockwood
6458935331
MediaScanner: don't call pruneDeadThumbnailFiles unless the images table is empty
...
BUG: 3063257
Change-Id: I648ff8c4d4026e3d2a97853257865c9b5f712712
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-10-07 17:43:57 -04:00