drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
23,791 Commits 1 Branch 0 Tags
Commit Graph

8969 Commits

Author SHA1 Message Date
The Android Open Source Project
a4bb641040 am 1331ded8: am e28776bb: am b1110149: merge from open-source master 2010-05-13 14:59:22 -07:00
The Android Open Source Project
e28776bbd7 am b1110149: merge from open-source master 
Merge commit 'b1110149cccc3b99e59ead34ca46e5ac026f6db9' into kraken

* commit 'b1110149cccc3b99e59ead34ca46e5ac026f6db9':
  Use integer for loop counter instead of float
  New test in FrameworkTest for the VelocityTracker class
  Preserve '+' in phone numbers imported from SIM.
 2010-05-13 14:56:02 -07:00
The Android Open Source Project
b1110149cc merge from open-source master 
Change-Id: I88a580162b34a80d1e3e7987b7a301c253afa0e8
 2010-05-13 14:50:16 -07:00
Mike Lockwood
468202dd71 am 702b8752: am 5a9cbb29: am a3d5549c: am 098e58da: Use SystemClock.elapsedRealtime in ShutdownThread timeout logic 2010-05-13 14:09:46 -07:00
Romain Guy
743e25c914 Merge "Prevent possible leak in AbsListViews." 2010-05-13 14:06:59 -07:00
Mike Lockwood
5a9cbb291f am a3d5549c: am 098e58da: Use SystemClock.elapsedRealtime in ShutdownThread timeout logic 
Merge commit 'a3d5549c802bc4fbf1e1ca05bc3552db17212036' into kraken

* commit 'a3d5549c802bc4fbf1e1ca05bc3552db17212036':
  Use SystemClock.elapsedRealtime in ShutdownThread timeout logic
 2010-05-13 14:06:25 -07:00
Mike Lockwood
a3d5549c80 am 098e58da: Use SystemClock.elapsedRealtime in ShutdownThread timeout logic 
Merge commit '098e58da93f304d7d7791f193c6237870b94989d' into froyo-plus-aosp

* commit '098e58da93f304d7d7791f193c6237870b94989d':
  Use SystemClock.elapsedRealtime in ShutdownThread timeout logic
 2010-05-13 14:04:30 -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
Mike Lockwood
098e58da93 Use SystemClock.elapsedRealtime in ShutdownThread timeout logic 
This avoids problems if the time is reset while shutting down.

Change-Id: I54c7c787e55648ebf5a68e79056f92fbac0081ae
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-05-13 16:29:49 -04: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
Kenny Root
b79781af1e Use integer for loop counter instead of float 
Change-Id: Iafaccbb3a3a7cbe0d67ed6827906d713c37ce89b
 2010-05-13 12:17:15 -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