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

8552 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
Dianne Hackborn
94c567e1e3 Whoops a little more on issue #2631417: Expose FLAG_EXTERNAL_STORAGE 
There was a gap in the bit numbers.

Change-Id: I0feef7dc4abed5db7412659b5ad078caffe4f2d4
 2010-04-26 18:50:11 -07:00
Dianne Hackborn
5a8f877cf8 am 3202d380: Fix issue #2631417: Expose FLAG_EXTERNAL_STORAGE 
Merge commit '3202d380226043fa665df3c92252f791f8c52d55' into froyo-plus-aosp

* commit '3202d380226043fa665df3c92252f791f8c52d55':
  Fix issue #2631417: Expose FLAG_EXTERNAL_STORAGE
 2010-04-26 18:00:08 -07:00
Dianne Hackborn
3202d38022 Fix issue #2631417: Expose FLAG_EXTERNAL_STORAGE 
Also update 8.xml to match the current API.

Change-Id: I668fe56f6c156c2e8daa458baa7410fdb8ebef52
 2010-04-26 17:51:34 -07:00
Marco Nelissen
55fb51aa41 resolved conflicts for merge of 86303198 to kraken 
Change-Id: Idd921c7108e4c2cd4a861ee1fb8b43e5d56f8f2f
 2010-04-26 17:42:07 -07:00
Marco Nelissen
863031983d am 8138cb49: Make Surface.toString() show more useful info to help debug bug 2594388. 
Merge commit '8138cb49e47f9a9905a316a217757710185c66aa' into froyo-plus-aosp

* commit '8138cb49e47f9a9905a316a217757710185c66aa':
  Make Surface.toString() show more useful info to help debug bug 2594388.
 2010-04-26 17:19:58 -07:00
Marco Nelissen
8138cb49e4 Make Surface.toString() show more useful info to help debug bug 2594388. 
Change-Id: I005d3388503d8886e11a26fece30b87572934f15
 2010-04-26 16:51:17 -07:00
Mathias Agopian
62801264e3 Merge "fix [2615973] ViewRoot locks the Surface even when the dirty region is empty" into kraken 2010-04-26 15:14:16 -07:00
Bjorn Bringert
069f296c51 am 13cb7a04: am cb4c894a: Merge "bugfix for: OOM error while doing voice search repeatedly" into froyo 
Merge commit '13cb7a04eaa2479e409216a8ca0826297af85a1d' into kraken

* commit '13cb7a04eaa2479e409216a8ca0826297af85a1d':
  bugfix for: OOM error while doing voice search repeatedly
 2010-04-26 11:10:10 -07:00
Bjorn Bringert
13cb7a04ea am cb4c894a: Merge "bugfix for: OOM error while doing voice search repeatedly" into froyo 
Merge commit 'cb4c894afa497943258cfb053ca35436f7b8e29a' into froyo-plus-aosp

* commit 'cb4c894afa497943258cfb053ca35436f7b8e29a':
  bugfix for: OOM error while doing voice search repeatedly
 2010-04-26 10:05:57 -07:00
Bjorn Bringert
cb4c894afa Merge "bugfix for: OOM error while doing voice search repeatedly" into froyo 2010-04-26 07:52:58 -07:00
Grace Kloba
93970f55bd am 60ae65ed: am 87782f2b: Merge "Restrict the range request to the servers claiming that they accept ranges. This may be too restrict as the spec says the server MAY set this in the response header. But this is the last minute change made in https://android-git.corp.g 
Merge commit '60ae65ed30564969b3e14642394c5e22c019125d' into kraken

* commit '60ae65ed30564969b3e14642394c5e22c019125d':
  Restrict the range request to the servers claiming
 2010-04-23 17:19:39 -07:00
Grace Kloba
3c8c69198e am bd17156f: am 85a8dcec: Merge "Only honor the scrollbar mode at the minimum zoom level. This reduced the impact of https://android-git.corp.google.com/g/#change,48683. In GB, we need to revisit this issue." into froyo 
Merge commit 'bd17156fda946fa0594687337bbd43cd85300940' into kraken

* commit 'bd17156fda946fa0594687337bbd43cd85300940':
  Only honor the scrollbar mode at the minimum zoom
 2010-04-23 17:19:31 -07:00
Grace Kloba
60ae65ed30 am 87782f2b: Merge "Restrict the range request to the servers claiming that they accept ranges. This may be too restrict as the spec says the server MAY set this in the response header. But this is the last minute change made in https://android-git.corp.google.com/g/# 
Merge commit '87782f2bdfc679fd8f3c7ae7cd72bfd0e71efdc6' into froyo-plus-aosp

* commit '87782f2bdfc679fd8f3c7ae7cd72bfd0e71efdc6':
  Restrict the range request to the servers claiming
 2010-04-23 17:14:49 -07:00
Grace Kloba
bd17156fda am 85a8dcec: Merge "Only honor the scrollbar mode at the minimum zoom level. This reduced the impact of https://android-git.corp.google.com/g/#change,48683. In GB, we need to revisit this issue." into froyo 
Merge commit '85a8dcec5460edda72e9917d4f02ad1b6a133251' into froyo-plus-aosp

