OSDN Git Service
Shreyas Basarge [Thu, 21 Apr 2016 00:50:04 +0000 (00:50 +0000)]
Merge "Fix logspam by JobInfo" into nyc-dev
am:
bb9dd3c9fd
* commit '
bb9dd3c9fdef30ed4bf776fbf8cb74c7eed2e87e':
Fix logspam by JobInfo
Change-Id: Icdb25bb608e89c280ee756d7dd4fadd03b25da15
Dianne Hackborn [Thu, 21 Apr 2016 00:39:41 +0000 (00:39 +0000)]
Merge "Fix logspam by JobInfo" into nyc-dev
Tim Murray [Thu, 21 Apr 2016 00:39:02 +0000 (00:39 +0000)]
Merge "Increase the max binder thread pool size for system_server." into nyc-dev
am:
150553756f
* commit '
150553756f89a51cc70b24cd9dbab4bdfba0fc59':
Increase the max binder thread pool size for system_server.
Change-Id: I40cab5fe8638276c2784a30f5099723faba2afce
Philip P. Moltmann [Thu, 21 Apr 2016 00:34:33 +0000 (00:34 +0000)]
Merge "Prevent printing from finishing activity." into nyc-dev
am:
41304f47f4
* commit '
41304f47f4d5d6cdd4d160c9553f47b1e641aff8':
Prevent printing from finishing activity.
Change-Id: I4ab24c8ace1023c481244431bbac8cfbce4003a4
Adrian Roos [Thu, 21 Apr 2016 00:34:32 +0000 (00:34 +0000)]
Merge "A11y: Fix battery icon and clock descriptions" into nyc-dev
am:
206748d10e
* commit '
206748d10e5f3b42e198af6a2e0801fb47ec3c01':
A11y: Fix battery icon and clock descriptions
Change-Id: I1d428b3c3f0d70ad275fb9d9bb1b39bcda8d3ac1
Tim Murray [Thu, 21 Apr 2016 00:32:45 +0000 (00:32 +0000)]
Merge "Increase the max binder thread pool size for system_server." into nyc-dev
Philip P. Moltmann [Thu, 21 Apr 2016 00:31:41 +0000 (00:31 +0000)]
Merge "Prevent printing from finishing activity." into nyc-dev
TreeHugger Robot [Thu, 21 Apr 2016 00:25:14 +0000 (00:25 +0000)]
Merge "A11y: Fix battery icon and clock descriptions" into nyc-dev
Philip P. Moltmann [Thu, 21 Apr 2016 00:23:28 +0000 (00:23 +0000)]
Merge "Print API for N: Fix docs and change interfaces as requested." into nyc-dev
am:
50a871857d
* commit '
50a871857d4a6c6f8d6ce8b3621414e60a32eaf6':
Print API for N: Fix docs and change interfaces as requested.
Change-Id: Ic913375a7d3e6d3fb664b2b046d9716e46511cc5
Jorim Jaggi [Thu, 21 Apr 2016 00:23:25 +0000 (00:23 +0000)]
Merge "Disallow changing stacks if top activity" into nyc-dev
am:
1fa356289e
* commit '
1fa356289e50d9a48d84afe831b230b087870e76':
Disallow changing stacks if top activity
Change-Id: I6248a6442513af45fb2d8da09853eed12dd1c30d
Philip P. Moltmann [Thu, 21 Apr 2016 00:17:46 +0000 (00:17 +0000)]
Merge "Print API for N: Fix docs and change interfaces as requested." into nyc-dev
TreeHugger Robot [Thu, 21 Apr 2016 00:11:49 +0000 (00:11 +0000)]
Merge "Disallow changing stacks if top activity" into nyc-dev
Vladislav Kaznacheev [Thu, 21 Apr 2016 00:11:28 +0000 (00:11 +0000)]
Merge "Add JavaDoc for View.updateDragShadow" into nyc-dev
am:
2860936
* commit '
28609360cfe25446ab5b0ba165af363378b3d805':
Add JavaDoc for View.updateDragShadow
Change-Id: I9aa23cafbeedf21e2cbca4e84adc0b424f7cfec0
Robert Carr [Thu, 21 Apr 2016 00:11:27 +0000 (00:11 +0000)]
Merge "Prevent recents from closing while moving PiP to fullscreen." into nyc-dev
am:
abadeba
* commit '
abadeba99afbb1d80a38b396407822c96c7e3706':
Prevent recents from closing while moving PiP to fullscreen.
Change-Id: I97fa47524a1c78aa637fee4d6a086dec966698e7
Suprabh Shukla [Thu, 21 Apr 2016 00:03:13 +0000 (00:03 +0000)]
Merge "Removing disk access from startActivity thread" into nyc-dev
am:
6c0ead9
* commit '
6c0ead993e48f6e260972171b1187ef77b6094fb':
Removing disk access from startActivity thread
Change-Id: I7f62940ac1b51109f8804cc92c56dcd2b755340f
Eino-Ville Talvala [Thu, 21 Apr 2016 00:03:11 +0000 (00:03 +0000)]
Merge "Camera2: Ignore exception on double-completed capture sequences." into nyc-dev
am:
5856779
* commit '
5856779c3a3e00e256cdf5cb571a85975d781cf4':
Camera2: Ignore exception on double-completed capture sequences.
Change-Id: Ie22c0bbdc83cba529bf521ebaef3349a5e22b976
TreeHugger Robot [Thu, 21 Apr 2016 00:02:06 +0000 (00:02 +0000)]
Merge "Add JavaDoc for View.updateDragShadow" into nyc-dev
Rob Carr [Thu, 21 Apr 2016 00:00:06 +0000 (00:00 +0000)]
Merge "Prevent recents from closing while moving PiP to fullscreen." into nyc-dev
TreeHugger Robot [Wed, 20 Apr 2016 23:58:01 +0000 (23:58 +0000)]
Merge "Removing disk access from startActivity thread" into nyc-dev
Eino-Ville Talvala [Wed, 20 Apr 2016 23:55:09 +0000 (23:55 +0000)]
Merge "Camera2: Ignore exception on double-completed capture sequences." into nyc-dev
Shreyas Basarge [Wed, 20 Apr 2016 23:44:58 +0000 (00:44 +0100)]
Fix logspam by JobInfo
Print interval clamp message
only for periodic jobs having
period/flex less than the minimum value.
Bug:
28296128
Change-Id: Id0d7c3b56048582a490bb8214eca491ec2bbdc93
Adrian Roos [Wed, 20 Apr 2016 23:44:54 +0000 (23:44 +0000)]
Merge "Fix inline reply clobbering when narrowly missing send button" into nyc-dev
am:
75fe7d5
* commit '
75fe7d5d791d8372af9d2e11a50287e6119a9780':
Fix inline reply clobbering when narrowly missing send button
Change-Id: I61f9303383937030750edd95eee11862b59e8447
TreeHugger Robot [Wed, 20 Apr 2016 23:39:50 +0000 (23:39 +0000)]
Merge "Fix inline reply clobbering when narrowly missing send button" into nyc-dev
Felipe Leme [Wed, 20 Apr 2016 23:33:28 +0000 (23:33 +0000)]
Merge "Set BugreportProgressService to run on foreground." into nyc-dev
am:
3053c3f
* commit '
3053c3f2a94b24ceeed9c46cb84045c285d3523b':
Set BugreportProgressService to run on foreground.
Change-Id: Ib5b92dfcaf3dca5710abc19f261fed8017fcae1f
TreeHugger Robot [Wed, 20 Apr 2016 23:23:10 +0000 (23:23 +0000)]
Merge "Set BugreportProgressService to run on foreground." into nyc-dev
Adam Lesinski [Wed, 20 Apr 2016 22:56:11 +0000 (22:56 +0000)]
Merge "ResourcesManager: Throw exception if failed to load asset path" into nyc-dev
am:
1362ae0
* commit '
1362ae062a196c8450a0b649dd0c5af66d1f05a1':
ResourcesManager: Throw exception if failed to load asset path
Change-Id: I01276ec237130b9d49bc46a9e2b7b29e08aa5922
Adrian Roos [Wed, 20 Apr 2016 22:51:42 +0000 (15:51 -0700)]
A11y: Fix battery icon and clock descriptions
Now announces charging state on the battery icon
and AM/PM on the clock.
Change-Id: Ib8d249e60b555834e5e224287ea332178ce7c165
Fixes:
27552350
Adam Lesinski [Wed, 20 Apr 2016 22:46:04 +0000 (22:46 +0000)]
Merge "ResourcesManager: Throw exception if failed to load asset path" into nyc-dev
Jorim Jaggi [Wed, 20 Apr 2016 03:30:47 +0000 (20:30 -0700)]
Disallow changing stacks if top activity
When we attach an activity to an existing
task, and that task is already on top,
disallow changing stacks altogether even
if launch stack id is set.
Bug:
28026847
Change-Id: Ie70f0585a29dc1b85a5093624fede32110be3c76
Lifu Tang [Wed, 20 Apr 2016 22:30:53 +0000 (22:30 +0000)]
Merge "Added defensive code to prevent system crash" into nyc-dev
am:
a381455
* commit '
a381455472a814c8dbd98fcb4312f46ed1373c88':
Added defensive code to prevent system crash
Change-Id: I7a48940b04b3033ab2c5e0f370098749e4fdd8fd
Lifu Tang [Wed, 20 Apr 2016 22:30:52 +0000 (22:30 +0000)]
Merge "Fixed bug in upgrading GpsMeasurement" into nyc-dev
am:
e1b5171
* commit '
e1b51715bdd1d59913ef4cb83071ef8eaac968de':
Fixed bug in upgrading GpsMeasurement
Change-Id: I89d094509612073a7e7e046db48f896a653d42a9
Suprabh Shukla [Wed, 20 Apr 2016 22:24:31 +0000 (15:24 -0700)]
Removing disk access from startActivity thread
Code was checking whether the directory for recent_images existed in
many places unnecessarily causing StrictMode violations. Moved the
code to only attempt to check and create the directory before
actually writing to disk.
Bug: b/
28195831
Change-Id: I05f77a10f1dafc8cc0b1836b62352d56549ac1ee
Lifu Tang [Wed, 20 Apr 2016 22:19:17 +0000 (22:19 +0000)]
Merge "Added defensive code to prevent system crash" into nyc-dev
Lifu Tang [Wed, 20 Apr 2016 22:19:04 +0000 (22:19 +0000)]
Merge "Fixed bug in upgrading GpsMeasurement" into nyc-dev
Christopher Tate [Wed, 20 Apr 2016 22:13:08 +0000 (22:13 +0000)]
Merge "Don\'t back up wallpapers that we\'ve been told not to" into nyc-dev
am:
665189f
* commit '
665189f92646d34bf02082120cba3c62aa718770':
Don't back up wallpapers that we've been told not to
Change-Id: I60eb02a9b1ab8da966d964c62a6dccf52d873e94
Christopher Tate [Wed, 20 Apr 2016 22:13:07 +0000 (22:13 +0000)]
resolve merge conflicts of
44e07e0 to mnc-dev am:
825b713 am:
8c635e7 am:
343600c am:
b965ced -s ours
am:
129c01a
* commit '
129c01af82df8560f9db9c990651e54689e55274':
Kill the real/isolated uid group, not the ApplicationInfo uid
Change-Id: I52a5a34af6acb17d63ae43ac999609de6994be88
Chris Tate [Wed, 20 Apr 2016 22:10:38 +0000 (22:10 +0000)]
Merge "Don't back up wallpapers that we've been told not to" into nyc-dev
Christopher Tate [Wed, 20 Apr 2016 22:09:28 +0000 (22:09 +0000)]
resolve merge conflicts of
44e07e0 to mnc-dev am:
825b713 am:
8c635e7 am:
343600c
am:
b965ced -s ours
* commit '
b965ced011bdd7a3ec5450f93d1c58b889514f11':
Kill the real/isolated uid group, not the ApplicationInfo uid
Change-Id: Idf9a9824d411ca2b178fadda040f46864bc96a58
Eino-Ville Talvala [Wed, 20 Apr 2016 22:05:40 +0000 (15:05 -0700)]
Camera2: Ignore exception on double-completed capture sequences.
As a workaround for b/
27870771, convert fatal exception into a
warning.
Duplicate calls to finishPendingSequence with the same sequenceId
are seen in user crash reports, but with no further context and
inability to reproduce after testing various hypothesis, just
warn about it happening.
Bug:
27870771
Change-Id: Icd7d408887e04b94092689ce61809d6c664d8e3a
Christopher Tate [Wed, 20 Apr 2016 21:48:43 +0000 (21:48 +0000)]
resolve merge conflicts of
44e07e0 to mnc-dev am:
825b713 am:
8c635e7
am:
343600c
* commit '
343600c3ecff31826e50d40821927e446adb9b0a':
Kill the real/isolated uid group, not the ApplicationInfo uid
Change-Id: I68dbf8f280672ec9770b6c57b9a17313f448e14a
Felipe Leme [Fri, 15 Apr 2016 19:49:34 +0000 (12:49 -0700)]
Set BugreportProgressService to run on foreground.
BugreportProgressService do not persist the user-provided
information (like details and screenshot paths), so if it's killed by
the framework, that info is lost.
Running it as foreground mitigates the changes of it being killed.
BUG:
27431998
BUG:
28291423
Change-Id: I2f58507beb38309628f2f19d3f7f950d07eca16f
Robert Carr [Wed, 20 Apr 2016 21:43:21 +0000 (21:43 +0000)]
Merge "Do not prematurely update position while bounds animating." into nyc-dev
am:
5a6c58e
* commit '
5a6c58e00202ed83cd60a02cd6a79da65598b655':
Do not prematurely update position while bounds animating.
Change-Id: I7ad0d28dbe7e4224c7ce50fb6996ccec98d7fd4b
Jim Miller [Wed, 20 Apr 2016 21:43:19 +0000 (21:43 +0000)]
Merge "Fix bug where fingerprint for wrong userId was attempted to be removed." into nyc-dev
am:
54c4374
* commit '
54c4374b4a67fdfbda936e7f4a8a9538e16c3557':
Fix bug where fingerprint for wrong userId was attempted to be removed.
Change-Id: Ib762515ea86e8dc9eb475f1a3f0eb472da6447c4
Christopher Tate [Wed, 20 Apr 2016 21:43:17 +0000 (21:43 +0000)]
resolve merge conflicts of
44e07e0 to mnc-dev am:
825b713
am:
8c635e7
* commit '
8c635e73c698302ce6661f227c274164972f048e':
Kill the real/isolated uid group, not the ApplicationInfo uid
Change-Id: Iae6fe5af0a8e0f27e8b45a56aecc2d722d7c3bc3
Vladislav Kaznacheev [Wed, 20 Apr 2016 21:40:32 +0000 (14:40 -0700)]
Add JavaDoc for View.updateDragShadow
Bug:
28296402
Change-Id: I2aec5ab9932c3177cb08dbf1210abfd949e0dab7
Rob Carr [Wed, 20 Apr 2016 21:37:10 +0000 (21:37 +0000)]
Merge "Do not prematurely update position while bounds animating." into nyc-dev
Christopher Tate [Wed, 20 Apr 2016 21:35:50 +0000 (21:35 +0000)]
resolve merge conflicts of
44e07e0 to mnc-dev
am:
825b713
* commit '
825b7134699fbaaa16423c52b7b424d4a9afefb1':
Kill the real/isolated uid group, not the ApplicationInfo uid
Change-Id: I0c120c8dbf76857985ebea04eadca81fa6470cb2
Christopher Tate [Thu, 25 Feb 2016 20:43:38 +0000 (12:43 -0800)]
Don't back up wallpapers that we've been told not to
In addition, now that the full uncropped wallpaper image is being
backed up, we now handle that via the full-data backup path instead
of key/value. Restore still knows about legacy data that gets
delivered via the older key/value mechanism.
This change also has the effect of removing the size limitations
around wallpaper restore acceptance. Any size source imagery is
valid, as crop & scale are rerun in a device-appropriate way
after the restore.
Bug
25453848
Bug
25727875
Change-Id: Idc64a2eaab97a8ecc9d2b8ca5dc011f29cab324d
Jim Miller [Wed, 20 Apr 2016 21:33:13 +0000 (21:33 +0000)]
Merge "Fix bug where fingerprint for wrong userId was attempted to be removed." into nyc-dev
Phil Burk [Wed, 20 Apr 2016 21:22:12 +0000 (21:22 +0000)]
Merge "MidiDevice: do not open ports on closed device" into nyc-dev
am:
2faac0d
* commit '
2faac0d74169ddc1f54f9cd356dc23b96a74c9eb':
MidiDevice: do not open ports on closed device
Change-Id: I81303c3d44494eab901a33b1376ce2b18c74ef73
Fyodor Kupolov [Wed, 20 Apr 2016 21:22:11 +0000 (21:22 +0000)]
Merge "Test coverage for new FBE functionality" into nyc-dev
am:
366a457
* commit '
366a457b6da6caf3d376a8ef0be6a386aee5c216':
Test coverage for new FBE functionality
Change-Id: I53c16de6aa812565137092a4b060daf9c915fe85
Phil Burk [Wed, 20 Apr 2016 21:15:32 +0000 (21:15 +0000)]
Merge "MidiDevice: do not open ports on closed device" into nyc-dev
Fyodor Kupolov [Wed, 20 Apr 2016 21:13:39 +0000 (21:13 +0000)]
Merge "Test coverage for new FBE functionality" into nyc-dev
Ruchi Kandoi [Wed, 20 Apr 2016 21:08:05 +0000 (21:08 +0000)]
Merge "Revert "PowerManager: Adds the Sustained performance API."" into nyc-dev
am:
0fea8ad
* commit '
0fea8ad44748abd031c2e73cd5e6bce6a086c5f3':
Revert "PowerManager: Adds the Sustained performance API."
Change-Id: Ia121fd434e0a3b441e510452f258861550b90c23
Shubham Ajmera [Wed, 20 Apr 2016 21:00:49 +0000 (21:00 +0000)]
Merge "Track libcore change
e2270147c6ddfb164776b68295078a5e6c6dfee7" into nyc-dev
am:
f3d5a4d
* commit '
f3d5a4dd60b3ec461e4d9fee97ce99a92cb29b1b':
Track libcore change
e2270147c6ddfb164776b68295078a5e6c6dfee7
Change-Id: I296d2c4a5700ac7fb882d2b02d434796cd6527df
Chong Zhang [Wed, 20 Apr 2016 21:00:46 +0000 (21:00 +0000)]
Merge "Fix IME adjust when stack focus changes while IME is visible" into nyc-dev
am:
3966fb9
* commit '
3966fb942c7a9445a8cc94aeafc445778c2311b4':
Fix IME adjust when stack focus changes while IME is visible
Change-Id: I53a0d8101b13443c30182909d02d952fce2fede6
Ruchi Kandoi [Wed, 20 Apr 2016 20:59:18 +0000 (20:59 +0000)]
Merge "Revert "PowerManager: Adds the Sustained performance API."" into nyc-dev
Adrian Roos [Wed, 20 Apr 2016 20:58:03 +0000 (13:58 -0700)]
Fix inline reply clobbering when narrowly missing send button
The RemoteInputView leaked through unhandled touches. To prevent this,
we now make sure the send button covers the entire area, and we catch
any touches that did not go to either the send button or the text box.
Bug:
27357771
Change-Id: Idc08d98dc7970b99c735f80088ea1eec0ec2d831
Shubham Ajmera [Wed, 20 Apr 2016 20:52:56 +0000 (20:52 +0000)]
Merge "Track libcore change
e2270147c6ddfb164776b68295078a5e6c6dfee7" into nyc-dev
Chong Zhang [Wed, 20 Apr 2016 20:52:07 +0000 (20:52 +0000)]
Merge "Fix IME adjust when stack focus changes while IME is visible" into nyc-dev
Fan Zhang [Wed, 20 Apr 2016 20:50:15 +0000 (20:50 +0000)]
Merge "Allow fragments set their own header view below actionbar." into nyc-mr1-dev
Ruchi Kandoi [Wed, 20 Apr 2016 20:42:01 +0000 (13:42 -0700)]
Revert "PowerManager: Adds the Sustained performance API."
This reverts commit
0abc001275d6cf0af4990f521ccff7346a7cd2bf.
Bug:
28150358
Change-Id: I99c71b3d6641310a33e898d6fd475d37c79ba9d0
Signed-off-by: Ruchi Kandoi <kandoiruchi@google.com>
Ruchi Kandoi [Wed, 20 Apr 2016 20:42:25 +0000 (20:42 +0000)]
Merge "window: Adds a Sustained Performance Mode window flag." into nyc-dev
am:
a645c97
* commit '
a645c9753ff004e616a6df4a15c9d2e999508d91':
window: Adds a Sustained Performance Mode window flag.
Change-Id: I8d3803ce5530ae84a876d66690b3fdb907ebc96b
Philip P. Moltmann [Wed, 20 Apr 2016 20:21:34 +0000 (13:21 -0700)]
Print API for N: Fix docs and change interfaces as requested.
Fixes:
28291443
Change-Id: I1a1585796032351a739d54171bd67ccc76f0f08a
Adam Lesinski [Wed, 20 Apr 2016 20:36:19 +0000 (13:36 -0700)]
ResourcesManager: Throw exception if failed to load asset path
Previously if we failed to load an asset path, we would return a
null AssetManager which would lead to an immediate NPE.
Throw a proper exception instead, detailing which path failed to load.
Bug:
28216288
Change-Id: I491b9316b837bf333b5ae78d4eb1ee31741617ec
Ruchi Kandoi [Wed, 20 Apr 2016 20:35:20 +0000 (20:35 +0000)]
Merge "window: Adds a Sustained Performance Mode window flag." into nyc-dev
Jim Miller [Wed, 20 Apr 2016 20:34:11 +0000 (13:34 -0700)]
Fix bug where fingerprint for wrong userId was attempted to be removed.
- cleaned up private API to ensure userId is distinct from groupId.
- fixed bug where we were sending the wrong userId when attempting to
- fix warning about wrong fingerId when receiving final id of 0.
Fixes bug
28268635
Change-Id: I9507723c1a763152775f2feff76c16762f23cf2d
Christopher Tate [Wed, 20 Apr 2016 20:33:41 +0000 (13:33 -0700)]
resolve merge conflicts of
44e07e0 to mnc-dev
Change-Id: Ibc446c82a3d1446ccd81630743f82d1fd58fbd47
Ruben Brunk [Wed, 20 Apr 2016 19:57:37 +0000 (19:57 +0000)]
Merge "Add settings for altering VR display behavior." into nyc-dev
am:
6ada702
* commit '
6ada702993227233fd362e98de93cc9e798dc75d':
Add settings for altering VR display behavior.
Change-Id: I1816516b1d9c459c0d7bef77c72d9173da7fc3c9
Robert Carr [Wed, 20 Apr 2016 19:53:16 +0000 (12:53 -0700)]
Prevent recents from closing while moving PiP to fullscreen.
If we close recents when beginning the animation, we will
trigger a resume of the previous fullscreen app, which will
attempt to aniamte in at the same time we are animating
the PiP to fullscreen. These conflict causing flicker and
churn.
Bug:
27793381
Change-Id: I520181dadab938bbf62b25891f5ba0e4e9783967
Ruben Brunk [Wed, 20 Apr 2016 19:51:49 +0000 (19:51 +0000)]
Merge "Add settings for altering VR display behavior." into nyc-dev
destradaa [Wed, 20 Apr 2016 19:30:51 +0000 (19:30 +0000)]
Merge "Add support for multiple callback registration in." into nyc-dev
am:
fdb26b9
* commit '
fdb26b90cbbd1db31d2ee1b2c4c38cfcc7d6a46c':
Add support for multiple callback registration in.
Change-Id: Ifffd31cdafdde3fe1f9b7118cab1485486531b33
Phil Burk [Tue, 19 Apr 2016 22:56:24 +0000 (15:56 -0700)]
MidiDevice: do not open ports on closed device
Fix involves client side mIsDeviceClosed flag.
Bug:
24949216
Change-Id: I666284a787fbb9a710d2372fb424e8e54f6a2825
Signed-off-by: Phil Burk <philburk@google.com>
Dongwon Kang [Wed, 20 Apr 2016 19:24:24 +0000 (19:24 +0000)]
Merge "TIF: Do not build input list for background user" into nyc-dev
am:
4a6bd4b
* commit '
4a6bd4b48fe309f50a3878d85104be6fbf244d50':
TIF: Do not build input list for background user
Change-Id: Ibd788b4903e306c1b18a093183880001dbf14475
Daniel Estrada Alva [Wed, 20 Apr 2016 19:22:08 +0000 (19:22 +0000)]
Merge "Add support for multiple callback registration in." into nyc-dev
Lifu Tang [Wed, 20 Apr 2016 19:14:07 +0000 (12:14 -0700)]
Added defensive code to prevent system crash
Bug:
26940611
Change-Id: I8226d1acb42ccc7d2cd910e30b47c7c63c9f490b
Dongwon Kang [Wed, 20 Apr 2016 19:19:33 +0000 (19:19 +0000)]
Merge "TIF: Do not build input list for background user" into nyc-dev
Julia Reynolds [Wed, 20 Apr 2016 19:14:36 +0000 (19:14 +0000)]
Merge "Align radio buttons with app icon, change text color." into nyc-dev
am:
1ff2412
* commit '
1ff2412cc49424ffe9594538618d063c1e0a6951':
Align radio buttons with app icon, change text color.
Change-Id: I6b3cdbd36ee669a5fa32417cee14837258f7f6b8
Julia Reynolds [Wed, 20 Apr 2016 19:14:35 +0000 (19:14 +0000)]
Merge "Animate volume dialog expansion/contraction." into nyc-dev
am:
e86ac2f
* commit '
e86ac2f0da9ec71e9d990291053eec8f352af52d':
Animate volume dialog expansion/contraction.
Change-Id: I7c08343c0400ca34031b5908adfee71f80adf5c9
Julia Reynolds [Wed, 20 Apr 2016 19:10:11 +0000 (19:10 +0000)]
Merge "Align radio buttons with app icon, change text color." into nyc-dev
Julia Reynolds [Wed, 20 Apr 2016 19:07:12 +0000 (19:07 +0000)]
Merge "Animate volume dialog expansion/contraction." into nyc-dev
Robert Carr [Mon, 18 Apr 2016 18:52:21 +0000 (11:52 -0700)]
Do not prematurely update position while bounds animating.
We intend to update the task size in onAnimationStart
so that we can get a new buffer as quickly as possible.
We need to keep it at the old position though, or
we will see a jump at the beginning of the animation.
Bug:
28091556
Change-Id: I5fc5f9eef1629dea88844cf3f2274eaa48909b97
Julia Reynolds [Wed, 20 Apr 2016 15:42:04 +0000 (11:42 -0400)]
Align radio buttons with app icon, change text color.
Bug:
27597108
Change-Id: Id821b46b6f2898295ae711ec33f56fed1b529584
Felipe Leme [Wed, 20 Apr 2016 19:04:41 +0000 (19:04 +0000)]
Merge "Only try to add details to zip once." into nyc-dev
am:
0304688
* commit '
03046888822d07ec020eb7a2f685be4f7bcded31':
Only try to add details to zip once.
Change-Id: Ifa0728bac7fa9a138e129ab66f5949fdc0af51ef
Mitchell Wills [Wed, 20 Apr 2016 19:04:40 +0000 (19:04 +0000)]
Update scan and last network info in the WorkThread am:
cf0875a am:
c441faa am:
2dbac6c
am:
de629c7
* commit '
de629c7ac77719ec6223254825a3e3b099c364c1':
Update scan and last network info in the WorkThread
Change-Id: I9e783bd423ca88d4a4094c705b29b314d68f9e5e
Andreas Gampe [Wed, 20 Apr 2016 19:04:38 +0000 (19:04 +0000)]
Merge "Frameworks/base: Add holder to BaseBundle" into nyc-dev
am:
58f2072
* commit '
58f20726e99947a0f2781b5d4be3052be6eb94dd':
Frameworks/base: Add holder to BaseBundle
Change-Id: I46e5f350f8b862132d97b375e8a170e21dc70d31
TreeHugger Robot [Wed, 20 Apr 2016 19:03:01 +0000 (19:03 +0000)]
Merge "Only try to add details to zip once." into nyc-dev
Mitchell Wills [Wed, 20 Apr 2016 19:01:51 +0000 (19:01 +0000)]
Update scan and last network info in the WorkThread am:
cf0875a am:
c441faa
am:
2dbac6c
* commit '
2dbac6cee58c343682ebf6590ae170c2acd067e4':
Update scan and last network info in the WorkThread
Change-Id: I1068111b96b907f9f3c839fc497e9d06e1254d26
Julia Reynolds [Wed, 20 Apr 2016 18:37:39 +0000 (14:37 -0400)]
Animate volume dialog expansion/contraction.
Bug:
28275874
Change-Id: I751addeb73e7354d3a2018be1ba08bf9b8378b95
Andreas Gampe [Wed, 20 Apr 2016 18:58:30 +0000 (18:58 +0000)]
Merge "Frameworks/base: Add holder to BaseBundle" into nyc-dev
Mitchell Wills [Wed, 20 Apr 2016 18:57:29 +0000 (18:57 +0000)]
Update scan and last network info in the WorkThread am:
cf0875a
am:
c441faa
* commit '
c441faa6de5618e9da029858ce83b3e129be2974':
Update scan and last network info in the WorkThread
Change-Id: I69ee081eb91a521e7c6cdc7ca6e96ebc230c1aba
Chong Zhang [Tue, 19 Apr 2016 04:02:01 +0000 (21:02 -0700)]
Fix IME adjust when stack focus changes while IME is visible
- Use two values to animate divider width adjustment separately
from stack position adjustment. For example IME is visible
with focus on bottom stack, then user clicks top stack. In this
case bottom stack position should go back to unadjusted, but
divider should remain thinner.
- If we need to start a new animation during an existing animation,
start the motion from where the existing animation left off, so
that it doesn't look discontinuous.
- Do not adjust if IME is not actually focused on any stack. This
could happen when swiping down the status bar.
bug:
28175599
Change-Id: I802def5d1c13ebe11094eb28fc5a0b0c309e4d76
Philip P. Moltmann [Wed, 20 Apr 2016 18:53:57 +0000 (11:53 -0700)]
Prevent printing from finishing activity.
Bug:
27861927
Change-Id: I00177ca0ec75cc8f7fd422907a2b5827b5db406b
Mitchell Wills [Wed, 20 Apr 2016 18:53:58 +0000 (18:53 +0000)]
Update scan and last network info in the WorkThread
am:
cf0875a
* commit '
cf0875a9b69da9da5e16563eca33609e775d9195':
Update scan and last network info in the WorkThread
Change-Id: I0b59f1eaa9bad27b300477f31fb88fb8e2eacb38
Lifu Tang [Wed, 20 Apr 2016 18:48:16 +0000 (11:48 -0700)]
Fixed bug in upgrading GpsMeasurement
Bug:
28278410
Change-Id: I936e257d68c348654d6031eb3e8f6d63b28d5e0a
Trevor Johns [Wed, 20 Apr 2016 18:43:55 +0000 (18:43 +0000)]
Merge changes from topic \'merge_docs_nyc-dev\' into nyc-dev
am:
59c9a93
* commit '
59c9a93fc268e226495d4ee8cf7c507c2ea2c433':
Remove links to createAndInitializeUser() and createUser()
Resolve merge conflicts of
a5060ee to nyc-dev
Change-Id: I3ce213d0e7412125861d39f1726be4b5a751c828
Robert Carr [Wed, 20 Apr 2016 18:37:28 +0000 (18:37 +0000)]
Merge "When restacking IM windows preserve relative order." into nyc-dev
am:
db973df
* commit '
db973df830c32af8e2aeff256053299409f65dfd':
When restacking IM windows preserve relative order.
Change-Id: I83209e07dc6f65285ba2a67dd9393e520908219b
Robert Carr [Wed, 20 Apr 2016 18:37:27 +0000 (18:37 +0000)]
Merge "Respect WRAP_CONTENT when resolving drop down position." into nyc-dev
am:
5a2554a
* commit '
5a2554a8544525953c0847a1d3c975413eb07986':
Respect WRAP_CONTENT when resolving drop down position.
Change-Id: Ie466c526c84d26caddc5577f231e58738733d983
Christopher Tate [Wed, 20 Apr 2016 18:37:20 +0000 (11:37 -0700)]
resolve merge conflicts of
5e380f0 to lmp-mr1-ub-dev
Change-Id: Ie8d3c154f4c98bb1c2a1954ff1dabc8f5bc20b71
Trevor Johns [Wed, 20 Apr 2016 18:35:54 +0000 (18:35 +0000)]
Merge changes from topic 'merge_docs_nyc-dev' into nyc-dev
* changes:
Remove links to createAndInitializeUser() and createUser()
Resolve merge conflicts of
a5060ee to nyc-dev