Commit Graph

242995 Commits

Author SHA1 Message Date
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
Keisuke Kuroyanagi
36d1296cf4 Merge "Adjust divider when IME height is changed." into nyc-dev 2016-05-13 01:46:10 +00:00
TreeHugger Robot
d5c94d1af3 Merge "Partial fix for jumping freeform windows" into nyc-dev 2016-05-13 01:21:12 +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
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
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
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
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
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
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 Chung
2b8dcdeda4 Merge "Workaround for empty recents, defer the enter animation." into nyc-dev 2016-05-12 23:23:15 +00:00
Winson Chung
723bca4f58 Merge "Fixing flashing when animation the launch task." into nyc-dev 2016-05-12 23:23:07 +00:00
Winson Chung
caedd41a6a Merge "Fixing issue with excluded task showing when docking." into nyc-dev 2016-05-12 23:22:55 +00:00
Yigit Boyar
4c6eeb67a2 Merge "Respect add focusables flags" into nyc-dev 2016-05-12 23:19:22 +00:00
Cheryl Potter
a23a2c7de6 docs: Add Emulator Console authentication feature am: baa20c572c -s ours am: f8ec668262 am: f0e6b1ae83
am: a32ad7464d

* commit 'a32ad7464d85b6db2f070e7154c92facef99b4ea':
  docs: Add Emulator Console authentication feature

Change-Id: I2817d6974c0d2fc105ce787d0bbae92e147cf704
2016-05-12 23:17:58 +00:00
Cheryl Potter
a32ad7464d docs: Add Emulator Console authentication feature am: baa20c572c -s ours am: f8ec668262
am: f0e6b1ae83

* commit 'f0e6b1ae83bf62b54864c9ddf63d7a76e17dc122':
  docs: Add Emulator Console authentication feature

Change-Id: I81aa710f3e502cdc9c0de211d21e338f5ca5edd7
2016-05-12 23:15:36 +00:00
Cheryl Potter
f0e6b1ae83 docs: Add Emulator Console authentication feature am: baa20c572c -s ours
am: f8ec668262

* commit 'f8ec6682627d1e1d00df60a975451412f558e787':
  docs: Add Emulator Console authentication feature

Change-Id: I326c71760e0f64d328125218f5a63f891dc66269
2016-05-12 23:13:12 +00:00
Cheryl Potter
f8ec668262 docs: Add Emulator Console authentication feature
am: baa20c572c  -s ours

* commit 'baa20c572cffec2b508e5d0cd4194e39303441ae':
  docs: Add Emulator Console authentication feature

Change-Id: I758620f266d31157ab304147818c3c996498402d
2016-05-12 23:10:46 +00:00
Kevin Hufnagle
aa1b7dd5a1 cherrypick from mnc-io-docs docs: Updated APK Signature Scheme v2 doc
This CL is a continuation of CL 1025444.

Bug: 28143514
Change-Id: I43feb2fec6c9d57d6ebb35a388ecaea3a713876e
Original-Change-Id: I00164a740bcc19b5ba08b517023cca11f4373680
2016-05-12 16:05:39 -07:00
Chong Zhang
32de365bd8 Fix replacing window timeouts
Do not post app token with the timeout message, instead put the token
in a list and post empty message only.

bug: 28744782
Change-Id: If809d8ee16bcc31067f25ae5696b62d09ea4b864
2016-05-12 16:01:53 -07:00
Chen Xu
8fde916de8 Merge "disable wifi only mode from wfc setting for nyc" into nyc-dev 2016-05-12 22:57:40 +00:00
Cheryl Potter
baa20c572c docs: Add Emulator Console authentication feature
Change-Id: I77c36a71a208714443e09b10caf5e35141afca95
2016-05-12 15:18:45 -07:00
Yigit Boyar
4c6e983000 Respect add focusables flags
This CL fixes 2 bugs in View's addFocusables implementations.

1) addFocusables(list, dir) method was always returning focusables in
touch mode even if the device is not in touch mode.

2) addFocusables(list, dir, mode) was not respecting the provided mod.

Bug: 28745577
Change-Id: I9b9e5af27f8f5b1bb3cc601584fdad7c73e54a5d
2016-05-12 15:11:13 -07:00
smain@google.com
647058d499 Merge "missed another old link" into mnc-mr-docs am: 4e0de0df78 am: 9535aa73bf
am: e1a71fdd67

