Commit Graph

246497 Commits

Author SHA1 Message Date
Dirk Dougherty
dc82bef346 Merge "Add metadata for tools videos." into mnc-mr-docs am: 96762b8500 am: 0ec5620717 am: fc05721530
am: ccfda4ecd8

* commit 'ccfda4ecd8623a2560d907293be0ba5451d07852':
  Add metadata for tools videos.

Change-Id: If852ad08e00321c09461d7a62fbae4befc75bba1
2016-05-13 02:42:52 +00:00
Eric Schmidt
fd9dca7783 Merge "docs: Continue CL of emoji section in api-overview" into mnc-io-docs
am: 16d7c71365

* commit '16d7c713656a0b4b98d15d29bc845ffe6b3dfe79':
  docs: Continue CL of emoji section in api-overview

Change-Id: I822c82db9d385325e754a93054cc9878880e6590
2016-05-13 02:42:50 +00:00
Dirk Dougherty
ccfda4ecd8 Merge "Add metadata for tools videos." into mnc-mr-docs am: 96762b8500 am: 0ec5620717
am: fc05721530

* commit 'fc05721530dcaa532e58b188624bb51d0024032c':
  Add metadata for tools videos.

Change-Id: I39bd537935258fab40ed38804c3233c6f124b91b
2016-05-13 02:40:25 +00:00
Eric Schmidt
87ec2a1348 Merge "docs: Continue CL of notifications updates" into mnc-io-docs
am: 272db39ad8

* commit '272db39ad8909d78562cc520aef9e75d501e79d7':
  docs: Continue CL of notifications updates

Change-Id: I9c06da55a3172f70f92f35fad4e889da049dba17
2016-05-13 02:40:20 +00:00
David Friedman
16d7c71365 Merge "docs: Continue CL of emoji section in api-overview" into mnc-io-docs 2016-05-13 02:37:39 +00:00
Dirk Dougherty
fc05721530 Merge "Add metadata for tools videos." into mnc-mr-docs am: 96762b8500
am: 0ec5620717

* commit '0ec5620717dec4ca0a4cf66e30567867df98b2d4':
  Add metadata for tools videos.

Change-Id: I71219fac0af88663cf1a5d270d7533016b8b866e
2016-05-13 02:37:18 +00:00
David Friedman
272db39ad8 Merge "docs: Continue CL of notifications updates" into mnc-io-docs 2016-05-13 02:36:40 +00:00
Dirk Dougherty
0ec5620717 Merge "Add metadata for tools videos." into mnc-mr-docs
am: 96762b8500

* commit '96762b8500166d931bbb8d5e6193c841540bdec8':
  Add metadata for tools videos.

Change-Id: I5b79243c49a5fba1637223dee0bfc7dfad5f9eea
2016-05-13 02:34:52 +00:00
Dirk Dougherty
96762b8500 Merge "Add metadata for tools videos." into mnc-mr-docs 2016-05-13 02:30:51 +00:00
Chong Zhang
9bee287409 Merge "Fix a flicker when window is removed during entering animation" into nyc-dev
am: a285fdeb16

* commit 'a285fdeb160e822a2e1fe2fb6bd80ce91afcf181':
  Fix a flicker when window is removed during entering animation

Change-Id: I3d09de9be00d4181587dc0d1ef8a66aa1f7ebb3b
2016-05-13 02:03:48 +00:00
Chong Zhang
a285fdeb16 Merge "Fix a flicker when window is removed during entering animation" into nyc-dev 2016-05-13 01:58:52 +00:00
Eric Schmidt
700127aecf docs: Continue CL of emoji section in api-overview
Bug: 27920740
Change-Id: I069dcdad67ab91c6085bdf52b1a0af6833afbd11
2016-05-13 01:54:23 +00:00
Keisuke Kuroyanagi
3320857109 Merge "Adjust divider when IME height is changed." into nyc-dev
am: 36d1296cf4

* commit '36d1296cf4f074599015b424161402f9b07da8ab':
  Adjust divider when IME height is changed.

Change-Id: Ib8051875be06b0e394107c40eae79cee26917331
2016-05-13 01:53:59 +00:00
Keisuke Kuroyanagi
36d1296cf4 Merge "Adjust divider when IME height is changed." into nyc-dev 2016-05-13 01:46:10 +00:00
Eric Schmidt
c563e0b99b docs: Continue CL of notifications updates
Bug: 28520914
Change-Id: If0bbd5c503e4149fcd8f1db34fe7847a6cbefd20
2016-05-12 18:33:25 -07:00
Vladislav Kaznacheev
9e13b1f218 Merge "Partial fix for jumping freeform windows" into nyc-dev
am: d5c94d1af3

