Commit Graph

246497 Commits

Author SHA1 Message Date
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
Trevor Johns
254f1b8a43 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
2016-04-20 18:43:55 +00:00
Robert Carr
ab344b84e2 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
2016-04-20 18:37:28 +00:00
Robert Carr
bf2a2fafaf 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
2016-04-20 18:37:27 +00: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
b752ef7725 Merge "Track libcore change be1608980825868eb1c70fab6eb86fe06bd304ce" into nyc-dev
am: 8c205b5

* commit '8c205b5a2d3b138dc95648188dd15a1abd7dd81e':
  Track libcore change be1608980825868eb1c70fab6eb86fe06bd304ce

Change-Id: Ia0872d3863c03250d36cb9f5369ce54ca125dce1
2016-04-20 18:13:19 +00:00
Sudheer Shanka
ecbf20f31d Merge "Add restrictedSwitchSummary attribute to restricted switch preferences." into nyc-dev
am: df9ecfc

* commit 'df9ecfc587615edc80c6bf96e67d7dc4d510e03f':
  Add restrictedSwitchSummary attribute to restricted switch preferences.

Change-Id: Ie74b078ccf945cba8d702080d5195e77a2be987d
2016-04-20 18:13:17 +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
Daniel Yu
ff091e1708 docs: Fixing various minor issues
Fixes to minor issues (typos and other things that don't require
editorial review) in Android docs.

Staged page URLs provided in CL comments.

Bug: 28172346
Bug: 22411462
Bug: 26422744
Bug: 26776224
Change-Id: Ic3aa8495a1d76a5ce3bccb5037b4172443664d0b
2016-04-20 11:00:37 -07:00
Insun Kang
ee1134a89f Merge "ExifInterface: Fix a bug to return only a JPEG-compressed thumbnail" into nyc-dev
am: 801d416

* commit '801d4161dd9e872bec73d855d21d030ba39a8b91':
  ExifInterface: Fix a bug to return only a JPEG-compressed thumbnail

Change-Id: I149ab7790af6442ce3f1437465723fd331718ef2
2016-04-20 17:59:32 +00:00
Sudheer Shanka
f6f61fc891 Merge "Fix additional summary of RestrictedSwitchPreference." into nyc-dev
am: 205d10b

* commit '205d10bb136e36a17662fb1e60b0e002ca1f7158':
  Fix additional summary of RestrictedSwitchPreference.

Change-Id: I8c16ff47a743a17f31c2db1f88c810aba74823d2
2016-04-20 17:59:31 +00:00
Jason Monk
dbc5727bcd Merge "Daydream -> screen saver" into nyc-dev
am: eeaaf26

* commit 'eeaaf26805091cad0404bc6030dde38dd4b1edcc':
  Daydream -> screen saver

Change-Id: I090caed428e1137a4ecfe628abb1c2974c99c225
2016-04-20 17:52:58 +00:00
Felipe Leme
0627850430 Merge "Added onRestrictBackgroundWhitelistChanged callback." into nyc-dev
am: 9724fba

* commit '9724fba83545fd075cbda62bb13cdc7820c7291a':
  Added onRestrictBackgroundWhitelistChanged callback.

Change-Id: Ic8fdb634babafd5625be2a7c684334cca1cf0a3a
2016-04-20 17:52:57 +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
Kevin Hufnagle
ee3411d94b Merge "docs: [Revert] Improved description of "package" attribute (manifest)." into mnc-mr-docs
am: fa8847d

* commit 'fa8847d09465046e4723f8e90bb54b6dea8b6290':
  docs: [Revert] Improved description of "package" attribute (manifest).

Change-Id: Ia71899b627968610d6b8c738a6281986b2133c14
2016-04-20 17:38:50 +00:00
Jason Monk
96282fb962 Merge "Allow QS details to scroll when the screen is really small" into nyc-dev
am: 10ea519

* commit '10ea519fa9dc31721dcf5974f423797cbbf8c80d':
  Allow QS details to scroll when the screen is really small

