Commit Graph

38903 Commits

Author SHA1 Message Date
Steve Block
0e2bae14b4 Update DumpRenderTree2 to reflect removal of WEBKIT_MERGE_REVISION
We now use ThirdPartyProject.prop
See https://android-git.corp.google.com/g/#change,64831

Change-Id: Ib52fdd93ac08fb19ec8b7f539eb084c0b668e01b
2010-09-07 22:05:21 +01:00
Vasu Nori
2e8b36cc01 Merge "android change to handle Change-Id: Idbeed81b5b7349059e467b33a8641abf0b4aaeff" 2010-09-07 13:23:28 -07:00
Vasu Nori
422dad0f50 android change to handle Change-Id: Idbeed81b5b7349059e467b33a8641abf0b4aaeff
Change-Id: Icf221a8e8d4c281f7719875816835ad7dfe7f3d1
2010-09-07 12:56:57 -07:00
Romain Guy
018b0d2918 Merge "Use static final debug fields." 2010-09-07 12:42:43 -07:00
Romain Guy
5429e1d102 Use static final debug fields.
Change-Id: I304c39f54f609729bcec581091f285b2baa6fefa
2010-09-07 12:39:45 -07:00
Dianne Hackborn
05dff83894 am 11bbe200: Hopefully fix the build.
Merge commit '11bbe200cba150cfa5593bb87b54f3072a5ab2c5' into gingerbread-plus-aosp

* commit '11bbe200cba150cfa5593bb87b54f3072a5ab2c5':
  Hopefully fix the build.
2010-09-07 12:36:33 -07:00
Adam Cohen
cf393c52f9 Merge "-> Implemented new visualization for StackView -> Cleaning up the method for creating the blue outline -> Reimplmented onMeasure for StackView and AdapterViewAnimator" 2010-09-07 12:32:45 -07:00
Dianne Hackborn
11bbe200cb Hopefully fix the build.
Change-Id: Id8cd92c0895c9939e1386ef488bd1309a3be3568
2010-09-07 12:32:19 -07:00
Alex Sakhartchouk
aa860df538 Merge "Fixing a3d files to reflect the new element structure." 2010-09-07 12:13:15 -07:00
Alex Sakhartchouk
65cb3bae15 Merge "Add arrays to elements." 2010-09-07 12:13:07 -07:00
Alex Sakhartchouk
db6f11bd30 Fixing a3d files to reflect the new element structure.
Change-Id: I44d95c9411706813dde815c5f052f3615e8b483e
2010-09-07 12:10:18 -07:00
Jason Sams
70d4e50242 Add arrays to elements.
Change-Id: I624b03bfc1fd26136afd9305a96026b91b1fad3c
2010-09-07 12:06:05 -07:00
Romain Guy
e04a3811f2 Merge "Temporarily disable fading edges if solidColor=0 and hw is on." 2010-09-07 12:02:38 -07:00
Romain Guy
14cd0653e4 Temporarily disable fading edges if solidColor=0 and hw is on.
Change-Id: I430d8d4d00cbabc99644b98ea832460339c196d8
2010-09-07 12:01:38 -07:00
Joe Onorato
1a2736468b Merge "resolved conflicts for merge of 07990cf2 to master" 2010-09-07 11:54:27 -07:00
Joe Onorato
935865923f resolved conflicts for merge of 07990cf2 to master
Change-Id: I62cc2d14820e4cbe80ea433caf323be2df1fb9a8
2010-09-07 14:53:46 -04:00
Michael Kolb
d9b447ca28 Merge "Add setting for on screen zoom buttons enables to use pinch to zoom without showing the on screen buttons" 2010-09-07 11:50:54 -07:00
Michael Kolb
6fe3b421fd Add setting for on screen zoom buttons
enables to use pinch to zoom without
  showing the on screen buttons

Change-Id: Ifd08d11232e2a32178a89e559b6f1f645bf627b9
2010-09-07 11:46:57 -07:00
Dianne Hackborn
b8bcfed552 am f703b77c: Merge "Add system property to turn off scheduling groups." into gingerbread
Merge commit 'f703b77c96a6d133fda534158eaf6190ff7c87f7' into gingerbread-plus-aosp

* commit 'f703b77c96a6d133fda534158eaf6190ff7c87f7':
  Add system property to turn off scheduling groups.
2010-09-07 11:30:08 -07:00
Dianne Hackborn
f703b77c96 Merge "Add system property to turn off scheduling groups." into gingerbread 2010-09-07 11:27:26 -07:00
Ying Wang
8dff092eca Reflected class name and bc file name changes.
Any non-alnum chars in the rs file name will be removed when we derive the bc file name.
The reflected class names are converted to camel case.

Change-Id: I0184fe8ef2987a19dbdbc93c72163e02b5b0de89
2010-09-07 11:23:15 -07:00
Dianne Hackborn
84bb52ed61 Add system property to turn off scheduling groups.
Do this:

