Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
22,997 Commits 3 Branches 0 Tags
ca3a7b9bc55ef232c282108cf9d65cb81d008d68
Commit Graph

10574 Commits

Author SHA1 Message Date
Vasu Nori
ca3a7b9bc5 am 43f2c35b: am 91a62f3d: am a07c4cbe: Merge "bug:2622719 move \'forcing of cursor execution\' to ContentProvider" into froyo 2010-04-28 15:50:49 -07:00
Vasu Nori
43f2c35bf3 am 91a62f3d: am a07c4cbe: Merge "bug:2622719 move \'forcing of cursor execution\' to ContentProvider" into froyo 
Merge commit '91a62f3d4a6b4f92c694d09e991fc6f82701fc47' into kraken

* commit '91a62f3d4a6b4f92c694d09e991fc6f82701fc47':
  bug:2622719  move 'forcing of cursor execution' to ContentProvider
 2010-04-28 15:42:23 -07:00
Vasu Nori
91a62f3d4a am a07c4cbe: Merge "bug:2622719 move \'forcing of cursor execution\' to ContentProvider" into froyo 
Merge commit 'a07c4cbea9756236f0a28c4f0f7e1340bf3e2f06' into froyo-plus-aosp

* commit 'a07c4cbea9756236f0a28c4f0f7e1340bf3e2f06':
  bug:2622719  move 'forcing of cursor execution' to ContentProvider
 2010-04-28 15:38:44 -07:00
Vasu Nori
020e534579 bug:2622719 move 'forcing of cursor execution' to ContentProvider 
revert part of the CL: Ia561135e974a44ad3e3774ecb23c6a3d0fc38176
and add it to ContentProvider.query() to force query execution
in worker thread, instead of having the main thread incur the cost
of query execution and potentially get ANR

Change-Id: I0ea8a170bd954a421f4ad825f8090319a83a5b2b
 2010-04-28 15:32:54 -07:00
Fred Quintana
2e192931d5 am 2bf0f1a3: am 00b92b94: am 9aaf24f2: Merge "revert a change in the SyncManager that caused it to not cancel long running syncs if the next sync had the same account and authority." into froyo 2010-04-28 14:25:19 -07:00
Fred Quintana
2bf0f1a3c1 am 00b92b94: am 9aaf24f2: Merge "revert a change in the SyncManager that caused it to not cancel long running syncs if the next sync had the same account and authority." into froyo 
Merge commit '00b92b943ff397cb7f7c4827a0eea9df7aa22071' into kraken

* commit '00b92b943ff397cb7f7c4827a0eea9df7aa22071':
  revert a change in the SyncManager that caused it to not cancel
 2010-04-28 14:18:19 -07:00
Fred Quintana
00b92b943f am 9aaf24f2: Merge "revert a change in the SyncManager that caused it to not cancel long running syncs if the next sync had the same account and authority." into froyo 
Merge commit '9aaf24f2a46eacd1e342f8c0300c3093646e2814' into froyo-plus-aosp

* commit '9aaf24f2a46eacd1e342f8c0300c3093646e2814':
  revert a change in the SyncManager that caused it to not cancel
 2010-04-28 14:13:55 -07:00
Fred Quintana
9aaf24f2a4 Merge "revert a change in the SyncManager that caused it to not cancel long running syncs if the next sync had the same account and authority." into froyo 2010-04-28 14:10:05 -07:00
Gilles Debunne
0ab6dd0e26 Merge "Changed steps names in documentation." 2010-04-28 10:26:20 -07:00
Kenny Root
fb9856218a am 5d84df0c: am 9fe55514: am 4bba2149: Merge "Import revised translations" into froyo 2010-04-28 09:56:45 -07:00
Kenny Root
5d84df0c82 am 9fe55514: am 4bba2149: Merge "Import revised translations" into froyo 
Merge commit '9fe55514524993936eafe9e77e3dd98ba17a78b6' into kraken

