240581 Commits

Author SHA1 Message Date
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
Ruchi Kandoi
9c36c02f0e Revert "PowerManager: Adds the Sustained performance API."
This reverts commit 0abc001275d6cf0af4990f521ccff7346a7cd2bf.

Bug: 28150358
Change-Id: I99c71b3d6641310a33e898d6fd475d37c79ba9d0
Signed-off-by: Ruchi Kandoi <kandoiruchi@google.com>
2016-04-20 20:49:18 +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
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
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
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
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
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
TreeHugger Robot
0304688882 Merge "Only try to add details to zip once." into nyc-dev 2016-04-20 19:03:02 +00:00
Mitchell Wills
de629c7ac7 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
2016-04-20 19:01:51 +00:00
Julia Reynolds
e80f67545d Animate volume dialog expansion/contraction.
Bug: 28275874
Change-Id: I751addeb73e7354d3a2018be1ba08bf9b8378b95
2016-04-20 14:58:47 -04:00
Andreas Gampe
58f20726e9 Merge "Frameworks/base: Add holder to BaseBundle" into nyc-dev 2016-04-20 18:58:32 +00:00
Mitchell Wills
2dbac6cee5 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
2016-04-20 18:57:29 +00:00
Chong Zhang
f347ab5edd 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
2016-04-20 11:55:58 -07:00
Philip P. Moltmann
c863489e67 Prevent printing from finishing activity.
Bug: 27861927
Change-Id: I00177ca0ec75cc8f7fd422907a2b5827b5db406b
2016-04-20 11:54:00 -07:00
Mitchell Wills
c441faa6de 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
2016-04-20 18:53:58 +00:00
Lifu Tang
8ad4430c57 Fixed bug in upgrading GpsMeasurement
Bug: 28278410
Change-Id: I936e257d68c348654d6031eb3e8f6d63b28d5e0a
2016-04-20 11:48:16 -07:00
Christopher Tate
44e07e07a1 resolve merge conflicts of 5e380f0 to lmp-mr1-ub-dev
Change-Id: Ie8d3c154f4c98bb1c2a1954ff1dabc8f5bc20b71
2016-04-20 11:37:20 -07:00
Trevor Johns
59c9a93fc2 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
2016-04-20 18:35:57 +00:00
Rob Carr
db973df830 Merge "When restacking IM windows preserve relative order." into nyc-dev 2016-04-20 18:30:42 +00:00
Rob Carr
5a2554a854 Merge "Respect WRAP_CONTENT when resolving drop down position." into nyc-dev 2016-04-20 18:30:16 +00:00
Yi Kong
8c205b5a2d Merge "Track libcore change be1608980825868eb1c70fab6eb86fe06bd304ce" into nyc-dev 2016-04-20 18:04:47 +00:00
Sudheer Shanka
df9ecfc587 Merge "Add restrictedSwitchSummary attribute to restricted switch preferences." into nyc-dev 2016-04-20 18:04:14 +00:00
Jae Seo
801d4161dd Merge "ExifInterface: Fix a bug to return only a JPEG-compressed thumbnail" into nyc-dev 2016-04-20 17:50:52 +00:00
Sudheer Shanka
205d10bb13 Merge "Fix additional summary of RestrictedSwitchPreference." into nyc-dev 2016-04-20 17:50:20 +00:00
Jason Monk
eeaaf26805 Merge "Daydream -> screen saver" into nyc-dev 2016-04-20 17:48:48 +00:00
Fyodor Kupolov
390802b6d3 Test coverage for new FBE functionality
Added testRemovedAccountSync, which removes account when the user is locked,
and verifies that syncDeCeAccountsLocked works as expected.

Added testPreNDatabaseMigration to test that pre-N database with existing
data is properly upgraded and migrated.

Bug: 26279712
Change-Id: I3846c626f616b1c4830965c9f0cb27fa32ce6f54
2016-04-20 10:47:58 -07:00
TreeHugger Robot
9724fba835 Merge "Added onRestrictBackgroundWhitelistChanged callback." into nyc-dev 2016-04-20 17:44:56 +00:00
Jason Monk
427aa24be2 Daydream -> screen saver
Change-Id: I604530a721797e6d4b28df3782303a79fabcdac7
Fixes: 28268243
2016-04-20 13:44:05 -04:00
Mitchell Wills
cf0875a9b6 Update scan and last network info in the WorkThread
This prevents a race condition where mLastInfo is updated while
processing scan results causing a crash.

Change-Id: Ic5147f3851f218c0f697e4ebb324f1cb63d02665
Fixes: 27944510
2016-04-20 10:34:24 -07:00
Jason Monk
10ea519fa9 Merge "Allow QS details to scroll when the screen is really small" into nyc-dev 2016-04-20 17:34:19 +00:00
Jason Monk
c4f80d217e Allow QS details to scroll when the screen is really small
Change-Id: Ib28b6e9d888e864741c3ac472d30ef7cae06fe67
Fixes: 27276984
2016-04-20 13:30:11 -04:00
Felipe Leme
51a4ede593 Only try to add details to zip once.
When the user enters details (title or description) to the bugreport,
Shell tries to add a title.txt (and/or description.txt) to the zip and
uses 2 instance variables (addedDetailsToZip and addingDetailsToZip) to
control its state.

The problem with the current approach is that if there is a failure
adding the entries (for example, if the entries already exist), these
variables are not updated and hence when the user taps Share, it will
try to add the entries again, which most likely would fail.

BUG: 28291423
Change-Id: I56a71256be4f8de15f8126b815334277319e8e8a
2016-04-20 10:25:12 -07:00
Vladislav Kaznacheev
c8df6aa42f Merge "Send ACTION_DRAG_EXITED when the pointer moves over a non-touchable window" into nyc-dev 2016-04-20 17:11:21 +00:00