* commit 'd5c94d1af3c042fa373d0864c07387a3d2125a08':
  Partial fix for jumping freeform windows

Change-Id: Ifdff3f152787fb6c8739fddf1767d0ce3e4b0e26
2016-05-13 01:25:52 +00:00
Fyodor Kupolov
c30808b413 Added scheduleWritePackageListLocked
Call scheduleWritePackageRestrictionsLocked and
scheduleWritePackageListLocked when a new user is created.

Bug: 28750034
Change-Id: I442551855e2eece7a1610750c6802a785bfb2fb5
2016-05-12 18:24:09 -07:00
Wale Ogunwale
29bfbb878d Fixed some issues with fullscreen dimming
- Always dim home stack and task fullscreen. The home stack could be
in split-screen mode, but we still want to dim dialogs that are
associated with the stack or task in fullscreen. The dialogs are not
really activities, but they are associated with the home stack for
things like dimming. Don't ask me why...
- Update the fullscreen dim layer bounds anytime the dim layer is
adjusted so we always have up-to-date bounds after rotation.

Bug: 28575624
Change-Id: I805c771153a2d25fb199bd9987bbf78a5967f6b9
2016-05-12 18:23:16 -07:00
TreeHugger Robot
d5c94d1af3 Merge "Partial fix for jumping freeform windows" into nyc-dev 2016-05-13 01:21:12 +00:00
Steve Pomeroy
4c8c470015 Merge "ContentValues: improve documentation" into nyc-dev
am: 33d0ff9959

* commit '33d0ff995976533f9989cd6ec95c3de5ba9aee05':
  ContentValues: improve documentation

Change-Id: I29244d0c039abcd08139e2814bb465e2e5b9e03a
2016-05-13 01:17:57 +00:00
Steve Pomeroy
115f43cda7 Merge "Fix documentation bug in SQLiteDatabase" into nyc-dev
am: d07a3c4203

* commit 'd07a3c42034b35a0474619f9395a9d97abc83069':
  Fix documentation bug in SQLiteDatabase

Change-Id: I6df7ab83572b128672af473941c487ac20f5d077
2016-05-13 01:17:54 +00:00
TreeHugger Robot
33d0ff9959 Merge "ContentValues: improve documentation" into nyc-dev 2016-05-13 01:12:52 +00:00
TreeHugger Robot
d07a3c4203 Merge "Fix documentation bug in SQLiteDatabase" into nyc-dev 2016-05-13 01:08:52 +00:00
Kevin Hufnagle
95a5be52c9 Merge "cherrypick from mnc-io-docs docs: Updated APK Signature Scheme v2 doc" into mnc-io-docs am: 458b991356 am: e328025835
am: 70a4bcff70

* commit '70a4bcff70ba303944869a93d1c2304a3eeed722':
  cherrypick from mnc-io-docs docs: Updated APK Signature Scheme v2 doc

Change-Id: I9992db97b77556604ba55f035ec7c3c699215c0a
2016-05-13 01:05:12 +00:00
Kevin Hufnagle
70a4bcff70 Merge "cherrypick from mnc-io-docs docs: Updated APK Signature Scheme v2 doc" into mnc-io-docs am: 458b991356
am: e328025835

* commit 'e32802583591d10f9bb8687a6e00b6f3484ecbdd':
  cherrypick from mnc-io-docs docs: Updated APK Signature Scheme v2 doc

Change-Id: If775ca04c0922f586b42d870fe9bc3b7c1312ca6
2016-05-13 01:02:36 +00:00
Kevin Hufnagle
e328025835 Merge "cherrypick from mnc-io-docs docs: Updated APK Signature Scheme v2 doc" into mnc-io-docs
am: 458b991356

* commit '458b99135671cbb3d49f9e71e35e1cf5926b7d2c':
  cherrypick from mnc-io-docs docs: Updated APK Signature Scheme v2 doc

Change-Id: I50b1383c264433677297023d378a2f622bd873b7
2016-05-13 00:59:40 +00:00
Adarsh Fernando
5c076442c2 Merge "Merge "Docs: Added new Whitelist feature to Data Saver for DP3 (Part 2)" into mnc-io-docs am: d5ef1ef028 am: ac5dc2f581" into nyc-dev
am: ff970a7644

