Megha Joshi
95483c92f4
am 7e059716: (-s ours) am 48c698fc: Adding NFC sample resources (DO NOT MERGE)
...
* commit '7e059716923cd02a4c42751c67892e090bfd5f33':
Adding NFC sample resources (DO NOT MERGE)
2010-11-12 18:48:56 -08:00
Megha Joshi
7e05971692
am 48c698fc: Adding NFC sample resources (DO NOT MERGE)
...
* commit '48c698fc1497a01743f9ce5ab6fb8f6700847259':
Adding NFC sample resources (DO NOT MERGE)
2010-11-12 18:46:38 -08:00
Megha Joshi
48c698fc14
Adding NFC sample resources (DO NOT MERGE)
...
Change-Id: I687d07ebe4f8bd0c5dec30e69af0d3e880a68230
2010-11-12 18:35:49 -08:00
Dianne Hackborn
55d3bae235
Merge "Change recents UIs to do task switches."
2010-11-12 18:18:15 -08:00
satok
b66d287e30
Add a setter of InputMethodSubtype to InputMethodManager
...
- Public API: void setCurrentInputMethodSubtype(int pos)
Change-Id: I55daa19ba924999def544bf841f00bf54852f3e1
2010-11-13 09:49:59 +09:00
satok
03eb319a3a
Reset IME to the build-in IME when there is something wrong with the current IME.
...
Bug: 3186000
- By this change, there will be no need to find new applicable IME in Settings application
- This change handles the edge case that there is something wrong with the current IME
Change-Id: Idb42b6184ac135370064b967305faa81f1b382b2
2010-11-13 09:30:50 +09:00
Brian Muramatsu
5c5dfd0aa5
Merge "Fix NPE in SQLiteDatabase#updateWithOnConflict"
2010-11-12 15:55:14 -08:00
Vasu Nori
54511bb6e4
Merge "remove unnecessary code from DownloadManager"
2010-11-12 15:46:25 -08:00
Gil Dobjanschi
bbced1b9e9
Merge "Transition invalidation bug fix."
2010-11-12 15:39:16 -08:00
James Dong
a9d02bf602
Merge "Separate the key for audio sampling rate and video frame rate in MetaData.h"
2010-11-12 15:33:41 -08:00
Gil Dobjanschi
75159247d8
Transition invalidation bug fix.
...
Change-Id: I2ca901a805e377fb7d3374281a986b82bcf02590
2010-11-12 15:29:57 -08:00
Vasu Nori
e16c43bc59
remove unnecessary code from DownloadManager
...
Change-Id: Ief1693785f0484c1b434fb41a68693f9aff96492
2010-11-12 15:05:15 -08:00
satok
b0b5b17442
Merge "Add a function to switch back to the last used IME"
2010-11-12 15:03:03 -08:00
Jason Sams
c930e1f736
Merge "Fix line drawing in RS example."
2010-11-12 15:02:06 -08:00
Jason Sams
7194a7bacd
Merge "Document RS element and type and add validity checking to type creation."
2010-11-12 15:01:07 -08:00
satok
735cf38b8c
Add a function to switch back to the last used IME
...
Change-Id: Iac7bcc2ee16dd04d91a3e75b160622d246788c9a
2010-11-13 08:00:25 +09:00
Jason Sams
815aaebb59
Fix line drawing in RS example.
...
Change-Id: I5a83ac8d943488d19d83af1bd20a15a3c02999da
2010-11-12 14:58:56 -08:00
Xavier Ducrohet
cb4e77389c
Merge "Layoutlib: Fix alpha support in Canvas/Paint."
2010-11-12 14:58:55 -08:00
Xavier Ducrohet
cea3a1ccf0
Merge "Layoutlib: Fill the default prop value map for View objects."
2010-11-12 14:58:48 -08:00
Jason Sams
a1b13ed091
Document RS element and type and add validity checking to type creation.
...
Change-Id: Ic96c0199e27785b3eabde2c6e95ed514915328e9
2010-11-12 14:58:37 -08:00
Jeff Brown
46e75294d5
Enable touch splitting for all windows by default.
...
New default only applies to applications with targetSdkVersion >=
HONEYCOMB. Old applications default to no touch splitting for
their windows.
In addition, enabled split touch for various system windows.
Bug: 3049580
Change-Id: Idc8da9baa2cd8e1e4e76af8967d7b6a5ccb94427
2010-11-12 14:53:43 -08:00
Jean-Michel Trivi
1a22bdb01a
Add support for audio recording source in generic audio policy mgr.
...
Update the platform-independent audio policy manager to pass the
nature of the audio recording source to the audio policy client
interface through the AudioPolicyClientInterface::setParameters()
method.
Change-Id: I6b4fd0f8a3acea0d7d30bbad98edd1977dc012bf
2010-11-12 14:35:52 -08:00
Xavier Ducrohet
9e27936e4a
Layoutlib: Fix alpha support in Canvas/Paint.
...
Change-Id: I359098cfc542a7a0b7d99478c0eb13587b4439d0
2010-11-12 14:20:45 -08:00
Xavier Ducrohet
cf52390eee
Layoutlib: Fill the default prop value map for View objects.
...
Change-Id: I35426ced17a10eb092fac2153276f1202692876f
2010-11-12 14:02:49 -08:00
Gilles Debunne
62e2fa24cd
Update-api step missing after build fix.
...
Change-Id: I8c1cda587bc6dcf6302d14da58ea733b7b8d137a
2010-11-12 14:01:09 -08:00
Brian Muramatsu
46a8851360
Fix NPE in SQLiteDatabase#updateWithOnConflict
...
Bug 3188586
...to restore old behavior of throwing IllegalArgumentException
when values is null.
Change-Id: Ic2df542b2cdbdb7571080eb7f0fc6a4fe1678446
2010-11-12 14:00:36 -08:00
Alon Albert
6e079a32bc
Reset backoff on successful sync
...
Change-Id: I5661485e580dae127c756cd13e814987242e26dd
2010-11-12 13:42:56 -08:00
Brad Fitzpatrick
9feaa0fb44
Merge "Disable SamplingProfilerIntegration until it's fixed."
2010-11-12 13:24:09 -08:00
Brad Fitzpatrick
0b91729b8d
Disable SamplingProfilerIntegration until it's fixed.
...
Change-Id: I685e0600414836d0caae8e37ee7e97cabeb555ce
2010-11-12 13:22:24 -08:00
Shimeng (Simon) Wang
ce1d004ca1
Merge "Fix mobile sites' viewport in fixed viewport mode."
2010-11-12 13:16:24 -08:00
Gilles Debunne
c7e7287aec
Fix in public.xml for broken build
...
Change-Id: I17fdd8a01eb06b4e63ea020bbdfe5dd281743a19
2010-11-12 13:01:18 -08:00
Dianne Hackborn
b677746bd8
Change recents UIs to do task switches.
...
When switching to a recent task that is currently active, do a
task switch instead of a start activity, so the activity is brought
back in its exact same state.
Also fix problem in phone recents where the icon would disappear
after you touch it.
Change-Id: Id5c8478f8c33c90f52fbb4d969037d2bf5af9fff
2010-11-12 12:44:19 -08:00
Gilles Debunne
e7b73d2974
Merge "Added a flag for TextView that allows for text selection in read-only TextViews."
2010-11-12 12:23:00 -08:00
Leon Scroggins
56a102c02e
nativeFocusCandidateTextSize now returns a float.
...
Bug:3085564
Requires a change in external/webkit.
Change-Id: Id2960226766e87b4d0ff364c2e5b3bee6b6757ad
2010-11-12 15:03:30 -05:00
Shimeng (Simon) Wang
f902e4b2b5
Fix mobile sites' viewport in fixed viewport mode.
...
issue:3003933
Change-Id: I4d9665c578443fcc12bab2f929ffa8b5995c28f7
2010-11-12 11:58:46 -08:00
Adam Cohen
176116aa60
Merge "-Prevent StackView from advancing while interacting with it -Fixed null pointer exception Change-Id: I294a0d055de51573d79219ef469c8df6ab04a297"
2010-11-12 11:38:35 -08:00
Gilles Debunne
86b9c78e3e
Added a flag for TextView that allows for text selection in read-only TextViews.
...
Bug 3101642
Change-Id: I5538e507043c89b02c07f3e1c1abc74a93467427
2010-11-12 11:33:01 -08:00
Leon Scroggins
393352608e
Merge "Provide variable for debugging the text in WebTextView."
2010-11-12 11:20:13 -08:00
Jason Sams
d99a7be36e
Merge "More documentation."
2010-11-12 11:15:59 -08:00
Adam Cohen
0ac116b688
-Prevent StackView from advancing while interacting with it
...
-Fixed null pointer exception
Change-Id: I294a0d055de51573d79219ef469c8df6ab04a297
2010-11-12 11:04:32 -08:00
Tor Norbye
83e40921b2
Merge "Fix fill color alpha in layoutlib"
2010-11-12 10:43:46 -08:00
Adam Powell
9a0d1d2a25
Merge "Fix bug 3146938 - Menus spawned by ActionBar should hide when action bar is hidden"
2010-11-12 10:37:50 -08:00
Leon Scroggins
c26dc9f38f
Provide variable for debugging the text in WebTextView.
...
Change-Id: I40630e3ab754c9e9805dc674c8c0c6c8688973c3
2010-11-12 13:08:14 -05:00
Alon Albert
95b831be6b
Merge "Improve logging"
2010-11-12 09:57:49 -08:00
Jaikumar Ganesh
fb7f721896
Merge "Don't call cancel discovery when its already canceelled."
2010-11-12 09:45:11 -08:00
Jaikumar Ganesh
58d0dcb75b
Don't call cancel discovery when its already canceelled.
...
Reported by: Leijun Tao
Change-Id: I5f04ecde16d147776a30810210cd3c973aee4d87
2010-11-12 09:41:12 -08:00
Robert Greenwalt
45f8b8bd04
Merge "Make getDataEnabled take more into account."
2010-11-12 08:50:50 -08:00
Leon Scroggins
c35f4ac309
Work on lining up the TextView and web page text.
...
Bug:3085564
Do not round the text size when applying it to the WebTextView,
so that it will better line up with the text shown on the web
page.
Modify the WebTextView paint to better match the paint used by
webkit.
Update the padding when the zoom level changes.
Change-Id: I284a6febcba2be21dc1ab3f74c6ab5751e1b19b6
2010-11-12 10:41:14 -05:00
Adam Powell
0458796f14
Fix bug 3146938 - Menus spawned by ActionBar should hide when action
...
bar is hidden
Any popup spawned by the private class MenuPopupHelper will be hidden
if its anchor becomes hidden. ("hidden" == !View#isShown())
Fix a bug where ActionBar subtitle views were not going away when
subtitle text was set to null.
Fix a bug when switching out of ActionBar tabbed nav mode with no
active tabs.
Change-Id: I1f30c067156221f96905ac69ab876418ad2e94f8
2010-11-11 22:55:36 -08:00
Dianne Hackborn
bdd19bc338
Add Theme.Holo.DialogWhenLarge
...
This theme gives you a dialog look when running on a large
or xlarge screen, otherwise a regular full-screen activity.
Also some new Fragment convenience APIs.
Change-Id: I3d97928ffaa4f3bdfd0cc5daf8823f9235c4ba68
2010-11-11 22:33:20 -08:00