* commit '85a8dcec5460edda72e9917d4f02ad1b6a133251':
  Only honor the scrollbar mode at the minimum zoom
 2010-04-23 17:14:15 -07:00
Jeff Hamilton
e30b9ce262 Attempt to fix the build. 2010-04-23 16:24:00 -07:00
Grace Kloba
87782f2bdf Merge "Restrict the range request to the servers claiming that they accept ranges. This may be too restrict as the spec says the server MAY set this in the response header. But this is the last minute change made in https://android-git.corp.google.com/g/#change,49444 I think it is safer to be conservative." into froyo 2010-04-23 16:19:22 -07:00
Grace Kloba
6ead8f6771 Restrict the range request to the servers claiming 
that they accept ranges. This may be too restrict as
the spec says the server MAY set this in the response
header. But this is the last minute change made in
https://android-git.corp.google.com/g/#change,49444
I think it is safer to be conservative.

Fix http://b/issue?id=2616477
 2010-04-23 15:57:58 -07:00
Adam Powell
81cd2e90cc Logo attribute for manifest and PackageManager methods to fetch it 
Change-Id: I2c5ac44a4e2af982a616b2012901d7395013b19f
 2010-04-23 15:49:07 -07:00
Grace Kloba
85a8dcec54 Merge "Only honor the scrollbar mode at the minimum zoom level. This reduced the impact of https://android-git.corp.google.com/g/#change,48683. In GB, we need to revisit this issue." into froyo 2010-04-23 15:27:58 -07:00
Grace Kloba
0653d22f62 Only honor the scrollbar mode at the minimum zoom 
level. This reduced the impact of https://android-git.corp.google.com/g/#change,48683.
In GB, we need to revisit this issue.

Wit this CL, http://b/issue?id=2512549 is still fine.

Fix http://b/issue?id=2619398
It should fix http://b/issue?id=2619415 when it is not in zoom out case.
It doesn't fix http://b/issue?id=2620979 as the site
is a mobile site. We have conflict with the requirement
from http://b/issue?id=2512549
 2010-04-23 15:21:24 -07:00
Dianne Hackborn
0c1be50ffa am dc14dc6d: am bf73bbff: Merge "Some debugging help for issue #2594388" into froyo 
Merge commit 'dc14dc6d60675be688c333bbc60a315d2c658054' into kraken

* commit 'dc14dc6d60675be688c333bbc60a315d2c658054':
  Some debugging help for issue #2594388
 2010-04-23 13:06:02 -07:00
Dianne Hackborn
dc14dc6d60 am bf73bbff: Merge "Some debugging help for issue #2594388" into froyo 
Merge commit 'bf73bbffc18f5abb5350fa3a410830c05ad10206' into froyo-plus-aosp

* commit 'bf73bbffc18f5abb5350fa3a410830c05ad10206':
  Some debugging help for issue #2594388
 2010-04-23 13:02:29 -07:00
Dianne Hackborn
ba3e31d9ee Some debugging help for issue #2594388 
WallpaperService doesn't always call onSurfaceDestroyed()

Just helps us see a little better what is going on.

Change-Id: Ibe8efd9e343e880ca31df446c8b36c7fa3722e87
 2010-04-22 18:59:03 -07:00
Leon Scroggins
39837c5a5e am 986a0380: am 69ec5c22: Remove the WebTextView if it is drawing when it shouldn\'t. 
Merge commit '986a038030ab57bd36a6eb630da1773b33dfb30b' into kraken

* commit '986a038030ab57bd36a6eb630da1773b33dfb30b':
  Remove the WebTextView if it is drawing when it shouldn't.
 2010-04-22 14:31:49 -07:00
Leon Scroggins
986a038030 am 69ec5c22: Remove the WebTextView if it is drawing when it shouldn\'t. 
Merge commit '69ec5c22d09690d33f0b87a386de13cc61eb9b42' into froyo-plus-aosp

* commit '69ec5c22d09690d33f0b87a386de13cc61eb9b42':
  Remove the WebTextView if it is drawing when it shouldn't.
 2010-04-22 14:26:38 -07:00
Leon Scroggins
69ec5c22d0 Remove the WebTextView if it is drawing when it shouldn't. 
Bug 2614064

Change-Id: Id5d0a27e862bb783299f6fa4863221a27318f52c
 2010-04-22 17:09:24 -04:00
Grace Kloba
dbfd5e2567 am 627728d2: am a6ece18d: Merge "Added the subset of partial content support so that we can continue the interrupted request to support streaming the content even with a brief disconnection." into froyo 
Merge commit '627728d26c81ce7a3ee2f784036cfe0c4e5ef899' into kraken

* commit '627728d26c81ce7a3ee2f784036cfe0c4e5ef899':
  Added the subset of partial content support so that
 2010-04-22 13:25:55 -07:00
Robert Greenwalt
077952f73e am d9b802bd: am 05fa2144: Merge "Trim throttle logs." into froyo 
Merge commit 'd9b802bd03d0ef4792bc99289f16f6a05bd1ee95' into kraken

* commit 'd9b802bd03d0ef4792bc99289f16f6a05bd1ee95':
  Trim throttle logs.
 2010-04-22 13:24:37 -07:00