* commit 'ff970a7644b28669e4cac8f9ee1fd49e0cd8af0b':

Change-Id: I147920b8123d428d5b484314912ad56ee0359e33
2016-05-13 00:56:55 +00:00
Adarsh Fernando
60bdda4a88 Merge "Merge "Docs: Added new Whitelist feature to Data Saver for DP3 (Part 2)" into mnc-io-docs am: d5ef1ef028 am: ac5dc2f581" into nyc-dev
am: 16464db17c

* commit '16464db17cee130e936a176a7e9e8905afd497df':
  Docs: Added new Whitelist feature to Data Saver for DP3 (Part 2)

Change-Id: I9b266e60f60c4014dbf9e2e0f62f267a27512be5
2016-05-13 00:56:51 +00:00
Kevin Hufnagle
458b991356 Merge "cherrypick from mnc-io-docs docs: Updated APK Signature Scheme v2 doc" into mnc-io-docs 2016-05-13 00:56:29 +00:00
Chris Craik
36ce80d530 Fix Skia filter behavior test
Fixes: 28751534

Change-Id: Ie5e2ee946b21702539fc0cc7358d0f9550e7d095
2016-05-12 17:55:47 -07:00
Android Build Merger (Role)
ff970a7644 Merge "Merge "Docs: Added new Whitelist feature to Data Saver for DP3 (Part 2)" into mnc-io-docs am: d5ef1ef028 am: ac5dc2f581" into nyc-dev 2016-05-13 00:54:21 +00:00
Seigo Nonaka
04250248b9 Merge "Fix incorrect inheritance from TextAppearance to Widget." into nyc-dev
am: 614c83d977

* commit '614c83d9777b68b304e0fac6ac19e39a4d49d016':
  Fix incorrect inheritance from TextAppearance to Widget.

Change-Id: Ifdce3f9fa8d3be08b7de6c5afb2d1a74b0437188
2016-05-13 00:54:04 +00:00
Adarsh Fernando
b7a43d77c2 Merge "Docs: Added new Whitelist feature to Data Saver for DP3 (Part 2)" into mnc-io-docs am: d5ef1ef028
am: ac5dc2f581

* commit 'ac5dc2f581b84affcd25a4d405cb8036b92a3797':
  Docs: Added new Whitelist feature to Data Saver for DP3 (Part 2)

Change-Id: Ia729337de141ebb48e39d54edcafff207bb9f974
2016-05-13 00:53:53 +00:00
Android Build Merger (Role)
16464db17c Merge "Merge "Docs: Added new Whitelist feature to Data Saver for DP3 (Part 2)" into mnc-io-docs am: d5ef1ef028 am: ac5dc2f581" into nyc-dev 2016-05-13 00:52:15 +00:00
Adarsh Fernando
76c6921614 Merge "Docs: Added new Whitelist feature to Data Saver for DP3 (Part 2)" into mnc-io-docs am: d5ef1ef028
am: ac5dc2f581

* commit 'ac5dc2f581b84affcd25a4d405cb8036b92a3797':
  Docs: Added new Whitelist feature to Data Saver for DP3 (Part 2)

Change-Id: I5924aee920021fbbdb3792c87d719f393ce2a27b
2016-05-13 00:51:49 +00:00
Seigo Nonaka
614c83d977 Merge "Fix incorrect inheritance from TextAppearance to Widget." into nyc-dev 2016-05-13 00:50:21 +00:00
Adarsh Fernando
ac5dc2f581 Merge "Docs: Added new Whitelist feature to Data Saver for DP3 (Part 2)" into mnc-io-docs
am: d5ef1ef028

* commit 'd5ef1ef028d5d7e529746206aa72f4cd65edd55b':
  Docs: Added new Whitelist feature to Data Saver for DP3 (Part 2)

Change-Id: Ic32c9e030b2a287bba161716f67788e740b78433
2016-05-13 00:49:26 +00:00
Adarsh Fernando
d5ef1ef028 Merge "Docs: Added new Whitelist feature to Data Saver for DP3 (Part 2)" into mnc-io-docs 2016-05-13 00:43:26 +00:00
Adarsh Fernando
b1386a73ac Docs: Added new Whitelist feature to Data Saver for DP3 (Part 2)
Bug: 28447739
Change-Id: Ibdbf0bd315fc228b076c5b91061bcb8080de96d3
2016-05-12 17:10:41 -07:00
Damien Bargiacchi
2d92eeb496 Start the Wear Time System Service with SystemServer
Bug: 27802041
Change-Id: I7071536934e2285e8978e9c0d0a53d5d3c1c3017
2016-05-12 17:03:07 -07:00
Damien Bargiacchi
9748086fe2 Check clock accuracy before attempting to display clock
The RTC may not be set yet, may have been reset, or may have drifted
significantly if the device time hasn't been updated in a long time.

