Romain Guy
743e25c914
Merge "Prevent possible leak in AbsListViews."
2010-05-13 14:06:59 -07:00
Romain Guy
82afc7b32b
Prevent possible leak in AbsListViews.
...
This change unregisters a list's data observer from the adapter when the list
is detached from the window. The default data observer impl. is a non-static
inner class with a synthesized pointer to the list. Thus if an app keeps
the adapter around the list is also kept around. This can be a problem with
dialogs in particular.
Change-Id: Ia95a995d3f54b9caf1bbcd2c7239a0318511b08c
2010-05-13 14:03:09 -07:00
Jaikumar Ganesh
61c98cd643
Merge "Remove duplicate definition of flag."
2010-05-13 13:54:03 -07:00
Dianne Hackborn
3d44416dc4
Merge "Further work on fragments:"
2010-05-13 13:46:30 -07:00
Jaikumar Ganesh
26888576f7
Remove duplicate definition of flag.
...
Change-Id: I9bdcdf5f12677162f0b735a277fce8a75fa13d39
2010-05-13 13:41:37 -07:00
Dianne Hackborn
b4bc78b16a
Further work on fragments:
...
- Implement all of the state saving and restoring machinery. This
caused some flux in the API.
- Add ability to have fragments that are retained across activity
instances.
- Fix some bugs.
Change-Id: Ib6b5b0752d7f8d667cfdcd3e76d127cc9b6d901b
2010-05-13 13:36:10 -07:00
Jaikumar Ganesh
fce9609a18
resolved conflicts for merge of 0de3cc9b to master
...
Change-Id: I9fcf892de6ebe90c6a4be19d02e3a009ddda89aa
2010-05-13 12:42:59 -07:00
Jaikumar Ganesh
54a8f29523
Merge "Add FLAG_RERAIN_PHONE_NUMBER_FORMATTING." into kraken
2010-05-13 12:20:06 -07:00
Adam Powell
bdfb5312c0
Merge "ActionBar added to framework, integrated with Activity and styles. Added onClick attribute support to menus in MenuInflater."
2010-05-13 11:07:58 -07:00
The Android Open Source Project
6df9720b8d
am fd5b040a: am 485b800e: am 1a3b3d48: merge from open-source master
2010-05-13 09:57:11 -07:00
The Android Open Source Project
485b800eac
am 1a3b3d48: merge from open-source master
...
Merge commit '1a3b3d48413d9134738c9b457292fb2b71a5dfe4' into kraken
* commit '1a3b3d48413d9134738c9b457292fb2b71a5dfe4':
Add some documentation about the thread safety of Cursor and some of the SQLite* classes.
2010-05-13 09:53:16 -07:00
The Android Open Source Project
1a3b3d4841
merge from open-source master
...
Change-Id: I51b4eccfde8e74c69ab8e0c051bb8ea718ee7101
2010-05-13 09:04:45 -07:00
Kenny Root
dfd550d44c
Add @hide tag to fix SDK build
...
Previous Canvas changes missed a @hide tag, so droiddoc was complaining
about a missing method since that was also hidden.
Change-Id: Ib70a9fa2e20fe32b74ba901bb289e77583164004
2010-05-13 06:21:41 -07:00
Adam Powell
33b974393b
ActionBar added to framework, integrated with Activity and styles.
...
Added onClick attribute support to menus in MenuInflater.
Change-Id: I739771b4f249d87a0d8b15969f3d526b099067a1
2010-05-13 01:27:59 -07:00
Kenny Root
5d8636dbad
Merge "Modify Canvas drawText to run bidi and shape."
2010-05-12 19:34:01 -07:00
Costin Manolache
2b6b835196
am 0c6028c1: am c1959658: am fa2e3dcd: am 8ea9f130: Merge "Bug 2680071: Rename the Cloud to Device" into froyo
2010-05-12 19:12:53 -07:00
Costin Manolache
c195965893
am fa2e3dcd: am 8ea9f130: Merge "Bug 2680071: Rename the Cloud to Device" into froyo
...
Merge commit 'fa2e3dcd855f573e160dbf258fd60a172b6e3f02' into kraken
* commit 'fa2e3dcd855f573e160dbf258fd60a172b6e3f02':
Bug 2680071: Rename the Cloud to Device
2010-05-12 19:10:01 -07:00
Costin Manolache
fa2e3dcd85
am 8ea9f130: Merge "Bug 2680071: Rename the Cloud to Device" into froyo
...
Merge commit '8ea9f130d24a7dd1e505ba0cf437bdd8a660975e' into froyo-plus-aosp
* commit '8ea9f130d24a7dd1e505ba0cf437bdd8a660975e':
Bug 2680071: Rename the Cloud to Device
2010-05-12 19:06:39 -07:00
Costin Manolache
8ea9f130d2
Merge "Bug 2680071: Rename the Cloud to Device" into froyo
2010-05-12 19:04:27 -07:00
Doug Felt
f47d7405bb
Modify Canvas drawText to run bidi and shape.
...
Adds drawTextRun as internal API on Canvas and GraphicsOperations.
Adds implementation to implementors of GraphicsOperations.
Adds state and API on Paint to control the bidi algorithm when used
by Canvas. This API is currently hidden.
The drawText changes are incomplete since shaping is not yet available
in the native code.
Change-Id: I4368048aef9545df0953a349381771603e04b619
2010-05-12 18:50:02 -07:00
Konstantin Lopyrev
0dc407f9a6
Merge "Fix 2673731: Added password history"
2010-05-12 18:01:41 -07:00
Konstantin Lopyrev
863f22d045
Fix 2673731: Added password history
...
Change-Id: I88919357abea31062caf96b214823b03cbaa15a4
2010-05-12 17:17:53 -07:00
Jeff Hamilton
f3ca9a5c7e
Add some documentation about the thread safety of Cursor and some of the SQLite* classes.
...
Change-Id: Icae51052d1c942d7d60bb958d3703411da001079
2010-05-12 16:44:19 -07:00
Costin Manolache
8d83f9e31b
Bug 2680071: Rename the Cloud to Device
...
Change-Id: I12ab32de393e44a499e3f9e3a0b38f4682156ff5
2010-05-12 16:16:34 -07:00
Romain Guy
d4a2fffefd
Merge "Fix dump of the persistent drawing cache attribute."
2010-05-12 15:42:15 -07:00
Romain Guy
203688c657
Fix dump of the persistent drawing cache attribute.
...
Change-Id: I351028f6e0858c9ebf7f59bd6cc964925bc3e2b9
2010-05-12 15:41:32 -07:00
Grace Kloba
f0cec93f69
am d4ef2973: am 2fb3b394: am bfc63c7b: am 336d7dcb: The default AlertDialog allows cancel. But the default JSConfim doesn\'t have a cancel listener. So when user cancel the dialog, we do not wake up the WebCoreThread. The same code is already done for JSPrompt dialog
2010-05-12 15:39:26 -07:00
Grace Kloba
2fb3b394fb
am bfc63c7b: am 336d7dcb: The default AlertDialog allows cancel. But the default JSConfim doesn\'t have a cancel listener. So when user cancel the dialog, we do not wake up the WebCoreThread. The same code is already done for JSPrompt dialog correctly.
...
Merge commit 'bfc63c7b83160fd3e771e5187d317348e72d6c27' into kraken
* commit 'bfc63c7b83160fd3e771e5187d317348e72d6c27':
The default AlertDialog allows cancel. But the default
2010-05-12 15:35:37 -07:00
Grace Kloba
bfc63c7b83
am 336d7dcb: The default AlertDialog allows cancel. But the default JSConfim doesn\'t have a cancel listener. So when user cancel the dialog, we do not wake up the WebCoreThread. The same code is already done for JSPrompt dialog correctly.
...
Merge commit '336d7dcb105a43ee4de51fd0f26f277c63662f02' into froyo-plus-aosp
* commit '336d7dcb105a43ee4de51fd0f26f277c63662f02':
The default AlertDialog allows cancel. But the default
2010-05-12 15:33:30 -07:00
The Android Open Source Project
381b55863e
am 7cd6ca9b: am d6e24ca2: am 4adacd23: merge from open-source master
2010-05-12 15:25:07 -07:00
The Android Open Source Project
d6e24ca28b
am 4adacd23: merge from open-source master
...
Merge commit '4adacd23d4c91569b16fe50419f1a91f68d805bd' into kraken
* commit '4adacd23d4c91569b16fe50419f1a91f68d805bd':
Add support for EVDO Rev B
2010-05-12 14:56:00 -07:00
The Android Open Source Project
4adacd23d4
merge from open-source master
...
Change-Id: If6730b50627b2231bd345e594d8d30a37557849e
2010-05-12 14:53:25 -07:00
Grace Kloba
336d7dcb10
The default AlertDialog allows cancel. But the default
...
JSConfim doesn't have a cancel listener. So when
user cancel the dialog, we do not wake up the WebCoreThread.
The same code is already done for JSPrompt dialog correctly.
Fix http://b/issue?id=2679139
2010-05-12 14:28:07 -07:00
Brett Chabot
00f88a950b
Merge "Skip ActivityWaiter synchronization on Instrumentation.callActivityOnDestroy"
2010-05-12 14:26:10 -07:00
Brett Chabot
18f9ce0dc1
Skip ActivityWaiter synchronization on Instrumentation.callActivityOnDestroy
...
Temporary workaround for bug 2630683
Change-Id: Ie9ee922dd1f515fc273cb602cb649174e3b8ae6f
2010-05-12 14:24:47 -07:00
Leon Scroggins
2c8e051508
Remove text options when longpressing off a textfield.
...
Bug 2676172
Change-Id: Ib1eff9a6e7a8ff3e83897a89b6bb4fab9bb7b0c4
2010-05-12 14:45:49 -04:00
Costin Manolache
3a17fbb757
am b20842c7: am 8579a4d7: am 625de488: am e2055fe4: Merge "Bug 2673557: rename datamessaging" into froyo
2010-05-12 09:24:20 -07:00
Costin Manolache
8579a4d726
am 625de488: am e2055fe4: Merge "Bug 2673557: rename datamessaging" into froyo
...
Merge commit '625de488973f262e56d3ee6825a8cf1ebaee089b' into kraken
* commit '625de488973f262e56d3ee6825a8cf1ebaee089b':
Bug 2673557: rename datamessaging
2010-05-12 07:55:32 -07:00
Costin Manolache
625de48897
am e2055fe4: Merge "Bug 2673557: rename datamessaging" into froyo
...
Merge commit 'e2055fe4258f8085a88328579c852ec26d77bb10' into froyo-plus-aosp
* commit 'e2055fe4258f8085a88328579c852ec26d77bb10':
Bug 2673557: rename datamessaging
2010-05-12 07:49:16 -07:00
Jeff Hamilton
e890bec743
Merge "Add Activity.isChangingConfiguration()."
2010-05-11 21:45:19 -07:00
Leon Scroggins
810f5ccb99
Remove unnecessary calls to rebuildWebTextView.
...
Bug 2674635
Change-Id: Ib33a5486b880868de7182c36a22f204383c58149
2010-05-11 15:20:13 -04:00
Costin Manolache
e2055fe425
Merge "Bug 2673557: rename datamessaging" into froyo
2010-05-11 11:42:58 -07:00
Keith Ito
6b385b6637
am a52c85da: am 8528fcb1: am a8d8cb12: am be65399b: Merge "Fix for bug 2672749: StringIndexOutOfBoundsException in Uri.getQueryParameter" into froyo
2010-05-11 10:44:16 -07:00
Nicolas Roard
9863ba94f0
resolved conflicts for merge of bfd6805a to master
...
Change-Id: Ie975e4cd7391d62949c563453358aa999c8a4b45
2010-05-11 10:40:11 -07:00
Dianne Hackborn
834910f51f
am 217f2686: am 7d5cea98: am 7e76b6d1: am 6d00151c: Merge "Hopefully fix issue #2662536 : Why is launcher being killed?" into froyo
2010-05-11 10:28:20 -07:00
Keith Ito
8528fcb199
am a8d8cb12: am be65399b: Merge "Fix for bug 2672749: StringIndexOutOfBoundsException in Uri.getQueryParameter" into froyo
...
Merge commit 'a8d8cb12b3dbe5e196a3ff2549f8594a704ecde4' into kraken
* commit 'a8d8cb12b3dbe5e196a3ff2549f8594a704ecde4':
Fix for bug 2672749: StringIndexOutOfBoundsException in Uri.getQueryParameter
2010-05-11 10:24:03 -07:00
Nicolas Roard
2f68be5417
am 373b4913: am f78acacb: Fix the \'wobbling fixed elements\' bug. Cherry-picked from master. This CL has a corresponding C++ counterpart ( https://android-git.corp.google.com/g/#change,51149 )
...
Merge commit '373b4913ab5398736551ab718eb8c39d6f76e5d0' into kraken
* commit '373b4913ab5398736551ab718eb8c39d6f76e5d0':
Fix the 'wobbling fixed elements' bug.
2010-05-11 10:24:00 -07:00
Dianne Hackborn
7d5cea988b
am 7e76b6d1: am 6d00151c: Merge "Hopefully fix issue #2662536 : Why is launcher being killed?" into froyo
...
Merge commit '7e76b6d191e1173bd85337a2861d9914922f5a0d' into kraken
* commit '7e76b6d191e1173bd85337a2861d9914922f5a0d':
Hopefully fix issue #2662536 : Why is launcher being killed?
2010-05-11 10:23:56 -07:00
Keith Ito
a8d8cb12b3
am be65399b: Merge "Fix for bug 2672749: StringIndexOutOfBoundsException in Uri.getQueryParameter" into froyo
...
Merge commit 'be65399baf23855094596e27c25763ff92e9e027' into froyo-plus-aosp
* commit 'be65399baf23855094596e27c25763ff92e9e027':
Fix for bug 2672749: StringIndexOutOfBoundsException in Uri.getQueryParameter
2010-05-11 10:19:06 -07:00
Nicolas Roard
373b4913ab
am f78acacb: Fix the \'wobbling fixed elements\' bug. Cherry-picked from master. This CL has a corresponding C++ counterpart ( https://android-git.corp.google.com/g/#change,51149 )
...
Merge commit 'f78acacb0d7a8e4d9e85a1cd6eed0f6bb38d6776' into froyo-plus-aosp
* commit 'f78acacb0d7a8e4d9e85a1cd6eed0f6bb38d6776':
Fix the 'wobbling fixed elements' bug.
2010-05-11 10:18:59 -07:00