* commit '9fe55514524993936eafe9e77e3dd98ba17a78b6':
  Import revised translations
 2010-04-28 09:47:27 -07:00
Kenny Root
9fe5551452 am 4bba2149: Merge "Import revised translations" into froyo 
Merge commit '4bba2149f3f2709b24dc40118461c5d683ed6965' into froyo-plus-aosp

* commit '4bba2149f3f2709b24dc40118461c5d683ed6965':
  Import revised translations
 2010-04-28 09:32:55 -07:00
Kenny Root
4bba2149f3 Merge "Import revised translations" into froyo 2010-04-28 08:05:03 -07:00
Steve Howard
db1e48a9de Merge "New drawables for the pending update to the maps API." 2010-04-27 19:20:08 -07:00
Vasu Nori
b57f85bc5b am 6813f8d2: am 785c8983: am 996960de: Merge "remove myname accidentally included in one of the files" into froyo 2010-04-27 18:57:14 -07:00
Dianne Hackborn
3d2b69ff8a am 16afc5ed: am 048b40eb: am e367896e: Merge "Fix issue #2594388: WallpaperService doesn\'t always call onSurfaceDestroyed()" into froyo 2010-04-27 18:57:10 -07:00
Adam Powell
ea58d14e23 am 067521f9: am b40cfc16: am 2ea21a84: Merge "Fix a WebView scrolling regression - bug 2633572." into froyo 2010-04-27 18:56:18 -07:00
Fred Quintana
f910cf4dcb am 018579c4: am b2dbae87: am 6ce78924: Merge "Add JavaDoc for SyncResult http://b/2420252" into froyo 2010-04-27 18:56:12 -07:00
Gilles Debunne
7f4b6842ce Changed steps names in documentation. 
Change-Id: I0541709a719e35575bb2c42e6f2ea457d21c545b
 2010-04-27 17:54:21 -07:00
Vasu Nori
6813f8d291 am 785c8983: am 996960de: Merge "remove myname accidentally included in one of the files" into froyo 
Merge commit '785c89835741ca735fbb766bc2e1aeb68a4d5169' into kraken

* commit '785c89835741ca735fbb766bc2e1aeb68a4d5169':
  remove myname accidentally included in one of the files
 2010-04-27 16:53:16 -07:00
Vasu Nori
785c898357 am 996960de: Merge "remove myname accidentally included in one of the files" into froyo 
Merge commit '996960dea8ae0c2c5668e1051c5a9c5a4fb4d888' into froyo-plus-aosp

* commit '996960dea8ae0c2c5668e1051c5a9c5a4fb4d888':
  remove myname accidentally included in one of the files
 2010-04-27 16:49:29 -07:00
Dianne Hackborn
16afc5ed56 am 048b40eb: am e367896e: Merge "Fix issue #2594388: WallpaperService doesn\'t always call onSurfaceDestroyed()" into froyo 
Merge commit '048b40ebdc980906193cfcb66274e2a1f3ec6093' into kraken

* commit '048b40ebdc980906193cfcb66274e2a1f3ec6093':
  Fix issue #2594388: WallpaperService doesn't always call onSurfaceDestroyed()
 2010-04-27 16:45:19 -07:00
Vasu Nori
996960dea8 Merge "remove myname accidentally included in one of the files" into froyo 2010-04-27 16:44:58 -07:00
Dianne Hackborn
048b40ebdc am e367896e: Merge "Fix issue #2594388: WallpaperService doesn\'t always call onSurfaceDestroyed()" into froyo 
Merge commit 'e367896e91a0d75250f00f2de3929495595719d4' into froyo-plus-aosp

* commit 'e367896e91a0d75250f00f2de3929495595719d4':
  Fix issue #2594388: WallpaperService doesn't always call onSurfaceDestroyed()
 2010-04-27 16:42:42 -07:00
