Pavel Zhamaitsiak
913c989546
am d89f0d3d: am b81ce34a: Merge "Revert "Merge "Remove CONNECTIVITY_CHANGE_DELAY and friends." into lmp-mr1-dev"" into lmp-mr1-dev
...
* commit 'd89f0d3d54dec1662b1cfed6c8e574ffcc8032d9':
Revert "Merge "Remove CONNECTIVITY_CHANGE_DELAY and friends." into lmp-mr1-dev"
2014-12-08 19:16:43 +00:00
Justin Harrison
e0b2fa5c57
am 87797c05: am 4a9cecb1: Merge "Add UUID for Pbap client" into lmp-mr1-dev
...
* commit '87797c056c98eb527c85ccb7b7da33c99093e1bc':
Add UUID for Pbap client
2014-12-08 19:16:37 +00:00
Fyodor Kupolov
d483a85e69
am fed2812d: am 22afe626: Merge "Added isRemovingAdmin method" into lmp-mr1-dev
...
* commit 'fed2812dc9fd717a7e3b1ebf9c602eda2bdfca08':
Added isRemovingAdmin method
2014-12-08 19:16:12 +00:00
Benjamin Franz
f4a76651b0
am 5f1ea2e6: am fb967585: Merge "Change the routing path of bluetooth headset connections." into lmp-mr1-dev
...
* commit '5f1ea2e68b138316f2a56d0a1de382ac47f7b11c':
Change the routing path of bluetooth headset connections.
2014-12-08 19:14:56 +00:00
Filip Gruszczynski
5ae61a811a
am f5d1cf0b: am 26af8c19: am 26b18771: Merge "Private Window flag to disable touch events in WallpaperService." into lmp-sprout-dev
...
* commit 'f5d1cf0b194147fae0aca2c2352b4843627ffc1e':
Private Window flag to disable touch events in WallpaperService.
2014-12-08 19:13:39 +00:00
Raph Levien
1918d0276a
am 8aa97d26: am 238efad0: Merge "Change Linkify leniency to VALID" into lmp-mr1-dev
...
* commit '8aa97d26e48cb86398e3f7df8103379564f16082':
Change Linkify leniency to VALID
2014-12-08 19:13:14 +00:00
Svetoslav
f477aeb367
am ed068f7c: am 3a0d878a: Ensure all events from a showing window are dispatched.
...
* commit 'ed068f7c3047b3775647a6023c6960a4fc535144':
Ensure all events from a showing window are dispatched.
2014-12-08 19:12:22 +00:00
Chet Haase
0a8cc945ce
am b29c6299: am 0a77897b: Merge "Fix seeking behavior" into lmp-mr1-dev
...
* commit 'b29c6299704ffd3885be6347bf85058010e24868':
Fix seeking behavior
2014-12-08 19:11:33 +00:00
Zhentao Sun
b97782f2da
am 4f04cb20: am 8485098f: Merge "Fixed a leak in GeofenceHardwareImpl.java." into lmp-mr1-dev
...
* commit '4f04cb20cc37d7a70c2a50af97cc6fd6d064bb06':
Fixed a leak in GeofenceHardwareImpl.java.
2014-12-08 19:09:36 +00:00
Raph Levien
b9d21d623f
am 8de4fb2f: am 2f0e6f0c: Merge "Fix off-by-one error in computeEllipsis" into lmp-mr1-dev
...
* commit '8de4fb2fe53ed7707500d9cdf737953bed3dec7e':
Fix off-by-one error in computeEllipsis
2014-12-08 19:09:18 +00:00
Wale Ogunwale
af3361bb26
am 9a3f6ac6: am 6b54d38a: Merge "Add support from restoring recent\'s backup." into lmp-mr1-dev
...
* commit '9a3f6ac63c9c11008b6dbb99d5213b3d3f51fca0':
Add support from restoring recent's backup.
2014-12-05 21:41:03 +00:00
Prerepa Viswanadham
12120998f8
am e21aafab: am ff5e5db3: Fix BT crash due to unset value for BluetoothGattDescriptor from API user
...
* commit 'e21aafab0d735935155860bd16dcc3ece81ce546':
Fix BT crash due to unset value for BluetoothGattDescriptor from API user
2014-12-05 20:18:38 +00:00
Pavel Zhamaitsiak
d89f0d3d54
am b81ce34a: Merge "Revert "Merge "Remove CONNECTIVITY_CHANGE_DELAY and friends." into lmp-mr1-dev"" into lmp-mr1-dev
...
* commit 'b81ce34af33ce940846e71878279f9482037cb39':
Revert "Merge "Remove CONNECTIVITY_CHANGE_DELAY and friends." into lmp-mr1-dev"
2014-12-05 19:44:53 +00:00
Justin Harrison
87797c056c
am 4a9cecb1: Merge "Add UUID for Pbap client" into lmp-mr1-dev
...
* commit '4a9cecb1f0bb6f5f949f33c5f07be6d995f4cf24':
Add UUID for Pbap client
2014-12-05 19:44:48 +00:00
Pavel Zhamaitsiak
b81ce34af3
Merge "Revert "Merge "Remove CONNECTIVITY_CHANGE_DELAY and friends." into lmp-mr1-dev"" into lmp-mr1-dev
2014-12-05 19:42:11 +00:00
Justin Harrison
4a9cecb1f0
Merge "Add UUID for Pbap client" into lmp-mr1-dev
2014-12-05 19:41:55 +00:00
Adam Powell
1962353873
am b3b4f837: am 8c9283f4: Merge "Fix NullPointerException in ListView"
...
* commit 'b3b4f83702ca878854529acfdc389d15db5ca6f3':
Fix NullPointerException in ListView
2014-12-05 19:39:25 +00:00
Fyodor Kupolov
fed2812dc9
am 22afe626: Merge "Added isRemovingAdmin method" into lmp-mr1-dev
...
* commit '22afe6261aab343070b63c60a1f4c7ce6f4383f9':
Added isRemovingAdmin method
2014-12-05 19:36:26 +00:00
Fyodor Kupolov
22afe6261a
Merge "Added isRemovingAdmin method" into lmp-mr1-dev
2014-12-05 19:28:12 +00:00
Adam Powell
8c9283f410
Merge "Fix NullPointerException in ListView"
2014-12-05 19:26:18 +00:00
Erik Kline
e660e27603
Revert "Merge "Remove CONNECTIVITY_CHANGE_DELAY and friends." into lmp-mr1-dev"
...
This is the revert of ag/572619.
This reverts commit 9261d9d645 , reversing
changes made to 32b61ab28f .
Bug: 18609055
Bug: 17769720
Change-Id: I122eba200f2071d4e5777ec34c1d04fb567345a8
2014-12-05 18:02:56 +00:00
Benjamin Franz
5f1ea2e68b
am fb967585: Merge "Change the routing path of bluetooth headset connections." into lmp-mr1-dev
...
* commit 'fb967585cc43937a88b0ed9a5e434a50b0a498b9':
Change the routing path of bluetooth headset connections.
2014-12-05 12:11:23 +00:00
Benjamin Franz
fb967585cc
Merge "Change the routing path of bluetooth headset connections." into lmp-mr1-dev
2014-12-05 12:04:03 +00:00
Filip Gruszczynski
f5d1cf0b19
am 26af8c19: am 26b18771: Merge "Private Window flag to disable touch events in WallpaperService." into lmp-sprout-dev
...
* commit '26af8c197c17487ac0400a7a3310037e57eda2a0':
Private Window flag to disable touch events in WallpaperService.
2014-12-05 02:40:38 +00:00
Filip Gruszczynski
26af8c197c
am 26b18771: Merge "Private Window flag to disable touch events in WallpaperService." into lmp-sprout-dev
...
* commit '26b187711fdf6224e14df465a58f30f510011b49':
Private Window flag to disable touch events in WallpaperService.
2014-12-05 02:34:26 +00:00
Raph Levien
8aa97d26e4
am 238efad0: Merge "Change Linkify leniency to VALID" into lmp-mr1-dev
...
* commit '238efad04bfd144942b363c8589004ba831f3c63':
Change Linkify leniency to VALID
2014-12-05 02:19:38 +00:00
Raph Levien
238efad04b
Merge "Change Linkify leniency to VALID" into lmp-mr1-dev
2014-12-05 02:14:52 +00:00
Fyodor Kupolov
96fb932666
Added isRemovingAdmin method
...
Added isRemovingAdmin method, so that clients can query if device
admin is currently being removed.
Bug: 17609838
Change-Id: I82547a9eeb228fcf8ac2a6e639ca1a75fa41d161
2014-12-04 17:53:45 -08:00
Svetoslav
ed068f7c30
am 3a0d878a: Ensure all events from a showing window are dispatched.
...
* commit '3a0d878ab56475276c61d574af7651820a5cea5a':
Ensure all events from a showing window are dispatched.
2014-12-05 00:45:51 +00:00
Svetoslav
3a0d878ab5
Ensure all events from a showing window are dispatched.
...
Accessibility services may opt-in to introspect the interactive
windows on the screen. If window introspection is enabled there
is a case where some events from a showing window are received
before the updated window state from the window manager. Now the
window manager sends over the windows before notifying the app
for the focus change.
bug:18625996
Change-Id: Ic481e01efbe12dc92f090f799feeb236672fc7b3
2014-12-05 00:37:38 +00:00
Chet Haase
b29c629970
am 0a77897b: Merge "Fix seeking behavior" into lmp-mr1-dev
...
* commit '0a77897bb6671220fe9d53964ccd2651216dc7ba':
Fix seeking behavior
2014-12-04 23:35:37 +00:00
Chet Haase
0a77897bb6
Merge "Fix seeking behavior" into lmp-mr1-dev
2014-12-04 23:26:59 +00:00
Chet Haase
f4e3bab925
Fix seeking behavior
...
A recent fix to seeking behavior injected a couple of issues that need
to be addressed:
- the start time should be updated when seeking so that future calculations
that depend on it (such as the next animation frame) will use the updated
start time based on this seek request. This allows, for example, seeking
into a running animator so that that animator will update its current fraction
to the new seeked value.
- calling reverse() on an unstarted animation would incorrectly set the initial
frame of the animation to the end value for one frame before the reverse animation
actually began.
Issue #18567716 No icons in folders in battery saving mode
Issue #18511989 Search bar flashes when icon is picked up and dropped
Change-Id: Ie30b7e797468c6ccb3d17d4fb3aba6b9849436b0
2014-12-04 15:09:01 -08:00
Filip Gruszczynski
b8c0694ae8
Private Window flag to disable touch events in WallpaperService.
...
Change-Id: I18b46340f89cbea0b6daeb1efe9c31656f4e1a5d
2014-12-04 15:02:18 -08:00
Zhentao Sun
4f04cb20cc
am 8485098f: Merge "Fixed a leak in GeofenceHardwareImpl.java." into lmp-mr1-dev
...
* commit '8485098fa22a61f845cb2abbc5bc856b15835a9e':
Fixed a leak in GeofenceHardwareImpl.java.
2014-12-04 22:58:02 +00:00
Zhentao Sun
8485098fa2
Merge "Fixed a leak in GeofenceHardwareImpl.java." into lmp-mr1-dev
2014-12-04 22:52:51 +00:00
Mike Lockwood
a6e14c8293
am 75b25577: am 448403b7: Merge "Dont call close in in BluetoothA2dp finalize"
...
* commit '75b2557725430e768cc3b21bb9c2aef92b887538':
Dont call close in in BluetoothA2dp finalize
2014-12-04 22:45:07 +00:00
Raph Levien
9dfe86d410
Change Linkify leniency to VALID
...
The linkify logic used POSSIBLE as its leniency setting, which resulted
in false positives such as 4-digit years being interpreted as phone
numbers. Changing to VALID as per recommendation of libphonenumber
people, which fixes this problem.
Bug: 18489494
Change-Id: I77d330285de46de2fdda22daed41392106ec6ddd
2014-12-04 14:42:38 -08:00
Raph Levien
8de4fb2fe5
am 2f0e6f0c: Merge "Fix off-by-one error in computeEllipsis" into lmp-mr1-dev
...
* commit '2f0e6f0c7f52427ff542ebb9a28aa489a0f1f909':
Fix off-by-one error in computeEllipsis
2014-12-04 22:39:04 +00:00
Raph Levien
2f0e6f0c7f
Merge "Fix off-by-one error in computeEllipsis" into lmp-mr1-dev
2014-12-04 22:33:09 +00:00
Raph Levien
0e3c5e8272
Fix off-by-one error in computeEllipsis
...
In the Truncate.MIDDLE case, when the line is less than half the layout
width, the computeEllipsis logic could go past the left edge of the
string. This patch fixes the off-by-one and avoids the resulting index
out of bounds crash, and also changes the behavior so that when
ellipsizing at the middle, the string to the end of the paragraph is
taken into account.
Bug: 18508627
Change-Id: I24be09c23a5aa158791a9717419307613b8a22e8
2014-12-04 22:32:48 +00:00
Wale Ogunwale
9a3f6ac63c
am 6b54d38a: Merge "Add support from restoring recent\'s backup." into lmp-mr1-dev
...
* commit '6b54d38a2c859f1c2cc176d1d9a33837cfc351db':
Add support from restoring recent's backup.
2014-12-04 22:06:56 +00:00
Wale Ogunwale
6b54d38a2c
Merge "Add support from restoring recent's backup." into lmp-mr1-dev
2014-12-04 21:58:51 +00:00
Craig Mautner
95cce9d57e
am 93d47b4c: Merge "Avoid system server crash due to package removed" into lmp-mr1-dev
...
* commit '93d47b4c05585c37117ac5ac44d810de63f9d008':
Avoid system server crash due to package removed
2014-12-04 21:58:07 +00:00
Craig Mautner
93d47b4c05
Merge "Avoid system server crash due to package removed" into lmp-mr1-dev
2014-12-04 21:50:15 +00:00
Derek Sollenberger
203c817180
am c1a2f38c: am 4d9da135: Merge "Update AndroidPixelRef to prevent VM from cleaning up memory prematurely." into lmp-mr1-dev
...
* commit 'c1a2f38ce0447b005d0cde6836857f451af84dc6':
Update AndroidPixelRef to prevent VM from cleaning up memory prematurely.
2014-12-04 21:46:39 +00:00
Erik Kline
180a30aa57
am 95b5ca90: am 9261d9d6: Merge "Remove CONNECTIVITY_CHANGE_DELAY and friends." into lmp-mr1-dev
...
* commit '95b5ca9019720c4c012ca13791d32aa6d0bb5ba8':
Remove CONNECTIVITY_CHANGE_DELAY and friends.
2014-12-04 21:45:33 +00:00
Cheuksan Wang
29ac679f9f
am dba26aa2: am 109ec376: Merge "new SMS/MMS carrier app API" into lmp-mr1-dev
...
* commit 'dba26aa2e793b037839c608319534b100d2c3dbe':
new SMS/MMS carrier app API
2014-12-04 21:45:08 +00:00
Mike Lockwood
448403b7a4
Merge "Dont call close in in BluetoothA2dp finalize"
2014-12-04 21:41:13 +00:00
John Reck
a75b0ad384
resolved conflicts for merge of a51a0901 to lmp-mr1-dev-plus-aosp
...
Change-Id: Id7df835f0bd3d5d276b162635ddfb7fe0918dfed
2014-12-04 13:41:04 -08:00