Using the the last_time_change file to determine if the time is known to
be accurate and only display the clock when that is the case.

Bug: 27802041
Change-Id: I845cf9c74fcb4009504f1bab853e04146fa19e1d
2016-05-12 17:01:59 -07:00
Chenjie Luo
e370b538eb Add null pointer check in removeConnection
Bug: 28607777
Change-Id: I199ed75740796540d243ad9f507ab2511c9ed3c1
2016-05-12 17:00:27 -07:00
Chong Zhang
8e4bda9e0f Fix a flicker when window is removed during entering animation
When animation is started with saved surfaces, app may decide to
remove one of the child windows during early animation and replace
it with a new window. This causes the app below (usually Recents)
to show through for one or more frames.

If we started animation early with a window, delay removal of
that window until the app is allDrawn in the "traditional sense"
(i.e. allDrawn without using any saved surfaces).

bug: 28742353
Change-Id: I4ef663a947b737aae96c3ccfe13a9f4c1d0567f0
2016-05-12 16:58:01 -07:00
Vladislav Kaznacheev
cb4bbd7af8 Partial fix for jumping freeform windows
Currently every focus change causes a freeform window to jump
for a few frames. The size of the jump is equal to the difference
in inset size (which is derived directly from the window elevation).

This problem goes away for most real use cases if the insets are
not allowed to decrease.

Bug: 28318973
Bug: 22668382
Change-Id: I77ca440a7d9c89cc4d45e6667bf37da94a5c8a9a
2016-05-12 23:56:32 +00:00
Chong Zhang
1624d76664 Merge "Fix replacing window timeouts" into nyc-dev
am: a63e1325b5

* commit 'a63e1325b595d84dea7d33cb2e2c149acb326204':
  Fix replacing window timeouts

Change-Id: I78463da8421ae1a039b0b22f2e44739e3199f166
2016-05-12 23:55:47 +00:00
Steve Pomeroy
c240b607f7 Fix documentation bug in SQLiteDatabase
The documentation incorrectly states that, "[insertWithOnConflict
returns] the primary key of the existing row if the input param
'conflictAlgorithm' = CONFLICT_IGNORE". Unfortunately, SQLite does
not provide such functionality.

Close: https://code.google.com/p/android/issues/detail?id=13045

Signed-off-by: Steve Pomeroy <steve@staticfree.info>

(cherry picked from commit 8fc3144fa5)

Change-Id: I89e56428e612d667259744e2bc3df124e5a2aa0e
2016-05-12 16:53:10 -07:00
Steve Pomeroy
b31b1cc5ff ContentValues: improve documentation
Correct and clarify the documentation for ContentValues.

Signed-off-by: Steve Pomeroy <steve@staticfree.info>

(cherry picked from commit 1276b5f29e)

Change-Id: Id6f4e93dcca64dd41daeb4066d804ff173f4747b
2016-05-12 16:51:52 -07:00
Keisuke Kuroyanagi
19d9a8f476 Adjust divider when IME height is changed.
Previously, divider was adjusted for IME when IME window visibility is
changed. However, IME size can be changed without changing IME window
visibility. For example, when hardware keyboard key is pressed to show
emoji layout.
This CL checks if IME height has been changed and adjust divider position
properly.

Bug: 28389933
Change-Id: I9a561bd4796a0513c8b5c493884946883f160907
2016-05-12 16:49:02 -07:00
Chong Zhang
a63e1325b5 Merge "Fix replacing window timeouts" into nyc-dev 2016-05-12 23:48:36 +00:00
Winson
b781537aa1 Merge "Workaround for empty recents, defer the enter animation." into nyc-dev
am: 2b8dcdeda4

* commit '2b8dcdeda484c3ed92969420a19ba48c2f877c81':
  Workaround for empty recents, defer the enter animation.

Change-Id: Ie4b9c468c4b42a42cbbf0eb9892f074f771c6ea0
2016-05-12 23:33:30 +00:00