Konstantin Lopyrev
385df2c7a5
Merge "Fix 2926276: Remove spurrious warning about unspecified measurespec."
2010-08-17 13:49:36 -07:00
Wu-cheng Li
f008f3ea82
Document that autoFocus must be called in auto and macro mode.
...
Change-Id: Ia52f8bc8a75a7473edff50326a4a0467f4295e6a
2010-08-17 13:44:35 -07:00
Jim Miller
3747f3f41f
Fix 2926276: Remove spurrious warning about unspecified measurespec.
...
Only issue the warning in debug mode.
Change-Id: I5fecb2e6b0013ce775187a878f5a81317e758f2c
2010-08-17 13:31:46 -07:00
Adam Powell
31d5becb7f
Merge "Bug 2923440 - ActionMode buttons show if room by default - different approach."
2010-08-17 12:57:40 -07:00
Romain Guy
89c7ec3453
Merge changes I16ce79ab,Ib86a7309
...
* changes:
Correctly set the viewport in layers.
Cleanup, better code reuse.
2010-08-17 12:36:03 -07:00
Jeff Hamilton
de8db545b4
Merge "Add in constants for the server unique columns in Chrome sync."
2010-08-17 12:12:12 -07:00
Jeff Hamilton
98bfcfb944
Add in constants for the server unique columns in Chrome sync.
...
Change-Id: Ie359d4a11da2278b623a02dea19a4f847632f5ab
2010-08-17 14:03:07 -05:00
Adam Powell
4d9861e7ec
Bug 2923440 - ActionMode buttons show if room by default - different approach.
...
This enforces the new policy if menu items are created
programmatically instead of inflated from menu xml.
This reverts commit fbb72fdbe58142e0f1f7ffa17f009b0d829b33c3.
Change-Id: I102e93b80a3248634e98e0d7dc3321bf1d8b263b
2010-08-17 11:43:16 -07:00
Romain Guy
1d83e1981c
Correctly set the viewport in layers.
...
Bug #2919295
Change-Id: I16ce79ab0d5747cb01c6c1abe531da3dfd93fb54
2010-08-17 11:37:00 -07:00
Alex Sakhartchouk
8bdb20bc40
Merge "Propagating some useful font changes."
2010-08-17 11:15:19 -07:00
Alex Sakhartchouk
94bbccc363
Propagating some useful font changes.
...
Change-Id: Ia3b31a0fa0c59c5edbd3edaca164ca85e090e708
2010-08-17 11:09:49 -07:00
Roman Nurik
89f0916696
am 96e24634: am e6bfceeb: am 3b70e159: Merge "Adding a sample accessibility service -make" into froyo
...
Merge commit '96e24634c6db1a87285ca78d529dcc318653b7e9'
* commit '96e24634c6db1a87285ca78d529dcc318653b7e9':
Adding a sample accessibility service -make
2010-08-17 10:59:06 -07:00
Gilles Debunne
a6d7ee19cc
Fixes in TextView's selection.
...
Handles are now centered on selection corners.
Touch regions tuned, especially for the one line / last line case.
Selection mode is stopped when text is entered or modified.
New temporary assets.
New selection background color.
Using references to theme for some hard-coded colors.
Change-Id: I820ec39bb6d5a3c6598c7c34b9c8f90b848da9f3
2010-08-17 10:52:04 -07:00
Roman Nurik
96e24634c6
am e6bfceeb: am 3b70e159: Merge "Adding a sample accessibility service -make" into froyo
...
Merge commit 'e6bfceeb10a01c8e89f712c0ffddc9e5e3ad1842' into gingerbread-plus-aosp
* commit 'e6bfceeb10a01c8e89f712c0ffddc9e5e3ad1842':
Adding a sample accessibility service -make
2010-08-17 10:50:25 -07:00
Jeff Hamilton
f6105cfd73
Merge "Add the contract class for the new Broswer provider."
2010-08-17 10:50:21 -07:00
Roman Nurik
e6bfceeb10
am 3b70e159: Merge "Adding a sample accessibility service -make" into froyo
...
Merge commit '3b70e159a8168c1154d31d7b0552bb3b0c099334' into gingerbread
* commit '3b70e159a8168c1154d31d7b0552bb3b0c099334':
Adding a sample accessibility service -make
2010-08-17 10:45:30 -07:00
Jeff Hamilton
e5d0a83b12
Add the contract class for the new Broswer provider.
...
Change-Id: I54ce53f1061ae1f910086f778b7fa6a15c11b1d4
2010-08-17 12:39:20 -05:00
Roman Nurik
3b70e159a8
Merge "Adding a sample accessibility service -make" into froyo
2010-08-17 10:36:03 -07:00
Adam Cohen
2dd2197805
-> Enabled partial updates to app widgets through AppWidgetManager.
...
Partial updates are not cached by the AppWidgetService.
-> Added the ability to insert commands with no parameters into
RemoteViews objects.
-> Added showNext() and showPrevious() methods to RemoteViews.
-> Made showNext() / showPrevious() of AdapterViewFlipper remotable.
Change-Id: Ic5491bb374424a54728c4ca92b94b1f00dfb87ff
2010-08-17 10:29:35 -07:00
Jean-Baptiste Queru
0c316eeb43
am ddbcce3a: Merge "resolved conflicts for merge of be50507b to gingerbread-plus-aosp" into gingerbread-plus-aosp
...
Merge commit 'ddbcce3afbb38680fb84583f7bad5209307e6459'
* commit 'ddbcce3afbb38680fb84583f7bad5209307e6459':
Keep track of remaining fd when devices are removed
2010-08-17 09:06:52 -07:00
Jean-Baptiste Queru
ddbcce3afb
Merge "resolved conflicts for merge of be50507b to gingerbread-plus-aosp" into gingerbread-plus-aosp
2010-08-17 09:05:27 -07:00
Jean-Baptiste Queru
6525fca692
resolved conflicts for merge of be50507b to gingerbread-plus-aosp
...
Change-Id: Iaa5fb62f7b82b488bca192e7f374c044c7e1e6a7
2010-08-17 09:01:26 -07:00
Steve Howard
fe762e9d12
am ab59914d: am b3e957bb: Merge "New download manager error code when we can\'t resume." into gingerbread
...
Merge commit 'ab59914de7ac714d04a5013c53aa9c7edb5421a2'
* commit 'ab59914de7ac714d04a5013c53aa9c7edb5421a2':
New download manager error code when we can't resume.
2010-08-17 08:39:18 -07:00
Steve Howard
ab59914de7
am b3e957bb: Merge "New download manager error code when we can\'t resume." into gingerbread
...
Merge commit 'b3e957bb9d3a3811412e5d94233c7f7e2e777c28' into gingerbread-plus-aosp
* commit 'b3e957bb9d3a3811412e5d94233c7f7e2e777c28':
New download manager error code when we can't resume.
2010-08-17 08:27:17 -07:00
Steve Howard
b3e957bb9d
Merge "New download manager error code when we can't resume." into gingerbread
2010-08-17 08:20:52 -07:00
Jean-Baptiste Queru
f089b90d21
am 5085848d: am 209e6518: Merge "Make the LED colors when charging customizable by the vendor"
...
Merge commit '5085848ddbadaafa088ed85753156adc2e54554d'
* commit '5085848ddbadaafa088ed85753156adc2e54554d':
Make the LED colors when charging customizable by the vendor
2010-08-17 07:51:51 -07:00
Jean-Baptiste Queru
365d843010
am 234325b8: am c708e383: Merge "Revert "InputMethodService: Fix ignore case in showInputMethodPickerFromClient""
...
Merge commit '234325b832136dcdbed0c86fdcefa95fb04451a4'
* commit '234325b832136dcdbed0c86fdcefa95fb04451a4':
Revert "InputMethodService: Fix ignore case in showInputMethodPickerFromClient"
2010-08-17 07:51:47 -07:00
Jean-Baptiste Queru
c4a4f26778
am 18dd95f4: am 05b20c03: Merge "bootanimation: Don\'t open non-existing bootanimation.zip"
...
Merge commit '18dd95f451f866804d19797bc47ab5a2821c0020'
* commit '18dd95f451f866804d19797bc47ab5a2821c0020':
bootanimation: Don't open non-existing bootanimation.zip
2010-08-17 07:51:40 -07:00
Jean-Baptiste Queru
be50507bae
Merge "Keep track of remaining fd when devices are removed"
2010-08-17 07:49:54 -07:00
Jean-Baptiste Queru
5085848ddb
am 209e6518: Merge "Make the LED colors when charging customizable by the vendor"
...
Merge commit '209e651805dd40ea87df7ff67f2755605be9308c' into gingerbread-plus-aosp
* commit '209e651805dd40ea87df7ff67f2755605be9308c':
Make the LED colors when charging customizable by the vendor
2010-08-17 07:48:50 -07:00
Jean-Baptiste Queru
234325b832
am c708e383: Merge "Revert "InputMethodService: Fix ignore case in showInputMethodPickerFromClient""
...
Merge commit 'c708e38356e9c381b640ef96db3b0b0fdd41d433' into gingerbread-plus-aosp
* commit 'c708e38356e9c381b640ef96db3b0b0fdd41d433':
Revert "InputMethodService: Fix ignore case in showInputMethodPickerFromClient"
2010-08-17 07:48:30 -07:00
Jean-Baptiste Queru
18dd95f451
am 05b20c03: Merge "bootanimation: Don\'t open non-existing bootanimation.zip"
...
Merge commit '05b20c034d5a1ffe64c15d155dd8511b77b8989b' into gingerbread-plus-aosp
* commit '05b20c034d5a1ffe64c15d155dd8511b77b8989b':
bootanimation: Don't open non-existing bootanimation.zip
2010-08-17 07:48:26 -07:00
Jean-Baptiste Queru
a542f8cd0e
am 1a0b19b3: resolved conflicts for merge of bcbb5845 to gingerbread-plus-aosp
...
Merge commit '1a0b19b324eb6631333dcc51d9b92c3b1ead2eac'
* commit '1a0b19b324eb6631333dcc51d9b92c3b1ead2eac':
frameworks/base/opengl: Add NULL check
2010-08-17 07:46:40 -07:00
Jean-Baptiste Queru
1a0b19b324
resolved conflicts for merge of bcbb5845 to gingerbread-plus-aosp
...
Change-Id: I04fb94c91958bcba3e587a8bf523c551d964f761
2010-08-17 07:41:59 -07:00
Jean-Baptiste Queru
209e651805
Merge "Make the LED colors when charging customizable by the vendor"
2010-08-17 07:35:08 -07:00
Mike Lockwood
64d078425a
am 26434836: am b6ef8bad: Merge "GPS: Initialize XTRA support when GPS is enabled" into gingerbread
...
Merge commit '264348361e0660948a09fe516a535b7c60998def'
* commit '264348361e0660948a09fe516a535b7c60998def':
GPS: Initialize XTRA support when GPS is enabled
2010-08-17 04:56:32 -07:00
Mike Lockwood
264348361e
am b6ef8bad: Merge "GPS: Initialize XTRA support when GPS is enabled" into gingerbread
...
Merge commit 'b6ef8bad8a48fdc28770cf34d0c9efefc7fdd815' into gingerbread-plus-aosp
* commit 'b6ef8bad8a48fdc28770cf34d0c9efefc7fdd815':
GPS: Initialize XTRA support when GPS is enabled
2010-08-17 04:49:52 -07:00
Mike Lockwood
b6ef8bad8a
Merge "GPS: Initialize XTRA support when GPS is enabled" into gingerbread
2010-08-17 04:46:29 -07:00
Mike Lockwood
1a1cd3a878
GPS: Initialize XTRA support when GPS is enabled
...
BUG: 2923148
Change-Id: If9a643e385c6c567b30f47d4caa35fa812a2ba43
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-08-17 07:45:47 -04:00
Hung-ying Tyan
912e0f7d9e
CallManager: do not deliver ring event if fg call is live.
...
Change-Id: If5b1bca1f09557a2ee4de9ba429d80a0393279a0
2010-08-17 17:52:34 +08:00
Joseph Wen
1b10d3d235
am 81dcea60: am f1f48bc7: Do JPEG tile-based decoding.
...
Merge commit '81dcea6093dfcdadd52982505249a5eacf47a81b'
* commit '81dcea6093dfcdadd52982505249a5eacf47a81b':
Do JPEG tile-based decoding.
2010-08-17 00:35:06 -07:00
Joseph Wen
81dcea6093
am f1f48bc7: Do JPEG tile-based decoding.
...
Merge commit 'f1f48bc7f200f54c76b22d845d8ba8419879b375' into gingerbread-plus-aosp
* commit 'f1f48bc7f200f54c76b22d845d8ba8419879b375':
Do JPEG tile-based decoding.
2010-08-17 00:31:34 -07:00
Joseph Wen
f1f48bc7f2
Do JPEG tile-based decoding.
...
Change-Id: I5c1b4ac3c02eb4350ef0ba9a7877b22cfd730cfb
2010-08-17 14:34:02 +08:00
Romain Guy
0a41749953
Cleanup, better code reuse.
...
Change-Id: Ib86a7309ae579cce3b7cf464782c34e70a74c616
2010-08-16 20:26:20 -07:00
Adam Powell
931831dcb8
Merge "Prevent starting an action mode from within an actionbar/mode UI."
2010-08-16 20:04:32 -07:00
Jeff Brown
5c9609f136
am 637df045: am 1ce4394c: Merge "Throttle userActivity calls from input dispatcher." into gingerbread
...
Merge commit '637df0456f71e8af69122ae7c3f5decf4c8dd1f8'
* commit '637df0456f71e8af69122ae7c3f5decf4c8dd1f8':
Throttle userActivity calls from input dispatcher.
2010-08-16 20:02:47 -07:00
Jeff Brown
637df0456f
am 1ce4394c: Merge "Throttle userActivity calls from input dispatcher." into gingerbread
...
Merge commit '1ce4394c779be5e67e37bbb995da13865b36c573' into gingerbread-plus-aosp
* commit '1ce4394c779be5e67e37bbb995da13865b36c573':
Throttle userActivity calls from input dispatcher.
2010-08-16 20:00:29 -07:00
Jeff Brown
1ce4394c77
Merge "Throttle userActivity calls from input dispatcher." into gingerbread
2010-08-16 19:59:03 -07:00
Adam Powell
9146ac7062
Prevent starting an action mode from within an actionbar/mode UI.
...
Don't let a View start an ActionMode if it would be obscured or destroyed
by the ActionMode UI.
Change-Id: Ifdb28f1d6704ede550a89903d3823a09b103fcd5
2010-08-16 18:57:17 -07:00
Jeff Brown
90291577a0
Throttle userActivity calls from input dispatcher.
...
Results in an approximately 60% reduction in InputDispatcher thread CPU time.
(Went from 3% to 1% when measured with CPU frequency scaling disabled.)
Change-Id: Ia6e6087a719ee518fe37b428a871c7240bd4143f
2010-08-16 18:33:50 -07:00