32318 Commits

Author SHA1 Message Date
Katie McCormick
51740d6d78 am 0e9f34bf: Doc update: ACTION_APPWIDGET_OPTIONS_CHANGED link
* commit '0e9f34bffdfc476122337d077453f722fc22038f':
  Doc update: ACTION_APPWIDGET_OPTIONS_CHANGED link
2012-09-10 16:25:17 -07:00
Katie McCormick
0e9f34bffd Doc update: ACTION_APPWIDGET_OPTIONS_CHANGED link
Change-Id: I62def95b138282eba4f2e70fd4ab4de35aa03e89
2012-09-10 16:20:20 -07:00
Jean-Baptiste Queru
7749a1c5ec am b4ac801c: am 1ca2fee9: Merge "Make default value of auto-sync in SyncStorageEngine configurable"
* commit 'b4ac801c477c0a0de18da89744d9a78e79d2ff51':
  Make default value of auto-sync in SyncStorageEngine configurable
2012-09-05 12:12:52 -07:00
Jean-Baptiste Queru
b4ac801c47 am 1ca2fee9: Merge "Make default value of auto-sync in SyncStorageEngine configurable"
* commit '1ca2fee9547dbdd7008211ac318b1f8f40ce1e35':
  Make default value of auto-sync in SyncStorageEngine configurable
2012-09-05 12:10:44 -07:00
Jean-Baptiste Queru
1ca2fee954 Merge "Make default value of auto-sync in SyncStorageEngine configurable" 2012-09-05 11:03:13 -07:00
Adam Powell
4289b49dd5 am 9f3b0bfd: DO NOT MERGE - Make WebView track focal points more accurately
* commit '9f3b0bfd0b1d8876c96036a303b3ff72df0e8ad0':
  DO NOT MERGE - Make WebView track focal points more accurately
2012-09-04 19:49:13 -07:00
Adam Powell
52da9fa7b5 am c4ce0da2: DO NOT MERGE - Delay starting scale gesture events until a touch slop threshold
* commit 'c4ce0da255df07e3d8a799aa4e9af2f1949ef4f4':
  DO NOT MERGE - Delay starting scale gesture events until a touch slop threshold
2012-09-04 19:49:07 -07:00
Adam Powell
9f3b0bfd0b DO NOT MERGE - Make WebView track focal points more accurately
Change-Id: I6683edee6933b1dd026453935d72119320ab3c81
2012-09-04 18:33:56 -07:00
Adam Powell
c4ce0da255 DO NOT MERGE - Delay starting scale gesture events until a touch slop threshold
Change-Id: I13132ce1d912b54e251f7afed5143c72a2ec2e78
2012-09-04 18:33:42 -07:00
Jean-Baptiste Queru
ad17717e52 am d3b74b91: am b307ceb4: Merge "SearchWidget: passing APP_DATA to voice intent"
* commit 'd3b74b9124e713e291053652839a7d725ffb64d9':
  SearchWidget: passing APP_DATA to voice intent
2012-09-04 11:41:32 -07:00
Jean-Baptiste Queru
d3b74b9124 am b307ceb4: Merge "SearchWidget: passing APP_DATA to voice intent"
* commit 'b307ceb43fa96e8d54851c20278a4344469c9269':
  SearchWidget: passing APP_DATA to voice intent
2012-09-04 11:38:28 -07:00
Yameng Huang
2b5d0ea5e9 Make default value of auto-sync in SyncStorageEngine configurable
This will make the default value of the automatic synchronization
in the SyncStorageEngine configurable with overlays for use by
vendors who want or have legal requirements to have the synchronization
off by default.

Change-Id: Iabdb355c4a1169fe8e254e91c43e162c5913d5e0
2012-09-03 12:49:31 +02:00
Jorge Ruesga
1bcfe84179 SearchWidget: passing APP_DATA to voice intent
SearchView uses SearchManager.APP_DATA to pass data between the origin activity
and the search activity. This works for text searches (keyboard), but it's not
implemented by voice recognition searches. The method createVoiceAppSearchIntent
initializes a empty bundle that is filled with the QUERY parameter.
This patch adds the SearchManager.APP_DATA parameter if is present, let the
search activity access to the data passed by the origin activity