* commit 'e1a71fdd67a6eb0aa370be09b0bb33a166549024':
  missed another old link

Change-Id: Ic456f5624f31cce4f3bea2d3b938c9ab4ceec87a
2016-05-12 22:04:21 +00:00
Scott Main
e1a71fdd67 Merge "missed another old link" into mnc-mr-docs am: 4e0de0df78
am: 9535aa73bf

* commit '9535aa73bfa0b92f5e7b1610cca98f0dc33e2894':
  missed another old link

Change-Id: Ife2b4f674610ae48e1c126c42e498ecc7f27bece
2016-05-12 22:02:01 +00:00
smain@google.com
9535aa73bf Merge "missed another old link" into mnc-mr-docs
am: 4e0de0df78

* commit '4e0de0df78499ea83a2c31942a31dee9226960e6':
  missed another old link

Change-Id: I382e852fed3d004ea9ea18cb00a47f0895f02b3f
2016-05-12 21:59:34 +00:00
Philip Cuadra
b41088b4df Merge "Pinner service for pinning files into memory" into nyc-dev 2016-05-12 21:55:29 +00:00
Scott Main
4e0de0df78 Merge "missed another old link" into mnc-mr-docs 2016-05-12 21:51:15 +00:00
Jesse Hall
7f0708390b Merge "Move Vulkan layer path setup to ApplicationLoaders" into nyc-dev 2016-05-12 21:13:26 +00:00
TreeHugger Robot
2e35847a8f Merge "fix filter for listeners that are not the rocket" into nyc-dev 2016-05-12 21:05:37 +00:00
Adrian Roos
11c8f5315b Merge "DPM control for remote input when locked" into nyc-dev 2016-05-12 20:52:26 +00:00
fionaxu
dcf5c2b8e2 disable wifi only mode from wfc setting for nyc
Bug: 28691529
Change-Id: I78a5606b213628148218cb5e9db63192a15384d7
2016-05-12 13:40:05 -07:00
Dirk Dougherty
8d18eefe50 Update billions page related links. am: d66be4dcd0 am: 6ad1f133e3 am: 49bc081039
am: aa50ecd967

* commit 'aa50ecd9677d7f18d77c39d9e3a5220b8242323a':
  Update billions page related links.

Change-Id: I538d3883c11f4a4b6a83047c66419c18b4595c3e
2016-05-12 20:38:36 +00:00
Liz Yepsen
4d50987762 Merge commit \'20fde769affa8ff76251814004b22efa9bb76e71\' into manualmerge am: dbaf613dea am: 5660e4ed82
am: f6661535ab

* commit 'f6661535ab2f518932f03854992c8192bae8460d':
  docs: added "billions" doc in Distribute>Essentials

Change-Id: Ic88bb38f3867663b97d56061882b25049d10295d
2016-05-12 20:36:02 +00:00
Dirk Dougherty
aa50ecd967 Update billions page related links. am: d66be4dcd0 am: 6ad1f133e3
am: 49bc081039

* commit '49bc081039c24d49bf1644b76bd876ad7e889050':
  Update billions page related links.

Change-Id: Ib902f3a1cf63199223138c51b9b2cd6ef26bbbfa
2016-05-12 20:35:57 +00:00
Dirk Dougherty
f6661535ab Merge commit \'20fde769affa8ff76251814004b22efa9bb76e71\' into manualmerge am: dbaf613dea
am: 5660e4ed82

* commit '5660e4ed82031b69165a6faf1e61b5ced48547e3':
  docs: added "billions" doc in Distribute>Essentials

Change-Id: I92aa93777cdfe722dc2fc9c6da86ff24961b1560
2016-05-12 20:33:41 +00:00
Dirk Dougherty
49bc081039 Update billions page related links. am: d66be4dcd0
am: 6ad1f133e3

* commit '6ad1f133e3ad1782fcbb7be3b0536f5cedecad63':
  Update billions page related links.

Change-Id: I2a5617fcbe6d9a0d1de5a3b794f960924e835bb2
2016-05-12 20:33:38 +00:00
Dirk Dougherty
6ad1f133e3 Update billions page related links.
am: d66be4dcd0

* commit 'd66be4dcd02f3367d34833fb15d55b796ae24373':
  Update billions page related links.

Change-Id: I9af79689486ebfb079fcd1aad48882a1ee7217aa
2016-05-12 20:31:09 +00:00