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

10798 Commits

Author SHA1 Message Date
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
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
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
The Android Open Source Project
24d9c149c8 am fc97669a: am 72a6af1a: am 7d952644: merge from open-source master 2010-05-12 14:16:50 -07:00
The Android Open Source Project
72a6af1ab1 am 7d952644: merge from open-source master 
Merge commit '7d9526445c8631f347c7bf7d944e5bb1dc35b0b5' into kraken

* commit '7d9526445c8631f347c7bf7d944e5bb1dc35b0b5':
  Support to display message when operation is blocked due to FDN being enabled
 2010-05-12 14:12:25 -07:00
The Android Open Source Project
7d9526445c merge from open-source master 
Change-Id: Ib5ea9745c2b652d64646e3e28c12e63815321ff9
 2010-05-12 14:10:23 -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
Jim Miller
f5eaee96b0 am c8212613: am 99dcfe7c: am 4d89954d: am a2757901: Merge "Fix 2660488: Add LockScreen/InCallScreen resources to preloads" into froyo 2010-05-11 10:28:06 -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
Jim Miller
99dcfe7cda am 4d89954d: am a2757901: Merge "Fix 2660488: Add LockScreen/InCallScreen resources to preloads" into froyo 
Merge commit '4d89954dc4572a05339dc7a95ec683892558162b' into kraken

* commit '4d89954dc4572a05339dc7a95ec683892558162b':
  Fix 2660488: Add LockScreen/InCallScreen resources to preloads
 2010-05-11 10:23:42 -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
Dianne Hackborn
7e76b6d191 am 6d00151c: Merge "Hopefully fix issue #2662536: Why is launcher being killed?" into froyo 
Merge commit '6d00151c519d5c131cc1480978fe4417cc7bcc79' into froyo-plus-aosp

* commit '6d00151c519d5c131cc1480978fe4417cc7bcc79':
  Hopefully fix issue #2662536: Why is launcher being killed?
 2010-05-11 10:18:55 -07:00
Jim Miller
4d89954dc4 am a2757901: Merge "Fix 2660488: Add LockScreen/InCallScreen resources to preloads" into froyo 
Merge commit 'a27579016caf1438400a3637e3896bec653e3756' into froyo-plus-aosp

* commit 'a27579016caf1438400a3637e3896bec653e3756':
  Fix 2660488: Add LockScreen/InCallScreen resources to preloads
 2010-05-11 10:18:38 -07:00
Naveen Kalla
0a5174a6e9 Add support for EVDO Rev B 
Change-Id: I8588e8b342c51f4b79bced8ef8fe60d57f07aefa
 2010-05-11 10:12:07 -07:00
Jeff Hamilton
3d32f6e522 Add Activity.isChangingConfiguration(). 
This allows activities to know if they're being
torn down due to a configuration change.

Bug: 2557550
Change-Id: Ibd9bf5a06c92dbe3789049b84133cf4754381873
 2010-05-11 11:48:10 -05:00
Naveen Kalla
18573e9281 Support to display message when operation is blocked due to FDN being enabled 
The terminal disallows USSD, SMS, Voice Call and Supplementary services
operations for numbers not in the Fixed Dialing Number (FDN) list when the
FDN service is enabled. FDN_CHECK_FAILURE error is sent from the RIL and the
message needs to be displayed to indicate the failure.

Change-Id: I49bd63f69a3f0201125b17cd16db2e8fcf93ddc3
 2010-05-11 09:12:00 -07:00
Steve Block
52ab0b39fc Merge webkit.org at r58033 : Update the WebKit UA string and LayoutTest ignore list 
Change-Id: I620e6da3f7318f329f3401075799e5659cacda82
 2010-05-11 14:28:10 +01:00
Mike Lockwood
31ac8e9d56 Add new permission android.permission.ACCESS_USB to allow access to USB devices 
Change-Id: Ib3dd573a5ef3950d20b21251fe7a3efad56b5c1f
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-05-11 08:29:19 -04:00
Keith Ito
be65399baf Merge "Fix for bug 2672749: StringIndexOutOfBoundsException in Uri.getQueryParameter" into froyo 2010-05-10 20:41:47 -07:00
Wu-cheng Li
f0b8679b5d am 0c3bba3e: am e1b2b3b0: Merge "Add continuous focus mode constant." into kraken 2010-05-10 20:07:54 -07:00