Patch 2: Fix code style

Change-Id: I52dce34e1efd07a30ad74d52bfc60fbae1c4310b
2012-09-03 01:26:59 +02:00
Adam Powell
b94451411b am f1faf774: Merge "DO NOT MERGE GestureDetector - Mask action when checking POINTER_UP" into jb-dev
* commit 'f1faf7743f39f56cc57d6f2a520e5c8ecf4e58b5':
  DO NOT MERGE GestureDetector - Mask action when checking POINTER_UP
2012-08-31 11:27:31 -07:00
Adam Powell
f1faf7743f Merge "DO NOT MERGE GestureDetector - Mask action when checking POINTER_UP" into jb-dev 2012-08-31 11:24:30 -07:00
Adam Powell
39263601cc DO NOT MERGE GestureDetector - Mask action when checking POINTER_UP
Bug 7088494

Change-Id: I723e9b77f0d0473f9d769e53aaa568c4aaac90aa
2012-08-31 11:16:11 -07:00
John Reck
30b5bea07b am 6fdd4963: Merge "DO NOT MERGE Remove dead code" into jb-dev
* commit '6fdd49630834b1c20a781c9d29b241a68d1289ef':
  DO NOT MERGE Remove dead code
2012-08-30 14:53:42 -07:00
John Reck
6fdd496308 Merge "DO NOT MERGE Remove dead code" into jb-dev 2012-08-30 14:50:17 -07:00
Adam Powell
3dda2cffaf am ecb388ef: Merge "DO NOT MERGE - Use focal point for scrolling in GestureDetector" into jb-dev
* commit 'ecb388efefc427c3fa93f07fd11502564dc194a5':
  DO NOT MERGE - Use focal point for scrolling in GestureDetector
2012-08-30 14:30:49 -07:00
Adam Powell
00925a3b88 am d33b6217: DO NOT MERGE - New implementation for ScaleGestureDetector
* commit 'd33b6217fc128652a72f1626bcaa5f3b754102c6':
  DO NOT MERGE - New implementation for ScaleGestureDetector
2012-08-30 14:29:02 -07:00
Adam Powell
ecb388efef Merge "DO NOT MERGE - Use focal point for scrolling in GestureDetector" into jb-dev 2012-08-30 14:28:17 -07:00
Adam Powell
53059537c9 DO NOT MERGE - Use focal point for scrolling in GestureDetector
Remove workaround for obsolete touchscreen hardware. Provide a better
focal point for scroll events.

Change-Id: I173cd6696dace379437b56597c4a6ac5c7fbf60d
2012-08-30 13:23:22 -07:00
Adam Powell
d33b6217fc DO NOT MERGE - New implementation for ScaleGestureDetector
This solves the problems around active pointer tracking when the
caller may skip events in the MotionEvent stream and replaces the
old implementation with a much simpler algorithm.

Change-Id: I97c0bfad03a6190e403e843d382e05ff2257b66f
2012-08-30 13:18:43 -07:00
John Reck
da5cd30802 am ae03afda: Merge "onSavePassword dialog can leak when WebViewClassic is destroyed."
* commit 'ae03afda41ace0721e48ed15ce35345bfa033116':
  onSavePassword dialog can leak when WebViewClassic is destroyed.
2012-08-30 11:41:38 -07:00
Johan Redestig
8655e9085c onSavePassword dialog can leak when WebViewClassic is destroyed.
The AlertDialog creates in onSavePassword method leaks if
WebViewClassic is destroyed when the dialog is shown.