Change-Id: Ic4b2d01b78ede96bf0bee394c61670953d8403ba
2016-04-20 17:38:50 +00: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
Kevin Hufnagle
fa8847d094 Merge "docs: [Revert] Improved description of "package" attribute (manifest)." into mnc-mr-docs 2016-04-20 17:29:27 +00:00
Fan Zhang
7163d77108 Allow fragments set their own header view below actionbar.
Bug: 27751187
Bug: 28269035
Change-Id: Iac081c009800a71afe413cf63ddd9788b2e90d6a
(cherry picked from commit ff2e0f4be8)
2016-04-20 17:25:58 +00: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
64577d61f5 Merge "Send ACTION_DRAG_EXITED when the pointer moves over a non-touchable window" into nyc-dev
am: c8df6aa

* commit 'c8df6aa42facbe0cf7c05e4db78ec4a4e224b78b':
  Send ACTION_DRAG_EXITED when the pointer moves over a non-touchable window

Change-Id: I001979d4151a8e2b9e71c471a8aa51c0165d3b40
2016-04-20 17:16:11 +00:00
Jason Monk
518eb44104 Merge "QS tile lifecycle management" into nyc-dev
am: e59bbb0

* commit 'e59bbb0899e17710e9380b704141b100ddc2faa0':
  QS tile lifecycle management

Change-Id: I739df683b36689dbc58c784c6aa9447e28139ef5
2016-04-20 17:16:10 +00: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
Jason Monk
e59bbb0899 Merge "QS tile lifecycle management" into nyc-dev 2016-04-20 17:09:01 +00:00
Keith Cheung
54f7d9bfaf Include work app in battery optimization settings
Fix: 23684151

Change-Id: I857b90ecee726f9a3d0d67eed944c8fffc668b2e
2016-04-20 18:02:10 +01:00
Ruchi Kandoi
43e38de253 window: Adds a Sustained Performance Mode window flag.
Adds setSustainedPerformanceMode(boolean) API for applications to set
the mode for a given window. The mode will be disabled automatically when the
window is no longer in focus.

Bug: 28150358
Change-Id: Ibe8bc564eeaaccbcaad5c4f792cda16da931dffd
Signed-off-by: Ruchi Kandoi <kandoiruchi@google.com>
2016-04-20 09:57:11 -07:00
Yang Ni
87ae73951f Merge "Made Element accessors thread-safe" into nyc-dev
am: c74d2a8

* commit 'c74d2a8b8795bb0679225afcdd4d446c29440d85':
  Made Element accessors thread-safe

Change-Id: I0fabd87d166015c0a6593709a32891296e2ade46
2016-04-20 16:52:41 +00:00
Dongwon Kang
a897e5f5e3 TIF: Do not build input list for background user
Building input list for background user leads to unnecessary connection
request to hardware input and that causes incomplete service state.

Bug: 27407198
Change-Id: Id8d5d5001394781edd2dafe8681c674855332ae3
2016-04-20 09:52:30 -07:00
Cheryl Potter
6e095303c1 docs: Remove banned deep link term from release notes b/28153615
am: 0489fe9

* commit '0489fe96ce81df129b73c1025482b54e373ed44d':
  docs: Remove banned deep link term from release notes b/28153615

Change-Id: Ic05034b2a3599defb5f78ceefedff9deb256ff8b
2016-04-20 16:45:53 +00:00
Yang Ni
c74d2a8b87 Merge "Made Element accessors thread-safe" into nyc-dev 2016-04-20 16:44:39 +00:00
Phil Weaver
e7da35f5a7 Merge "Clear calling identity when binding a11y services" into nyc-dev
am: b72c306

* commit 'b72c30653dc9652d9c6beba979e5ea194c1a4638':
  Clear calling identity when binding a11y services

Change-Id: I0bb94ebc66098ca173f3b46e1ebdc87aad937b3f
2016-04-20 16:39:50 +00:00
Phil Weaver
b72c30653d Merge "Clear calling identity when binding a11y services" into nyc-dev 2016-04-20 16:33:28 +00:00