Marco Nelissen
fd1e4ad52c
Fix simulator build, part 1/n
...
Change-Id: If0a42ab262ee6aa6381ce95bd49baf232adb01c5
2010-10-06 12:23:02 -07:00
Joe Onorato
066b5c5166
manual merge Merge commit '77e42376' into work
...
Conflicts:
packages/SystemUI/res/values/colors.xml
packages/SystemUI/src/com/android/systemui/statusbar/StatusBarService.java
Change-Id: I891c8a9f6410037ca7805507e85a17f1655c115e
2010-10-05 12:37:03 -04:00
Patrick Scott
4243a3a6ed
Add postSync so that the chrome stack has access.
...
Bug: 3053149
Change-Id: I75f5422afcacf4ae70a2aa26188446251d7f84da
2010-10-05 09:30:24 -04:00
satok
d87c2594c6
Add utility of enabled InputMethod settings to InputMethodManagerService
...
- Add setter of enabled InputMethodSubtypes
- Enabled InputMethods are saved as follows:
-- enabled_inputmethod0;enabled_subtype0;enabled_subtype1:enabled_inputmethod1
- TODO: Fix Settings application to parse new Enabled InputMethod string.
-- Currently IMMS doesn't save InputMethodSubtypes so this will not break Settings application.
Change-Id: Icd0f13de396ce286ff6563e8c2775d53bcdacbf3
2010-10-05 14:51:31 +09:00
Romain Guy
2fe9a8f6f6
Correctly invalidate the drawing cache when an invalidate is requested.
...
Change-Id: Ic78f85d728a14a9f2e4a1925d46b6db9a204bbb1
2010-10-04 20:19:34 -07:00
Christopher Tate
2347b59e58
Merge "Refinements to drag/drop"
2010-10-04 19:40:28 -07:00
Gil Dobjanschi
3937d3d4f2
Merge "Added mute APIs for MediaVideoItem and AudioTrack"
2010-10-04 19:04:36 -07:00
Gil Dobjanschi
61f9184547
Added mute APIs for MediaVideoItem and AudioTrack
...
Change-Id: I2e4e8b213a5d19f895d9e3431b7d4f1acad70762
2010-10-04 19:02:28 -07:00
Scott Main
d9ec8eba56
resolved conflicts for merge of 7008b7c1 to master
...
Change-Id: I360136e54229cae1fc0fa15eab8f1490b8a0fb5e
2010-10-04 18:42:49 -07:00
Christopher Tate
2c095f3677
Refinements to drag/drop
...
Thumbnail measurement & drawing has been moved out into a delegate
class called View.DragThumbnailBuilder. This consolidates the
thumbnail-related code as well as ensuring that the drag initiator
does not have to know a priori where to place the thumbnail relative
to the touch point *before* the thumbnail measurement step, as was
previously the case.
startDrag() no longer needs to be told where the current touch point
is at the time the drag is launched.
Drag events are now dispatched only to VISIBLE views.
Dispatch shouldn't double-recycle events any more when the target
window is local to the system process.
Change-Id: I49419103765a0cad2e18ddfcdd6dacb94daf1ff1
2010-10-04 18:29:09 -07:00
Patrick Dubroy
629e26bbef
am 242fa52b: am eb15ac40: Merge "Fix 2-pixel offset unlock jog tab" into gingerbread
...
Merge commit '242fa52bb6d4556c7cb4bcb1880210f076ea7270'
* commit '242fa52bb6d4556c7cb4bcb1880210f076ea7270':
Fix 2-pixel offset unlock jog tab
2010-10-04 18:23:44 -07:00
Vasu Nori
060e25bf12
don't print informational messages from sqlite in log
...
right now, all messages from sqlite are printed in the logfile.
if the error code = 0, then sqlite message is just an informational
message that usually has no meaning to the developers
and ends up confusing the developers.
discard such messages
Change-Id: I961f1b33a745d5e9b20c85ee8a0071c92c253d96
2010-10-04 18:10:51 -07:00
Gil Dobjanschi
f124ce7394
Merge "Save AudioTrack to XML"
2010-10-04 17:52:43 -07:00
Romain Guy
28d891409c
Merge "Remove logs to reduce logcat spam."
2010-10-04 17:24:21 -07:00
Romain Guy
bdb801ca99
Remove logs to reduce logcat spam.
...
Change-Id: I5fc295b05b5d82bb86827b88e94dd51e8bcdc7d3
2010-10-04 17:22:29 -07:00
Gil Dobjanschi
3398abafca
Save AudioTrack to XML
...
Change-Id: Ie9afe8c620e21e160b56c36f489870db0a3987cc
2010-10-04 17:20:43 -07:00
Chet Haase
064c0b47ae
Merge "Changed LayoutTransition to disable animations when set to null"
2010-10-04 17:16:03 -07:00
Romain Guy
14e647280d
Merge "Reorder logs."
2010-10-04 17:15:15 -07:00
Romain Guy
11fd654a90
Reorder logs.
...
Change-Id: I4adbd53662e1f509c860898c8ff9d19eaabd6d5b
2010-10-04 17:12:16 -07:00
Chet Haase
5d6d7b9c3d
Changed LayoutTransition to disable animations when set to null
...
Change-Id: Ic4d67135a273ea816c3d15bce05da611bd6bae53
2010-10-04 16:58:04 -07:00
Gilles Debunne
b6b193013d
Merge "resolved conflicts for merge of 242fa52b to master"
2010-10-04 16:01:22 -07:00
Patrick Dubroy
3dd101133a
resolved conflicts for merge of 242fa52b to master
...
Change-Id: I6a6c134fe4fb05dbc15249661b441d88534acb1e
2010-10-04 15:49:40 -07:00
Gil Dobjanschi
e799720dd4
Merge "Added audio track playback API"
2010-10-04 15:49:26 -07:00
Chet Haase
5e25c2c145
Add ability to automate animated transitions on View show/hide
...
Change-Id: Id6ff92c8fd06c3f5fb30c41b020b4de4f567154f
2010-10-04 15:11:36 -07:00
Gilles Debunne
6fee4406b0
am 9339fa7f: am be86b8a4: Updated quick contact assets.
...
Merge commit '9339fa7fa13b8c8847dac4624598112d03555330'
* commit '9339fa7fa13b8c8847dac4624598112d03555330':
Updated quick contact assets.
2010-10-04 15:00:58 -07:00
Dianne Hackborn
58520b24d4
resolved conflicts for merge of 10d5b096 to master
...
Change-Id: Id5c6ba651f72b48f0d70ee2ca64a6c9adf5e74f7
2010-10-04 14:54:59 -07:00
Joe Onorato
77e4237682
am 87efbbb5: Merge "implement the number bubbles on the status bar" into gingerbread
...
Merge commit '87efbbb563ef96a74ffd2fbbe5c0865a450254df' into gingerbread-plus-aosp
* commit '87efbbb563ef96a74ffd2fbbe5c0865a450254df':
implement the number bubbles on the status bar
2010-10-04 14:44:40 -07:00
Joe Onorato
87efbbb563
Merge "implement the number bubbles on the status bar" into gingerbread
2010-10-04 14:41:38 -07:00
Joe Onorato
6c01a11a20
implement the number bubbles on the status bar
...
Bug: 2993482
Change-Id: I73b1f8c39e995fd4f986c25ea04127eb23c3cd07
2010-10-04 17:40:24 -04:00
Scott Main
7008b7c1c4
am ae1864c0: am ec80d7f3: docs: consistency fixit for the quickview boxes in the dev guide
...
Merge commit 'ae1864c0e79baae75ad25f20828349be8635d471' into gingerbread-plus-aosp
* commit 'ae1864c0e79baae75ad25f20828349be8635d471':
docs: consistency fixit for the quickview boxes in the dev guide
2010-10-04 14:37:11 -07:00
Scott Main
ae1864c0e7
am ec80d7f3: docs: consistency fixit for the quickview boxes in the dev guide
...
Merge commit 'ec80d7f311b1a0899bb4caf5b380b07027e902d1' into gingerbread
* commit 'ec80d7f311b1a0899bb4caf5b380b07027e902d1':
docs: consistency fixit for the quickview boxes in the dev guide
2010-10-04 14:32:26 -07:00
Brad Fitzpatrick
5e9f64ce24
am b12bfbd4: am eb6e22f2: Merge "Document Bitmap.createScaledBitmap" into gingerbread
...
Merge commit 'b12bfbd4df985041ab0e584ef5a746328baac038'
* commit 'b12bfbd4df985041ab0e584ef5a746328baac038':
Document Bitmap.createScaledBitmap
2010-10-04 14:28:35 -07:00
Adam Powell
a143e83e1e
am 7de900f3: am d29e6861: Merge "Fix bug 3058324" into gingerbread
...
Merge commit '7de900f3629e53e1a05b8d5854cf0164446346ae'
* commit '7de900f3629e53e1a05b8d5854cf0164446346ae':
Fix bug 3058324
2010-10-04 14:28:08 -07:00
Patrick Dubroy
242fa52bb6
am eb15ac40: Merge "Fix 2-pixel offset unlock jog tab" into gingerbread
...
Merge commit 'eb15ac40ab2da2f599f2380bc7a8b00e7132a64c' into gingerbread-plus-aosp
* commit 'eb15ac40ab2da2f599f2380bc7a8b00e7132a64c':
Fix 2-pixel offset unlock jog tab
2010-10-04 14:25:42 -07:00
Romain Guy
e14e8e31fa
Merge "Snap the clip rectangle to pixel boundaries."
2010-10-04 14:21:10 -07:00
Patrick Dubroy
eb15ac40ab
Merge "Fix 2-pixel offset unlock jog tab" into gingerbread
2010-10-04 14:20:39 -07:00
Romain Guy
3b3e457c27
Snap the clip rectangle to pixel boundaries.
...
Change-Id: Iac2765303552f385995fe46e219af456e0501da7
2010-10-04 14:18:24 -07:00
Gilles Debunne
08ed700fa8
Merge "resolved conflicts for merge of 115b9dc3 to master"
2010-10-04 14:17:51 -07:00
Romain Guy
a1cf4a78d1
Merge "Apply bilinear filtering on text only when necessary."
2010-10-04 14:16:24 -07:00
Patrick Dubroy
276e7498bb
Fix 2-pixel offset unlock jog tab
2010-10-04 14:16:22 -07:00
Gilles Debunne
9339fa7fa1
am be86b8a4: Updated quick contact assets.
...
Merge commit 'be86b8a4c94905e547f8ecdcd220bbe7bb249d2b' into gingerbread-plus-aosp
* commit 'be86b8a4c94905e547f8ecdcd220bbe7bb249d2b':
Updated quick contact assets.
2010-10-04 14:15:15 -07:00
Romain Guy
e8cb9c1430
Apply bilinear filtering on text only when necessary.
...
Change-Id: Ic903f4b5d30e9c92528c6291941896efe4729ee3
2010-10-04 14:14:11 -07:00
Gilles Debunne
be86b8a4c9
Updated quick contact assets.
...
Change-Id: I1ab617a1deeeacbc49acd09f883fbf2aeaa904a3
2010-10-04 14:11:11 -07:00
Dianne Hackborn
10d5b0966d
am 407f625a: Add new API to find out whether external storage is removable.
...
Merge commit '407f625a9b8e356e765a5ec587c443af1f3aadb5' into gingerbread-plus-aosp
* commit '407f625a9b8e356e765a5ec587c443af1f3aadb5':
Add new API to find out whether external storage is removable.
2010-10-04 14:03:06 -07:00
Gilles Debunne
152c7c4091
resolved conflicts for merge of 115b9dc3 to master
...
Change-Id: I37ee3a50fcafbaa7de510b3af8e133a89bd9e339
2010-10-04 14:02:50 -07:00
Dianne Hackborn
407f625a9b
Add new API to find out whether external storage is removable.
...
This is implemented based on whether we are using the "nosdcard"
product. Needed to tweak aapt to allow use of the product attribute
with other resource definition tags besides strings.
Change-Id: I49922d23b52a34183a8e2f4d2515adaf1fc9149a
2010-10-04 13:58:56 -07:00
Gil Dobjanschi
52ac301ee1
Added audio track playback API
...
Change-Id: I9884ab5d3a7d8d8310f4b4426e50b0496cbbd295
2010-10-04 13:56:39 -07:00
Romain Guy
2a2a38db16
Merge "Apply all Canvas transformations to ColorDrawable."
2010-10-04 13:48:12 -07:00
Romain Guy
95930e13fa
Apply all Canvas transformations to ColorDrawable.
...
Change-Id: I29252c58224b236d0770ec005da9842990ef2c06
2010-10-04 13:46:02 -07:00
Scott Main
ec80d7f311
docs: consistency fixit for the quickview boxes in the dev guide
...
Change-Id: Ibd81091fc6002a77ce43f553b63facec53f16a38
2010-10-04 13:30:30 -07:00