Change-Id: I81f20e1dd138467a6413766c0a081b389b334ae0
2012-08-30 10:13:41 +02:00
Jean-Baptiste Queru
4a4edbbfce am 7fecf5f4: Merge "Make addAddress locale safe"
* commit '7fecf5f4513a94adb71ba29b9918565b4b5e5e7b':
  Make addAddress locale safe
2012-08-29 12:59:06 -07:00
Jean-Baptiste Queru
7fecf5f451 Merge "Make addAddress locale safe" 2012-08-29 12:19:04 -07:00
Jean-Baptiste Queru
14c0c989d2 am 4ba4caed: Merge "Fix SkBitmap::fPixels not being locked correctly"
* commit '4ba4caede125ff602b0d93f577f9054a07791ff7':
  Fix SkBitmap::fPixels not being locked correctly
2012-08-29 11:55:20 -07:00
Michal Stawinski
35ef567140 Fix SkBitmap::fPixels not being locked correctly
In some cases bitmap's pixels where freed during encoding, which
caused a null pointer dereference.
This fix makes sure that underlaying buffer is locked for the whole
process of compression.

Change-Id: I0ac56821f5d333072271dc2670fa30f1562adfa3
2012-08-29 15:54:01 +02:00
Johan Redestig
3cd42dfd50 Make addAddress locale safe
Using regular string concatenation to avoid unexpected
results in some locales.

Change-Id: I47dd5e174c4a2e88dc18e014002820cdbf63fcad
2012-08-29 08:07:02 +02:00
John Reck
2ec1098961 DO NOT MERGE Remove dead code
Cherry pick

Change-Id: I19603a6e234b0b2592ef90fd426b2973cff8e4fd
2012-08-28 16:29:51 -07:00
Jean-Baptiste Queru
1112a376e8 am 416362e6: Merge "Change StringTokenizer to TextUtils.StringSplitter"
* commit '416362e6d8c8d0a34e09704138688f75aa810c9b':
  Change StringTokenizer to TextUtils.StringSplitter
2012-08-28 13:19:48 -07:00
Jean-Baptiste Queru
416362e6d8 Merge "Change StringTokenizer to TextUtils.StringSplitter" 2012-08-28 12:22:39 -07:00
Jean-Baptiste Queru
337756fa65 am 78ad66b4: Merge "[Audio]Press camera button during Http live Audio playing, then return Browser, DUT display abnormal."
* commit '78ad66b43cf5b649869de18ee9c246c95b135c10':
  [Audio]Press camera button during Http live Audio playing, then return Browser, DUT display abnormal.
2012-08-28 11:08:22 -07:00
Jean-Baptiste Queru
78ad66b43c Merge "[Audio]Press camera button during Http live Audio playing, then return Browser, DUT display abnormal." 2012-08-28 10:43:10 -07:00
Dianne Hackborn
aae4943297 am 4763989d: am 32d1fec5: Merge "Fixes relative time formatting issue for dates in future"
* commit '4763989d95342c25e9b857dc9ee21eb5ebac31d6':
  Fixes relative time formatting issue for dates in future
2012-08-27 12:33:57 -07:00
Steve Pomeroy
ca3363775e Fixes relative time formatting issue for dates in future
All variations of getRelativeTimeSpanString() now properly handle dates
that are in the future. Prior, the version used by
getRelativeDateTimeString() would occasionally show the time instead of
a date when the future date was the same weekday as the current weekday.
This resulted in the time output being duplicated, eg.: "11:23, 11:23"

Change-Id: If20972a6942cce792fa233437f94dedfb71379f3
Signed-off-by: Steve Pomeroy <steve@staticfree.info>
2012-08-27 02:20:13 -04:00
Dianne Hackborn
513f68bc5a am bfe20d1a: am 8bfba7df: Merge "fix wrong substring"
* commit 'bfe20d1aa1b1236e6592914c5682c59d94936432':
  fix wrong substring
2012-08-23 15:12:26 -07:00
Jean-Baptiste Queru
790d34039d am d86bebb4: am 322b0a16: Merge "Protecting more views from (bad) MotionEvents"
* commit 'd86bebb4a9aaf3b98f6d5a189fd7733926d85891':
  Protecting more views from (bad) MotionEvents
