Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
106,675 Commits 3 Branches 0 Tags
398051b8ee658c70c39dee04534edf6c968dffdd
Commit Graph

32375 Commits

Author SHA1 Message Date
Romain Guy
398051b8ee Revert "Reduce the number of measurement passes in RelativeLayout" 
This reverts commit 4cb81d6423.
 2013-05-15 11:02:25 -07:00
Zhentao Sun
da86196287 am 0412f5b1: am 5f8afdd8: Merge "Passed the correct gps geofence availability value to client." into jb-mr2-dev 
* commit '0412f5b1165d7ff331162dcd1fc29d3ea0fc7223':
  Passed the correct gps geofence availability value to client.
 2013-05-14 16:55:44 -07:00
Zhentao Sun
0412f5b116 am 5f8afdd8: Merge "Passed the correct gps geofence availability value to client." into jb-mr2-dev 
* commit '5f8afdd8ec168a7e5e5ca8203419a40f069a9351':
  Passed the correct gps geofence availability value to client.
 2013-05-14 16:53:42 -07:00
Zhentao Sun
b8061be81c Passed the correct gps geofence availability value to client. 
Fixed b/8967427.

Change-Id: If205b963533f096c27985476a5d487a2d090ccf8
 2013-05-14 15:34:15 -07:00
kmccormick
3b0929f2a4 am cca053a3: am 3722947f: Merge "Doc update: manual merge of changes from jb-mr1.1" into jb-mr2-dev 
* commit 'cca053a389bf913f23796e1095db9e1ae74bf2f0':
  Doc update: manual merge of changes from jb-mr1.1
 2013-05-14 11:30:47 -07:00
kmccormick
cca053a389 am 3722947f: Merge "Doc update: manual merge of changes from jb-mr1.1" into jb-mr2-dev 
* commit '3722947f2f22b9b56a7479bd29af2680e608f674':
  Doc update: manual merge of changes from jb-mr1.1
 2013-05-14 11:29:16 -07:00
kmccormick
3722947f2f Merge "Doc update: manual merge of changes from jb-mr1.1" into jb-mr2-dev 2013-05-14 18:26:38 +00:00
Svetoslav
06ccc77f48 am 80127981: am c0a979ce: Merge "Fixing the accessibility text traversal in extend mode." into jb-mr2-dev 
* commit '80127981f85a0be842007596830c1675a9a3665e':
  Fixing the accessibility text traversal in extend mode.
 2013-05-14 11:09:35 -07:00
Matthew Xie
7c78fd3c3a am 389bf4b3: am 4f88ff48: Merge "Use the right fd for flush call" into jb-mr2-dev 
* commit '389bf4b3319734ac5c529a62d49084594702e614':
  Use the right fd for flush call
 2013-05-14 11:09:32 -07:00
Svetoslav
80127981f8 am c0a979ce: Merge "Fixing the accessibility text traversal in extend mode." into jb-mr2-dev 
* commit 'c0a979ce30cf9b96c0a84d0679aeeef7153a22fa':
  Fixing the accessibility text traversal in extend mode.
 2013-05-14 11:07:08 -07:00
Matthew Xie
389bf4b331 am 4f88ff48: Merge "Use the right fd for flush call" into jb-mr2-dev 
* commit '4f88ff48ee99b5e7078f7a6b774d21a3f3434bb9':
  Use the right fd for flush call
 2013-05-14 11:07:06 -07:00
Svetoslav
c0a979ce30 Merge "Fixing the accessibility text traversal in extend mode." into jb-mr2-dev 2013-05-14 17:39:36 +00:00
Matthew Xie
4f88ff48ee Merge "Use the right fd for flush call" into jb-mr2-dev 2013-05-14 17:00:01 +00:00
Matthew Xie
d073bfdb3a Use the right fd for flush call 
bug 8498784
Change-Id: I03d3a588b01825b868d4b0229c60b7bb3b24a5f6
 2013-05-13 18:35:27 -07:00
Zhihai Xu
805cb84110 Merge "Remove roamChanged API" 2013-05-14 01:26:51 +00:00
Ravi Nagarajan
69925b149f Remove roamChanged API 
Roam state listerner will be handled inside the Bluetooth apk. Remove
the binder API from wrapper class
bug 8781689

Change-Id: I31c2b899069774620b1406faeb3c68ad1e60b599
 2013-05-13 18:06:09 -07:00
John Spurlock
ed7f3cb7fa Merge "Window manager cleanup." 2013-05-13 22:54:52 +00:00
Mike Lockwood
24dc818055 Merge "BluetoothGatt: Print stack trace if an exception occurs in a callback" 2013-05-13 21:42:10 +00:00
John Spurlock
04db1762fb Window manager cleanup. 
Specifically:
 - Fix policy vs wm lock management issues.
 - Share runnable to avoid allocation.
 - Remove unused noop runnable.
 - Make sure to handle status bar = null case.
 - Fix javadoc typo.

