Commit Graph

246497 Commits

Author SHA1 Message Date
Jim Miller
54c4374b4a Merge "Fix bug where fingerprint for wrong userId was attempted to be removed." into nyc-dev 2016-04-20 21:33:15 +00:00
Oren Blasberg
23e282d297 Accommodate NaN in new context menu methods.
Bug: 28296401
Change-Id: I0ae6067e1ae01c342c1b39d6f64db5dcd02492d5
2016-04-20 14:28:39 -07:00
Vladislav Kaznacheev
377c32845b Rename DropPermissions to DragAndDropPermissions
Bug: 28296057
Change-Id: Ic95cb4ae9c351d903df78628e983dec2bacd0ad5
2016-04-20 14:22:23 -07:00
Phil Burk
a0d18fe934 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
2016-04-20 21:22:12 +00:00
Fyodor Kupolov
e2cd2496a9 Merge "Test coverage for new FBE functionality" into nyc-dev
am: 366a457

* commit '366a457b6da6caf3d376a8ef0be6a386aee5c216':
  Test coverage for new FBE functionality

Change-Id: I53c16de6aa812565137092a4b060daf9c915fe85
2016-04-20 21:22:11 +00:00
Phil Burk
2faac0d741 Merge "MidiDevice: do not open ports on closed device" into nyc-dev 2016-04-20 21:15:33 +00:00
Fyodor Kupolov
366a457b6d Merge "Test coverage for new FBE functionality" into nyc-dev 2016-04-20 21:13:41 +00:00
Cheryl Potter
d0ebf7002f docs: Small edits to Vector Asset Studio Support Library support
b/28199128

Change-Id: I2682b4ccbad513c9b345e0662dab8cb67e75ddfa
2016-04-20 14:10:46 -07:00
Robert Carr
13678ee74e Respect manually set HARDWARE_ACCELERATED flag.
When choosing what window parameters to pass on
to child windows, we need to respect the manually set
FLAG_HARDWARE_ACCELERATED from Window.setFlags() in
addition to the activity manifest value, and the value
from setWindowManager. Given that we pass the value
on to child windows from when setWindowManager is called,
I think it makes sense to pass it when setFlags is
called.

Bug: 27099358
Bug: 23036374
Change-Id: Ie018841aadd270910fe0f8bc5a5ddca3bfbee69b
2016-04-20 14:09:55 -07:00
Ruchi Kandoi
904303190b 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
2016-04-20 21:08:05 +00:00
Shubham Ajmera
e2135ff6d3 Merge "Track libcore change e2270147c6ddfb164776b68295078a5e6c6dfee7" into nyc-dev
am: f3d5a4d

* commit 'f3d5a4dd60b3ec461e4d9fee97ce99a92cb29b1b':
  Track libcore change e2270147c6ddfb164776b68295078a5e6c6dfee7

Change-Id: I296d2c4a5700ac7fb882d2b02d434796cd6527df
2016-04-20 21:00:49 +00:00
Chong Zhang
35e13681e9 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
2016-04-20 21:00:46 +00:00
Ruchi Kandoi
0fea8ad447 Merge "Revert "PowerManager: Adds the Sustained performance API."" into nyc-dev 2016-04-20 20:59:20 +00:00
Adrian Roos
5389a1778d 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
2016-04-20 13:58:33 -07:00
Shubham Ajmera
f3d5a4dd60 Merge "Track libcore change e2270147c6ddfb164776b68295078a5e6c6dfee7" into nyc-dev 2016-04-20 20:52:58 +00:00
Chong Zhang
3966fb942c Merge "Fix IME adjust when stack focus changes while IME is visible" into nyc-dev 2016-04-20 20:52:08 +00:00
Fan Zhang
b6060a3fbc Merge "Allow fragments set their own header view below actionbar." into nyc-mr1-dev 2016-04-20 20:50:17 +00:00
Ruchi Kandoi
9c36c02f0e Revert "PowerManager: Adds the Sustained performance API."
This reverts commit 0abc001275.

Bug: 28150358
Change-Id: I99c71b3d6641310a33e898d6fd475d37c79ba9d0
Signed-off-by: Ruchi Kandoi <kandoiruchi@google.com>
2016-04-20 20:49:18 +00:00
Ruchi Kandoi
75da7b4ad0 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
2016-04-20 20:42:25 +00:00
Philip P. Moltmann
b99876416c Print API for N: Fix docs and change interfaces as requested.
Fixes: 28291443
Change-Id: I1a1585796032351a739d54171bd67ccc76f0f08a
2016-04-20 13:42:18 -07:00
Alan Viverette
a1863cf033 API review feedback for ProgressBar
Bug: 28296059
Change-Id: Icb9cfdc799391735a497b16290fa780dddd76e36
2016-04-20 16:41:17 -04:00
Adam Lesinski
3477927db4 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
2016-04-20 13:36:19 -07:00
Ruchi Kandoi
a645c9753f Merge "window: Adds a Sustained Performance Mode window flag." into nyc-dev 2016-04-20 20:35:21 +00:00
Jim Miller
8f2aca0ee4 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
2016-04-20 13:34:11 -07:00
Christopher Tate
825b713469 resolve merge conflicts of 44e07e0 to mnc-dev
Change-Id: Ibc446c82a3d1446ccd81630743f82d1fd58fbd47
2016-04-20 13:33:41 -07:00
Julia Reynolds
4b006a8490 Volume updates should appear continuous when changed by touch.
Bug: 28276425
Change-Id: I7a724f8c21748c6be325053a20a22716a0ee8ce3
2016-04-20 16:16:36 -04:00
Daniel Nishi
7dae434ba4 Add a branded VPN icon for quick settings and status bar.
If a system VPN app specifies in its meta-data that it should use the system's
branded VPN icon instead of the standard one, the Quick Settings footer and
status bar show it instead.