2012-08-23 15:12:21 -07:00
Dianne Hackborn
8bfba7df37 Merge "fix wrong substring" 2012-08-23 14:10:31 -07:00
Johan Rosengren
0dc291eef6 Protecting more views from (bad) MotionEvents
When handling MotionEvents, the method findPointerIndex can return -1
if the current pointer id can't be translated to a pointer index.
Some views are not handling this, which will lead to an out-of-
index crash. In 2585e9b there were checks added, this change adds
some more.

Change-Id: I93ce2420afd83a06b689a1ed35ead7d170cd68f1
2012-08-23 13:46:14 +02:00
Masanori Ogino
08bab56f68 fix wrong substring
The tokenOffsets is the offset from trimed contentLine.
But it is used in substring as the offset from un-trimed contentLine.

How to reproduce bug (ICS and before):
1. Add a contact record with name and a phone number (ex. 090-1111-2222)
2. Search by "0" in Contacts app
3. Contacts shows a wrong number something like "0900111102222"

Change-Id: I1e1cb2f3bd135d98e1573a50aa6ddc021af35b9f
2012-08-23 14:06:45 +09:00
Irfan Sheriff
c584a24ba1 am 2140d1de: Merge "Avoid system_server crashing due to mac address is null"
* commit '2140d1de47579db839b6a4ccc87394e80449d7a6':
  Avoid system_server crashing due to mac address is null
2012-08-22 11:01:03 -07:00
Chih-Wei Huang
21326d8b77 Avoid system_server crashing due to mac address is null
It's possible that the mac address is null (getMacAddress() of WifiNative.java).
In this case system_server will crash like:

E AndroidRuntime: *** FATAL EXCEPTION IN SYSTEM PROCESS: WifiWatchdogStateMachine
E AndroidRuntime: java.lang.NullPointerException
E AndroidRuntime:        at android.net.arp.ArpPeer.<init>(ArpPeer.java:57)
E AndroidRuntime:        at android.net.wifi.WifiWatchdogStateMachine.doArpTest(WifiWatchdogStateMachine.java:866)

Check the mac address before parsing to avoid crashing.

Change-Id: I5d4205c04d479a3a2837172c6382816ea4bf74d6
2012-08-22 11:26:51 +08:00
Dianne Hackborn
8b97ee6d8c am b0b4a704: Merge "ActivityThread: Avoid creating duplicate handlers and reuse mH"
* commit 'b0b4a704400319ceaa1002f3194a40553a00cc82':
  ActivityThread: Avoid creating duplicate handlers and reuse mH
2012-08-21 15:39:42 -07:00
Dianne Hackborn
b0b4a70440 Merge "ActivityThread: Avoid creating duplicate handlers and reuse mH" 2012-08-21 15:12:45 -07:00
Jean-Baptiste Queru
4ea6a8eb9f am f515c6f4: Merge "Switch widget: Fix ON/OFF option update error"
* commit 'f515c6f4fe4457de1d5c49f78f9dcf6e4379e335':
  Switch widget: Fix ON/OFF option update error
2012-08-20 14:50:40 -07:00
Jean-Baptiste Queru
f515c6f4fe Merge "Switch widget: Fix ON/OFF option update error" 2012-08-20 14:28:33 -07:00
Kenny Root
7d5b22afae am f029c22f: Merge "Use Libcore.os.umask for setting umask"
* commit 'f029c22f82573e7fee7c7e0cca4439fe78300bac':
  Use Libcore.os.umask for setting umask
2012-08-20 12:55:11 -07:00
Kenny Root
4c74f8c171 Use Libcore.os.umask for setting umask
Libcore.os now provides a umask method call, so just use that since it's
available.

Change-Id: I8826fa40bcab3d61a424ff98a8050d3e44f7ec34
2012-08-20 12:24:05 -07:00