Dianne Hackborn
e367896e91 Merge "Fix issue #2594388: WallpaperService doesn't always call onSurfaceDestroyed()" into froyo 2010-04-27 16:39:44 -07:00
Fred Quintana
12664a7a4d revert a change in the SyncManager that caused it to not cancel 
long running syncs if the next sync had the same account and
authority.

Change-Id: I0c18ce3b7098e79e2080e401e441ad246b1d6910
http://b/2631221
 2010-04-27 16:33:19 -07:00
Vasu Nori
0f43f2f700 remove myname accidentally included in one of the files 
Change-Id: I189db1cc60069b4318fa32a8b5aea6916ac5aa4e
 2010-04-27 16:24:20 -07:00
Dianne Hackborn
18ee31e897 Fix issue #2594388: WallpaperService doesn't always call onSurfaceDestroyed() 
Take care of the window manager destroying a surface, to report to the
app that it has been destroyed.  Make sure to perform a traversal when
becoming visible to re-create the surface if needed.

Change-Id: If3bc05e0106f90d4c3bad2d7575212667680fbc8
 2010-04-27 15:55:30 -07:00
Brett Chabot
1fc1ec4516 Merge "2604226 Add test cases for the internal accessibility infrastructure." 2010-04-27 15:47:12 -07:00
Kenny Root
19d9bdedee Import revised translations 
Change-Id: I03670c68c861c85e299c020bef04b663ac28b69c
 2010-04-27 14:11:05 -07:00
Shimeng (Simon) Wang
7095d75ead am 447beb52: am 05fd7e7d: Add good international characters to the path part of Url pattern. 
Merge commit '447beb52be8f97154db2273b4130fd83bf34d840' into kraken

* commit '447beb52be8f97154db2273b4130fd83bf34d840':
  Add good international characters to the path part of Url pattern.
 2010-04-27 12:37:41 -07:00
Shimeng (Simon) Wang
447beb52be am 05fd7e7d: Add good international characters to the path part of Url pattern. 
Merge commit '05fd7e7d328261260a348c0b6ba840bc1f60cb14' into froyo-plus-aosp

* commit '05fd7e7d328261260a348c0b6ba840bc1f60cb14':
  Add good international characters to the path part of Url pattern.
 2010-04-27 12:34:03 -07:00
Dianne Hackborn
525bb6a0cd am b6c45927: am 44f2c6ba: am 2e4b98dc: Merge "Whoops a little more on issue #2631417: Expose FLAG_EXTERNAL_STORAGE" into froyo 2010-04-27 12:27:36 -07:00
Shimeng (Simon) Wang
05fd7e7d32 Add good international characters to the path part of Url pattern. 
Change-Id: Ib24f8ffc8554366cb4350ec2f9d7e77efb0cb083
 2010-04-27 20:23:55 +01:00
Fred Quintana
a31a945ba6 move favorites and my contacts group handling to the 
provider and sync adapter

Change-Id: I768d7407a42a72b24ece8abb1891d050c8b6760e
 2010-04-27 12:19:37 -07:00
Adam Powell
067521f95e am b40cfc16: am 2ea21a84: Merge "Fix a WebView scrolling regression - bug 2633572." into froyo 
Merge commit 'b40cfc162fc473aece63f449eaa1dd643d24b9c0' into kraken

* commit 'b40cfc162fc473aece63f449eaa1dd643d24b9c0':
  Fix a WebView scrolling regression - bug 2633572.
 2010-04-27 12:11:04 -07:00
Adam Powell
b40cfc162f am 2ea21a84: Merge "Fix a WebView scrolling regression - bug 2633572." into froyo 
Merge commit '2ea21a84ef81849153f30bbea213acd5be110c08' into froyo-plus-aosp

* commit '2ea21a84ef81849153f30bbea213acd5be110c08':
  Fix a WebView scrolling regression - bug 2633572.
 2010-04-27 12:08:01 -07:00