adb shell setprop debug.sys.noschedgroups 1

Change-Id: I6e06a74205fd45ee1526ce71fe33944465d39984
2010-09-07 11:19:11 -07:00
Joe Onorato
07990cf209 am 1f689f7e: Merge "When notifications are updated, don\'t re-show the ticker unless the text has changed." into gingerbread
Merge commit '1f689f7e35464b1ccd3ce3307b6d92283ee1290d' into gingerbread-plus-aosp

* commit '1f689f7e35464b1ccd3ce3307b6d92283ee1290d':
  When notifications are updated, don't re-show the ticker unless the text has changed.
2010-09-07 11:18:46 -07:00
Brad Fitzpatrick
cbf16ebdab am c19c9e4e: am b1104b37: Merge "Make SharedPreferencesBackupHelper wait for async SharedPreference writes" into gingerbread
Merge commit 'c19c9e4ee20512ba29e6e54aee06aa16413901f1'

* commit 'c19c9e4ee20512ba29e6e54aee06aa16413901f1':
  Make SharedPreferencesBackupHelper wait for async SharedPreference writes
2010-09-07 11:18:39 -07:00
Brad Fitzpatrick
c19c9e4ee2 am b1104b37: Merge "Make SharedPreferencesBackupHelper wait for async SharedPreference writes" into gingerbread
Merge commit 'b1104b3713febb75164938a465c3022e1879245f' into gingerbread-plus-aosp

* commit 'b1104b3713febb75164938a465c3022e1879245f':
  Make SharedPreferencesBackupHelper wait for async SharedPreference writes
2010-09-07 11:15:01 -07:00
Joe Onorato
1f689f7e35 Merge "When notifications are updated, don't re-show the ticker unless the text has changed." into gingerbread 2010-09-07 11:14:56 -07:00
Eric Fischer
e2a537f235 am aab73757: (-s ours) am 745e751b: Merge "Preserve old translations for changed strings. DO NOT MERGE" into gingerbread
Merge commit 'aab7375799e76ec2e429fbd8224d0c6e8cc96463'

* commit 'aab7375799e76ec2e429fbd8224d0c6e8cc96463':
  Preserve old translations for changed strings.  DO NOT MERGE
2010-09-07 11:14:28 -07:00
Joe Onorato
da69552078 When notifications are updated, don't re-show the ticker unless the text has changed.
Bug: 2963867
Change-Id: I24b5bc958fb6eb0d753c88178a385232c75ea438
2010-09-07 14:13:12 -04:00
Brad Fitzpatrick
b1104b3713 Merge "Make SharedPreferencesBackupHelper wait for async SharedPreference writes" into gingerbread 2010-09-07 11:12:51 -07:00
Eric Fischer
aab7375799 am 745e751b: Merge "Preserve old translations for changed strings. DO NOT MERGE" into gingerbread
Merge commit '745e751b251baa38e94dfce1fe264574d0204cc2' into gingerbread-plus-aosp

* commit '745e751b251baa38e94dfce1fe264574d0204cc2':
  Preserve old translations for changed strings.  DO NOT MERGE
2010-09-07 11:08:19 -07:00
Eric Fischer
745e751b25 Merge "Preserve old translations for changed strings. DO NOT MERGE" into gingerbread 2010-09-07 11:03:26 -07:00
Steve Block
85a033af1a Merge "Adds a test case for WebAddress where the path component does not have a leading slash" 2010-09-07 10:59:18 -07:00
Steve Block
8bb37f7ffb Adds a test case for WebAddress where the path component does not have a leading slash
When a URL is malformed because the path does not start with a slash,
we assume that the path starts with the first character that is not
valid in the host and insert a leading slash. This is the reason why
the regex for the path component does not force a leading slash.

Bug: 1011602
Change-Id: I8efe46c058d2ee2d1a6a4406ee25dc021315222b
2010-09-07 18:57:41 +01:00
Kenny Root
c99b2b857c am f17bd19a: am 2cb3e836: Merge "Use new nativeLibraryPath field for NativeActivity" into gingerbread
Merge commit 'f17bd19acbb88429b50a1497bfec0752b456d5c6'

* commit 'f17bd19acbb88429b50a1497bfec0752b456d5c6':
  Use new nativeLibraryPath field for NativeActivity
2010-09-07 10:52:13 -07:00
Kenny Root
f17bd19acb am 2cb3e836: Merge "Use new nativeLibraryPath field for NativeActivity" into gingerbread
Merge commit '2cb3e83654c99e202c170d9d0237d8d1f4054354' into gingerbread-plus-aosp

* commit '2cb3e83654c99e202c170d9d0237d8d1f4054354':
  Use new nativeLibraryPath field for NativeActivity