Bug: 8890313
Change-Id: I242eaef8e946025f6885d6dba3225722fb0ca7ce
 2013-05-13 17:24:24 -04:00
Robert Greenwalt
a67a1f5ae0 am 23abefef: am 28d3dbf9: Merge "Remove wifi scan-always dialog." into jb-mr2-dev 
* commit '23abefef00b4d47bb97b2597f74c9dae6a169286':
  Remove wifi scan-always dialog.
 2013-05-13 14:19:07 -07:00
Robert Greenwalt
23abefef00 am 28d3dbf9: Merge "Remove wifi scan-always dialog." into jb-mr2-dev 
* commit '28d3dbf969c4c7965ea44bfe4b54095af5356970':
  Remove wifi scan-always dialog.
 2013-05-13 14:13:50 -07:00
Mike Lockwood
0998ff1349 BluetoothGatt: Print stack trace if an exception occurs in a callback 
Change-Id: Iaaaaca8347197aae5c7fcecb2325ef4836969434
 2013-05-13 14:11:33 -07:00
Robert Greenwalt
28d3dbf969 Merge "Remove wifi scan-always dialog." into jb-mr2-dev 2013-05-13 21:11:32 +00:00
Robert Greenwalt
aee3d28763 Remove wifi scan-always dialog. 
Removes intent type for dialog and Setting on whether to show
dialog.

bug:8907190
Change-Id: Id37e03126d4afdfd7d921132a57233b84603c8bd
 2013-05-13 11:32:31 -07:00
Kristian Monsen
155d965ab0 am 3d1edc03: am 6e7ed13b: Merge "Fix for bug 8623163: Call view methods on the UI thread" into jb-mr2-dev 
* commit '3d1edc033ff00430e1f8118cd871d9996b7172a1':
  Fix for bug 8623163: Call view methods on the UI thread
 2013-05-13 02:34:39 -07:00
Kristian Monsen
3d1edc033f am 6e7ed13b: Merge "Fix for bug 8623163: Call view methods on the UI thread" into jb-mr2-dev 
* commit '6e7ed13b12edc9e02580a273c3aa546e62231b5a':
  Fix for bug 8623163: Call view methods on the UI thread
 2013-05-13 02:33:01 -07:00
Kristian Monsen
6e7ed13b12 Merge "Fix for bug 8623163: Call view methods on the UI thread" into jb-mr2-dev 2013-05-13 09:30:07 +00:00
Svetoslav
abad55d860 Fixing the accessibility text traversal in extend mode. 
We added APIs to allow an accessibility service to extend the
selection while moving the cursor at a given granularity such
as word, character, etc. The problem is that the traversal was
extending only the end of the selection while moving forward
and the start of the selection while moving backward. This leads
to a case in which the user cannot shrink/extend the selection
because for example instead of shrinking the end of the selection
the implementation was extending the start.

Now extending the selection moves only the selection end. This is
the same behavior as text view using a keyboard.

Tests: https://googleplex-android-review.googlesource.com/#/c/307062

bug:8839844

Change-Id: Id6965b102647df909f61301fcc8ec05458dd5881
 2013-05-10 20:14:40 -07:00
Romain Guy
a7bf9d363a Merge "Reduce the number of measurement passes in RelativeLayout" 2013-05-11 00:59:11 +00:00
Romain Guy
4cb81d6423 Reduce the number of measurement passes in RelativeLayout 
Change-Id: I96ad8676f6344a1e0877f9dfbe782747bc0ff36d
 2013-05-10 17:58:44 -07:00
Craig Mautner
e555d16421 am c3797f40: am 4754f401: Merge "Avoid NullPointerException in getHandler()" 
* commit 'c3797f40c1a8a8f7ca72816642110221933ff8fd':
  Avoid NullPointerException in getHandler()
 2013-05-10 15:17:00 -07:00
Svetoslav
6f3a6a453a am 1e4c6589: am b3c2b21b: Merge "Accessibility should not query for list items when data set changed." into jb-mr2-dev 
* commit '1e4c6589941e459871eed6e9d4675b05d977325c':
  Accessibility should not query for list items when data set changed.
 2013-05-10 15:16:57 -07:00
Craig Mautner
c3797f40c1 am 4754f401: Merge "Avoid NullPointerException in getHandler()" 
* commit '4754f401a912305e1ceec04b62ad9b9f7d3c2ff6':
  Avoid NullPointerException in getHandler()
 2013-05-10 13:34:23 -07:00
Svetoslav
1e4c658994 am b3c2b21b: Merge "Accessibility should not query for list items when data set changed." into jb-mr2-dev 
* commit 'b3c2b21b5ba30d82938ae2ef93d8120f5fd0cc80':
  Accessibility should not query for list items when data set changed.
 2013-05-10 13:10:41 -07:00
