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

32329 Commits

Author SHA1 Message Date
Elliott Hughes
086676a4a6 am f5437ee8: am 297ad257: Merge "Deprecate those parts of DateUtils the documentation says not to use." 
* commit 'f5437ee86a34751fa6d441b95282feb315e19eb6':
  Deprecate those parts of DateUtils the documentation says not to use.
 2012-09-14 16:36:33 -07:00
Elliott Hughes
f5437ee86a am 297ad257: Merge "Deprecate those parts of DateUtils the documentation says not to use." 
* commit '297ad257464d2ea65cabd45ddb19f6da34b39157':
  Deprecate those parts of DateUtils the documentation says not to use.
 2012-09-14 16:34:41 -07:00
Elliott Hughes
297ad25746 Merge "Deprecate those parts of DateUtils the documentation says not to use." 2012-09-14 16:12:36 -07:00
Elliott Hughes
d3c01012d8 Deprecate those parts of DateUtils the documentation says not to use. 
Applications using these fields and methods are just asking for i18n bugs.

Also @deprecate two int[]s that were never meant to be public.

Change-Id: I29b3a1c0c663fe344d2567df6ed3bb537270b3b7
 2012-09-14 16:06:50 -07:00
Raph Levien
e590568417 am eceb3171: am f4afc401: Merge "framework: fix bug for uninitialized variable" 
* commit 'eceb317116d87dada85d06df8fe0e07dd4aec49d':
  framework: fix bug for uninitialized variable
 2012-09-14 12:16:32 -07:00
Raph Levien
eceb317116 am f4afc401: Merge "framework: fix bug for uninitialized variable" 
* commit 'f4afc40101c00800c4dc53f165b93f741327416d':
  framework: fix bug for uninitialized variable
 2012-09-14 12:15:03 -07:00
Raph Levien
f4afc40101 Merge "framework: fix bug for uninitialized variable" 2012-09-14 11:52:11 -07:00
Robert Greenwalt
5d33e76cff am 65208857: am 2415841c: Merge "EthernetDataTracker: indicate link up based on flags" 
* commit '65208857d35efe39c1dbc1da23f2caf7257232fc':
  EthernetDataTracker: indicate link up based on flags
 2012-09-11 15:07:01 -07:00
Robert Greenwalt
65208857d3 am 2415841c: Merge "EthernetDataTracker: indicate link up based on flags" 
* commit '2415841c370d855d7f3a3e6a537e641c69a57097':
  EthernetDataTracker: indicate link up based on flags
 2012-09-11 15:04:50 -07:00
Vishal Mahaveer
b6b72f5411 EthernetDataTracker: indicate link up based on flags 
Indicate link up state based on flags/interface up, and not on IP address.
This is for ethernet interfaces that already exists.

Change-Id: Ib342d519c483bbb2dfa08cfac2c0c1a288cee7c0
Signed-off-by: Vishal Mahaveer <vishalm@ti.com>
 2012-09-11 16:41:16 -05:00
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
Zhou Chang
46e942d500 framework: fix bug for uninitialized variable 
Some application display error due to uninitialized varibale.
This patch fix the bug

Change-Id: I660169e325ffae60d95c7774aaaeaebf693adf3d
Author: Chang Zhou <chang.zhou@intel.com>
Signed-off-by: Chang Zhou <chang.zhou@intel.com>
Signed-off-by: Chong Xing <chong.xing@intel.com>
Signed-off-by: Hongyu Zhang <hongyu.zhang@intel.com>
Signed-off-by: Shuo Gao <shuo.gao@intel.com>
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Signed-off-by: Jack Ren <jack.ren@intel.com>
Author-tracking-BZ: 45356
 2012-08-31 10:53:04 +08: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