2010-09-07 10:49:22 -07:00
Makoto Onuki
a362e1d794 Don't fall through from TOKEN_EMAIL_LOOKUP
Change-Id: Ifc08f26ba93496cfa53cd83c7df0e986ea4ece4b
2010-09-07 10:46:59 -07:00
Kenny Root
2cb3e83654 Merge "Use new nativeLibraryPath field for NativeActivity" into gingerbread 2010-09-07 10:46:14 -07:00
Kenny Root
6798b62e92 Use new nativeLibraryPath field for NativeActivity
Instead of being naughty and guessing the native library path from
dataDir, use the new nativeLibraryPath field because it can be on SD
card now.

Change-Id: I284bde42e0b0114366e412eb7212af22b47208d8
2010-09-07 10:44:21 -07:00
Wei-Ta Chen
50ba3d2c09 Rename LargeBitmap to BitmapRegionDecoder for having a better API.
Move AssetStreamAdaptor, AutoFDSeek and nullObjectReturn to Utils.h because
BitmapFactory.cpp and BitmapRegionDecoder.cpp both need to use these utility functions.

Change-Id: I3e60c7fe4abd0289e1384e69a08fd20fe6fb0e10
2010-09-07 21:02:13 +08:00
Steve Block
582deec1f3 Fixes a problem with URL parsing when the host ends with a dot
The WebAddress class provides a lenient parser for URLs. Currently, it
identifies the host portion with the regex [<chars>]+(\.[<chars>]+)* where
<chars> is the set of characters valid for the host name. This pattern excludes
the case where the host ends with a dot, which is valid possibility. As a
result, any trailing dot is pushed into the path component. Since we add a
leading slash to the path if one is missing, the result is a path that begins
with '/.'.

This fix changes the host regex to [<chars>]+[<chars>\.]* which allows trailing
dots and fixes the problem.

Bug: 2337042
Change-Id: I310512531787e0f742988f5d815ad944fd39e059
2010-09-07 13:22:23 +01:00
Hung-ying Tyan
8744f87985 SipPhone: switch to its own phone type PHONE_TYPE_SIP.
Change-Id: Ie33cfe92e59665864dbebbb38895e8e85f6db2e6
2010-09-07 20:01:24 +08:00
Brad Fitzpatrick
6f9d58ac62 Make SharedPreferencesBackupHelper wait for async SharedPreference writes
Fixes a potential race with backups.

Change-Id: I73492c0384091cedd7802109257312387fcd43f9
2010-09-06 22:18:39 -07:00
Hung-ying Tyan
3a47e9524a am b6432ca4: am 960b31e3: Merge "SipService: unset session listener if listener is gone." into gingerbread
Merge commit 'b6432ca4a090c02a07038f926e9e514d8cb1b657'

* commit 'b6432ca4a090c02a07038f926e9e514d8cb1b657':
  SipService: unset session listener if listener is gone.
2010-09-06 20:19:52 -07:00
Hung-ying Tyan
b6432ca4a0 am 960b31e3: Merge "SipService: unset session listener if listener is gone." into gingerbread
Merge commit '960b31e3b3b40f92665be4b7a79da7f05ea19751' into gingerbread-plus-aosp

* commit '960b31e3b3b40f92665be4b7a79da7f05ea19751':
  SipService: unset session listener if listener is gone.
2010-09-06 20:16:51 -07:00
Hung-ying Tyan
960b31e3b3 Merge "SipService: unset session listener if listener is gone." into gingerbread 2010-09-06 20:13:32 -07:00
Brad Fitzpatrick
6834330c16 am 32e29851: am 612ff274: Quell annoying Java ascii/unicode warning.
Merge commit '32e298511a31160868f7303dbf9a1910099c0b57'

* commit '32e298511a31160868f7303dbf9a1910099c0b57':
  Quell annoying Java ascii/unicode warning.
2010-09-06 19:43:44 -07:00
Brad Fitzpatrick
32e298511a am 612ff274: Quell annoying Java ascii/unicode warning.
Merge commit '612ff27425cf2976396d992f32b58ab900c7d708' into gingerbread-plus-aosp

* commit '612ff27425cf2976396d992f32b58ab900c7d708':
  Quell annoying Java ascii/unicode warning.
2010-09-06 19:34:43 -07:00
Brad Fitzpatrick
612ff27425 Quell annoying Java ascii/unicode warning.
This fix is already in master, so just cherry-picking it here too.

Change-Id: I28c57171aa3e55933c3e98555575a074b25b2b2a
2010-09-06 19:22:09 -07:00
Maksymilian Osowski
da17e9db63 Merge "Fixed the bug in forwarder that prevented ConnectionHandler threads from exiting." 2010-09-06 04:25:15 -07:00
Maksymilian Osowski
bd8c83db8f Fixed the bug in forwarder that prevented ConnectionHandler threads from exiting.
There was a deadlock when ConnectionHandler exited the loop in SocketPipeThread, and would call the onFinishedCallback, which called the synchronized method in Forwarder that would
deadlock. Changing the Forwarder class solved the issue and made it more efficient.

Change-Id: I947450a19573f2e88274b1ebc7b77d4df6afffa7
2010-09-06 12:24:26 +01:00