Svetoslav
b3c2b21b5b Merge "Accessibility should not query for list items when data set changed." into jb-mr2-dev 2013-05-10 20:06:42 +00:00
Craig Mautner
4754f401a9 Merge "Avoid NullPointerException in getHandler()" 2013-05-10 19:50:39 +00:00
Marco Nelissen
c08d4d99e2 am 1d3488cb: am 86e0b491: Merge "Add VideoView.getAudioSessionId()" into jb-mr2-dev 
* commit '1d3488cba90bea114c9c5e8f0d4a008d2aa34bfd':
  Add VideoView.getAudioSessionId()
 2013-05-10 12:46:36 -07:00
Marco Nelissen
1d3488cba9 am 86e0b491: Merge "Add VideoView.getAudioSessionId()" into jb-mr2-dev 
* commit '86e0b491d1b50e59221420de3005184b1dee8373':
  Add VideoView.getAudioSessionId()
 2013-05-10 12:44:05 -07:00
Marco Nelissen
86e0b491d1 Merge "Add VideoView.getAudioSessionId()" into jb-mr2-dev 2013-05-10 14:12:13 +00:00
Dianne Hackborn
fee8cd7582 am e8c9b39e: am 83d6df27: Merge "Help on issue #8863955: Google Services keeping phone awake..." into jb-mr2-dev 
* commit 'e8c9b39ec976029d3571f8904a3db21d6514ecf6':
  Help on issue #8863955: Google Services keeping phone awake...
 2013-05-10 03:06:35 -07:00
Dianne Hackborn
e8c9b39ec9 am 83d6df27: Merge "Help on issue #8863955: Google Services keeping phone awake..." into jb-mr2-dev 
* commit '83d6df27d40aed18a7dc42c9320f83656cc81ea0':
  Help on issue #8863955: Google Services keeping phone awake...
 2013-05-09 23:40:28 -07:00
Jeff Brown
89efc6e6c1 am da58f92b: am b2f6842d: Merge "Add an API to allow a callback to request active scans." into jb-mr2-dev 
* commit 'da58f92bfaf875074656a55103c819e6f4dda341':
  Add an API to allow a callback to request active scans.
 2013-05-09 17:09:24 -07:00
Amith Yamasani
ecd5afe1ef resolved conflicts for merge of 069d7e9b to master 
Change-Id: Ia8fd5de3d4cc275fd358132bcb2c198d1e7b6877
 2013-05-09 17:07:08 -07:00
Dianne Hackborn
83d6df27d4 Merge "Help on issue #8863955: Google Services keeping phone awake..." into jb-mr2-dev 2013-05-09 23:47:22 +00:00
Chet Haase
2d4edcf2e1 am a9d5adea: am fb32c824: Merge "Fix start delay jank in ViewPropertyAnimator" into jb-mr2-dev 
* commit 'a9d5adea9e9676d19b7a50ce3d6c673c16ee7a6d':
  Fix start delay jank in ViewPropertyAnimator
 2013-05-09 16:28:33 -07:00
Matthew Xie
b50619cc14 am c0c7cebe: am b566c466: Merge "Donot bind to GATT service when BLE is not supported" into jb-mr2-dev 
* commit 'c0c7cebe3f5da99aeb48eb62bffbaf3183814194':
  Donot bind to GATT service when BLE is not supported
 2013-05-09 16:28:30 -07:00
Jeff Brown
da58f92bfa am b2f6842d: Merge "Add an API to allow a callback to request active scans." into jb-mr2-dev 
* commit 'b2f6842d5528345e02a91218fbe58c3e0ca8bafb':
  Add an API to allow a callback to request active scans.
 2013-05-09 16:23:43 -07:00
Amith Yamasani
069d7e9b81 am 153919ed: Merge "Cache the scaled avatar drawables in the keyguard user switcher" into jb-mr2-dev 
* commit '153919ed2f128fb5d1b55782ea89fadcc20fc841':
  Cache the scaled avatar drawables in the keyguard user switcher
 2013-05-09 16:23:31 -07:00
Chet Haase
a9d5adea9e am fb32c824: Merge "Fix start delay jank in ViewPropertyAnimator" into jb-mr2-dev 
* commit 'fb32c82412111983236f44cbc8fd90f113d7ea34':
  Fix start delay jank in ViewPropertyAnimator
 2013-05-09 16:23:29 -07:00
Matthew Xie
c0c7cebe3f am b566c466: Merge "Donot bind to GATT service when BLE is not supported" into jb-mr2-dev 
* commit 'b566c466c73d351d01e64d1c9ba609133efc4ffd':
  Donot bind to GATT service when BLE is not supported
 2013-05-09 16:23:26 -07:00