Adam Powell
2ea21a84ef Merge "Fix a WebView scrolling regression - bug 2633572." into froyo 2010-04-27 12:05:40 -07:00
Fred Quintana
018579c473 am b2dbae87: am 6ce78924: Merge "Add JavaDoc for SyncResult http://b/2420252" into froyo 
Merge commit 'b2dbae879d32ce654528ab550c0dd017b67d7b08' into kraken

* commit 'b2dbae879d32ce654528ab550c0dd017b67d7b08':
  Add JavaDoc for SyncResult
 2010-04-27 12:02:32 -07:00
Fred Quintana
b2dbae879d am 6ce78924: Merge "Add JavaDoc for SyncResult http://b/2420252" into froyo 
Merge commit '6ce78924ebd179611c71122b864807dc4525f593' into froyo-plus-aosp

* commit '6ce78924ebd179611c71122b864807dc4525f593':
  Add JavaDoc for SyncResult
 2010-04-27 11:59:12 -07:00
Fred Quintana
6ce78924eb Merge "Add JavaDoc for SyncResult http://b/2420252" into froyo 2010-04-27 11:56:16 -07:00
Adam Powell
7bcf5172aa Fix a WebView scrolling regression - bug 2633572. 
Update mLastTouchX/Y on every drag. This prevents the creation of
dead zones that the user has to drag back out of at the edges of
a document.

Change-Id: I348d96dfd3907dba7c6ddd86b678329d65063ba9
 2010-04-27 11:45:38 -07:00
Fred Quintana
20c640e0f4 Add JavaDoc for SyncResult 
http://b/2420252

Change-Id: I88be5232d54959f6ec3480c36751a8fb7dc369fd
 2010-04-27 11:21:53 -07:00
Dianne Hackborn
ff121670b7 am 34483a0f: resolved conflicts for merge of 5a8f877c to kraken 2010-04-27 11:20:31 -07:00
Dianne Hackborn
b6c459276f am 44f2c6ba: am 2e4b98dc: Merge "Whoops a little more on issue #2631417: Expose FLAG_EXTERNAL_STORAGE" into froyo 
Merge commit '44f2c6baa68e02f7837cd1ca285d5c4f0f871b18' into kraken

* commit '44f2c6baa68e02f7837cd1ca285d5c4f0f871b18':
  Whoops a little more on issue #2631417: Expose FLAG_EXTERNAL_STORAGE
 2010-04-27 11:18:24 -07:00
Dianne Hackborn
34483a0f6e resolved conflicts for merge of 5a8f877c to kraken 
Change-Id: I3e320cfe9fcafe4f49e1863eaeddac96bc3f72c6
 2010-04-27 11:06:43 -07:00
Shimeng (Simon) Wang
7ce7cfc32d Merge "Add good international characters to the path part of Url pattern." 2010-04-27 08:06:54 -07:00
Shimeng (Simon) Wang
40064d3098 Add good international characters to the path part of Url pattern. 
Change-Id: I05efb7e52a023fcb92db9db2b41dbab2ccca87c7
 2010-04-27 12:12:02 +01:00
Svetoslav Ganov
0b29a58714 2604226 Add test cases for the internal accessibility infrastructure. 
Change-Id: Iaeb2c11b6c2167632086b50d9c79e6459cc072b8
 2010-04-26 21:23:54 -07:00
Dianne Hackborn
44f2c6baa6 am 2e4b98dc: Merge "Whoops a little more on issue #2631417: Expose FLAG_EXTERNAL_STORAGE" into froyo 
Merge commit '2e4b98dcd88f14fdb35e46236ec916493c570f28' into froyo-plus-aosp

* commit '2e4b98dcd88f14fdb35e46236ec916493c570f28':
  Whoops a little more on issue #2631417: Expose FLAG_EXTERNAL_STORAGE
 2010-04-26 18:54:06 -07:00