Bug 27146125

Change-Id: I3cfe4dda156d9147bdb339ba6bce82c72ca7393d
(cherry picked from commit 3956639122)
2016-04-20 20:16:12 +00:00
Phil Weaver
698c96dbd2 Fix a11y key event handling from multiple devices.
For M, we ignored device type entirely, but with ag/760625 we started
paying attention to it, which rejects events when keys from different
devices are pressed simultaneously. Since the volume keys show up as
different devices, the new behavior disrupted the event stream when
both volume keys were pressed.

Now tracking each device separately, which restores the old behavior
but still takes the device id into account. Holding down two keys
when enabling an accessibility service, however, always has and still
can produce an invalid event stream. It doesn't seem worth the
overhead, however, to track each key separately.

Bug: 28091773
Change-Id: I8d30de1f5e05f779b6fe305856d42f209ff8b038
2016-04-20 13:08:35 -07:00
Ruben Brunk
5356c871ac 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
2016-04-20 19:57:37 +00:00
Robert Carr
744e6e3aef 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
2016-04-20 12:56:56 -07:00
Ruben Brunk
6ada702993 Merge "Add settings for altering VR display behavior." into nyc-dev 2016-04-20 19:51:51 +00:00
Nathan Harold
98a40d3ca6 Additional checks for ModemActivityInfo.isValid()
Added checks in isValid for:
-A non-empty report
-Valid individual TxTime values
-Valid RxTime
-Valid EnergyUsed

Bug: 28278425
Bug: 28247832
Change-Id: I294fc200e81c828fbdd0e92b9ac4ae96fd7db6dc
2016-04-20 12:41:32 -07:00
Daniel Yu
cf35d40c3d Merge "docs: Fixing various minor issues" into mnc-mr-docs
am: 9780f94

* commit '9780f94dacd39cdc95919c8f313249d720e26bdf':
  docs: Fixing various minor issues

Change-Id: Ibec6838b6e6e8cf8e8d9be372c07e9678587a47d
2016-04-20 19:37:35 +00:00
destradaa
be80c9bb5a 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
2016-04-20 19:30:51 +00:00
Phil Burk
01ab4d62d9 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>
2016-04-20 12:30:42 -07:00
Dan Yu
9780f94dac Merge "docs: Fixing various minor issues" into mnc-mr-docs 2016-04-20 19:29:54 +00:00
Dongwon Kang
2a5f69b8c8 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
2016-04-20 19:24:24 +00:00
Daniel Estrada Alva
fdb26b90cb Merge "Add support for multiple callback registration in." into nyc-dev 2016-04-20 19:22:10 +00:00
Lifu Tang
8b7ad976bf Added defensive code to prevent system crash
Bug: 26940611
Change-Id: I8226d1acb42ccc7d2cd910e30b47c7c63c9f490b
2016-04-20 12:21:23 -07:00
Dongwon Kang
4a6bd4b48f Merge "TIF: Do not build input list for background user" into nyc-dev 2016-04-20 19:19:34 +00:00
Julia Reynolds
87ea43b890 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
2016-04-20 19:14:36 +00:00
Julia Reynolds
f825573e01 Merge "Animate volume dialog expansion/contraction." into nyc-dev
am: e86ac2f

* commit 'e86ac2f0da9ec71e9d990291053eec8f352af52d':
  Animate volume dialog expansion/contraction.

Change-Id: I7c08343c0400ca34031b5908adfee71f80adf5c9
2016-04-20 19:14:35 +00:00
Julia Reynolds
1ff2412cc4 Merge "Align radio buttons with app icon, change text color." into nyc-dev 2016-04-20 19:10:12 +00:00
Julia Reynolds
e86ac2f0da Merge "Animate volume dialog expansion/contraction." into nyc-dev 2016-04-20 19:07:13 +00:00
Robert Carr
69016e3472 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
2016-04-20 12:05:26 -07:00
Julia Reynolds
682d73fb3a Align radio buttons with app icon, change text color.
Bug: 27597108
Change-Id: Id821b46b6f2898295ae711ec33f56fed1b529584
2016-04-20 15:04:49 -04:00
Felipe Leme
01c93c476a 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
2016-04-20 19:04:41 +00:00
Mitchell Wills
ef2bf66598 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
2016-04-20 19:04:40 +00:00
Andreas Gampe
6ce2774179 Merge "Frameworks/base: Add holder to BaseBundle" into nyc-dev
am: 58f2072

* commit '58f20726e99947a0f2781b5d4be3052be6eb94dd':
  Frameworks/base: Add holder to BaseBundle

Change-Id: I46e5f350f8b862132d97b375e8a170e21dc70d31
2016-04-20 19:04:38 +00:00
TreeHugger Robot
0304688882 Merge "Only try to add details to zip once." into nyc-dev 2016-04-20 19:03:02 +00:00