OSDN Git Service
David Friedman [Fri, 13 May 2016 02:42:58 +0000 (02:42 +0000)]
Merge "docs: Continue CL of notifications updates" into mnc-io-docs am:
272db39ad8
am:
87ec2a1348
* commit '
87ec2a13488163b8ed51493a8f4b30165272c847':
docs: Continue CL of notifications updates
Change-Id: I8fb81d096b30c4bb5ac52c1bad3a883492acc45c
Dirk Dougherty [Fri, 13 May 2016 02:40:25 +0000 (02:40 +0000)]
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
Eric Schmidt [Fri, 13 May 2016 02:40:20 +0000 (02:40 +0000)]
Merge "docs: Continue CL of notifications updates" into mnc-io-docs
am:
272db39ad8
* commit '
272db39ad8909d78562cc520aef9e75d501e79d7':
docs: Continue CL of notifications updates
Change-Id: I9c06da55a3172f70f92f35fad4e889da049dba17
Dirk Dougherty [Fri, 13 May 2016 02:37:18 +0000 (02:37 +0000)]
Merge "Add metadata for tools videos." into mnc-mr-docs am:
96762b8500
am:
0ec5620717
* commit '
0ec5620717dec4ca0a4cf66e30567867df98b2d4':
Add metadata for tools videos.
Change-Id: I71219fac0af88663cf1a5d270d7533016b8b866e
David Friedman [Fri, 13 May 2016 02:36:39 +0000 (02:36 +0000)]
Merge "docs: Continue CL of notifications updates" into mnc-io-docs
Dirk Dougherty [Fri, 13 May 2016 02:34:52 +0000 (02:34 +0000)]
Merge "Add metadata for tools videos." into mnc-mr-docs
am:
96762b8500
* commit '
96762b8500166d931bbb8d5e6193c841540bdec8':
Add metadata for tools videos.
Change-Id: I5b79243c49a5fba1637223dee0bfc7dfad5f9eea
Dirk Dougherty [Fri, 13 May 2016 02:30:49 +0000 (02:30 +0000)]
Merge "Add metadata for tools videos." into mnc-mr-docs
Chong Zhang [Fri, 13 May 2016 01:58:51 +0000 (01:58 +0000)]
Merge "Fix a flicker when window is removed during entering animation" into nyc-dev
Keisuke Kuroyanagi [Fri, 13 May 2016 01:46:09 +0000 (01:46 +0000)]
Merge "Adjust divider when IME height is changed." into nyc-dev
Eric Schmidt [Fri, 13 May 2016 01:33:25 +0000 (18:33 -0700)]
docs: Continue CL of notifications updates
Bug:
28520914
Change-Id: If0bbd5c503e4149fcd8f1db34fe7847a6cbefd20
TreeHugger Robot [Fri, 13 May 2016 01:21:11 +0000 (01:21 +0000)]
Merge "Partial fix for jumping freeform windows" into nyc-dev
TreeHugger Robot [Fri, 13 May 2016 01:12:51 +0000 (01:12 +0000)]
Merge "ContentValues: improve documentation" into nyc-dev
TreeHugger Robot [Fri, 13 May 2016 01:08:51 +0000 (01:08 +0000)]
Merge "Fix documentation bug in SQLiteDatabase" into nyc-dev
Kevin Hufnagle [Fri, 13 May 2016 01:02:36 +0000 (01:02 +0000)]
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
Kevin Hufnagle [Fri, 13 May 2016 00:59:40 +0000 (00:59 +0000)]
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
Kevin Hufnagle [Fri, 13 May 2016 00:56:27 +0000 (00:56 +0000)]
Merge "cherrypick from mnc-io-docs docs: Updated APK Signature Scheme v2 doc" into mnc-io-docs
Android Build Merger (Role) [Fri, 13 May 2016 00:54:18 +0000 (00:54 +0000)]
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
Adarsh Fernando [Fri, 13 May 2016 00:53:53 +0000 (00:53 +0000)]
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
Android Build Merger (Role) [Fri, 13 May 2016 00:52:14 +0000 (00:52 +0000)]
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
Adarsh Fernando [Fri, 13 May 2016 00:51:49 +0000 (00:51 +0000)]
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
Seigo Nonaka [Fri, 13 May 2016 00:50:20 +0000 (00:50 +0000)]
Merge "Fix incorrect inheritance from TextAppearance to Widget." into nyc-dev
Adarsh Fernando [Fri, 13 May 2016 00:49:26 +0000 (00:49 +0000)]
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
Adarsh Fernando [Fri, 13 May 2016 00:43:25 +0000 (00:43 +0000)]
Merge "Docs: Added new Whitelist feature to Data Saver for DP3 (Part 2)" into mnc-io-docs
Adarsh Fernando [Thu, 12 May 2016 22:18:14 +0000 (15:18 -0700)]
Docs: Added new Whitelist feature to Data Saver for DP3 (Part 2)
Bug:
28447739
Change-Id: Ibdbf0bd315fc228b076c5b91061bcb8080de96d3
Chong Zhang [Wed, 4 May 2016 22:08:18 +0000 (15:08 -0700)]
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
Vladislav Kaznacheev [Thu, 12 May 2016 19:56:31 +0000 (12:56 -0700)]
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
Steve Pomeroy [Thu, 14 Mar 2013 04:42:10 +0000 (00:42 -0400)]
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
8fc3144fa5d9fe3a6c7fb6de80cb34d5cafabc05)
Change-Id: I89e56428e612d667259744e2bc3df124e5a2aa0e
Steve Pomeroy [Tue, 9 Oct 2012 19:37:34 +0000 (15:37 -0400)]
ContentValues: improve documentation
Correct and clarify the documentation for ContentValues.
Signed-off-by: Steve Pomeroy <steve@staticfree.info>
(cherry picked from commit
1276b5f29ed6f889e9691cf296fd9911958895c1)
Change-Id: Id6f4e93dcca64dd41daeb4066d804ff173f4747b
Keisuke Kuroyanagi [Thu, 12 May 2016 23:49:02 +0000 (16:49 -0700)]
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
Chong Zhang [Thu, 12 May 2016 23:48:35 +0000 (23:48 +0000)]
Merge "Fix replacing window timeouts" into nyc-dev
Winson Chung [Thu, 12 May 2016 23:23:14 +0000 (23:23 +0000)]
Merge "Workaround for empty recents, defer the enter animation." into nyc-dev
Winson Chung [Thu, 12 May 2016 23:23:06 +0000 (23:23 +0000)]
Merge "Fixing flashing when animation the launch task." into nyc-dev
Winson Chung [Thu, 12 May 2016 23:22:54 +0000 (23:22 +0000)]
Merge "Fixing issue with excluded task showing when docking." into nyc-dev
Yigit Boyar [Thu, 12 May 2016 23:19:21 +0000 (23:19 +0000)]
Merge "Respect add focusables flags" into nyc-dev
Cheryl Potter [Thu, 12 May 2016 23:17:58 +0000 (23:17 +0000)]
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
Cheryl Potter [Thu, 12 May 2016 23:15:36 +0000 (23:15 +0000)]
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
Cheryl Potter [Thu, 12 May 2016 23:13:12 +0000 (23:13 +0000)]
docs: Add Emulator Console authentication feature am:
baa20c572c -s ours
am:
f8ec668262
* commit '
f8ec6682627d1e1d00df60a975451412f558e787':
docs: Add Emulator Console authentication feature
Change-Id: I326c71760e0f64d328125218f5a63f891dc66269
Cheryl Potter [Thu, 12 May 2016 23:10:46 +0000 (23:10 +0000)]
docs: Add Emulator Console authentication feature
am:
baa20c572c -s ours
* commit '
baa20c572cffec2b508e5d0cd4194e39303441ae':
docs: Add Emulator Console authentication feature
Change-Id: I758620f266d31157ab304147818c3c996498402d
Kevin Hufnagle [Thu, 12 May 2016 00:38:45 +0000 (17:38 -0700)]
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
Chong Zhang [Thu, 12 May 2016 23:00:01 +0000 (16:00 -0700)]
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
Chen Xu [Thu, 12 May 2016 22:57:39 +0000 (22:57 +0000)]
Merge "disable wifi only mode from wfc setting for nyc" into nyc-dev
Cheryl Potter [Thu, 12 May 2016 21:27:00 +0000 (14:27 -0700)]
docs: Add Emulator Console authentication feature
Change-Id: I77c36a71a208714443e09b10caf5e35141afca95
Yigit Boyar [Thu, 12 May 2016 22:11:13 +0000 (15:11 -0700)]
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
smain@google.com [Thu, 12 May 2016 22:04:21 +0000 (22:04 +0000)]
Merge "missed another old link" into mnc-mr-docs am:
4e0de0df78 am:
9535aa73bf
am:
e1a71fdd67
* commit '
e1a71fdd67a6eb0aa370be09b0bb33a166549024':
missed another old link
Change-Id: Ic456f5624f31cce4f3bea2d3b938c9ab4ceec87a
Scott Main [Thu, 12 May 2016 22:02:01 +0000 (22:02 +0000)]
Merge "missed another old link" into mnc-mr-docs am:
4e0de0df78
am:
9535aa73bf
* commit '
9535aa73bfa0b92f5e7b1610cca98f0dc33e2894':
missed another old link
Change-Id: Ife2b4f674610ae48e1c126c42e498ecc7f27bece
smain@google.com [Thu, 12 May 2016 21:59:34 +0000 (21:59 +0000)]
Merge "missed another old link" into mnc-mr-docs
am:
4e0de0df78
* commit '
4e0de0df78499ea83a2c31942a31dee9226960e6':
missed another old link
Change-Id: I382e852fed3d004ea9ea18cb00a47f0895f02b3f
Philip Cuadra [Thu, 12 May 2016 21:55:28 +0000 (21:55 +0000)]
Merge "Pinner service for pinning files into memory" into nyc-dev
Scott Main [Thu, 12 May 2016 21:51:14 +0000 (21:51 +0000)]
Merge "missed another old link" into mnc-mr-docs
Jesse Hall [Thu, 12 May 2016 21:13:25 +0000 (21:13 +0000)]
Merge "Move Vulkan layer path setup to ApplicationLoaders" into nyc-dev
TreeHugger Robot [Thu, 12 May 2016 21:05:36 +0000 (21:05 +0000)]
Merge "fix filter for listeners that are not the rocket" into nyc-dev
Adrian Roos [Thu, 12 May 2016 20:52:24 +0000 (20:52 +0000)]
Merge "DPM control for remote input when locked" into nyc-dev
Dirk Dougherty [Thu, 12 May 2016 20:46:38 +0000 (13:46 -0700)]
Add metadata for tools videos.
Change-Id: I6f439f9bf9cf026a2a1b69648690ccc069c9d533
fionaxu [Thu, 12 May 2016 20:40:05 +0000 (13:40 -0700)]
disable wifi only mode from wfc setting for nyc
Bug:
28691529
Change-Id: I78a5606b213628148218cb5e9db63192a15384d7
Dirk Dougherty [Thu, 12 May 2016 20:38:36 +0000 (20:38 +0000)]
Update billions page related links. am:
d66be4dcd0 am:
6ad1f133e3 am:
49bc081039
am:
aa50ecd967
* commit '
aa50ecd9677d7f18d77c39d9e3a5220b8242323a':
Update billions page related links.
Change-Id: I538d3883c11f4a4b6a83047c66419c18b4595c3e
Liz Yepsen [Thu, 12 May 2016 20:36:02 +0000 (20:36 +0000)]
Merge commit \'
20fde769affa8ff76251814004b22efa9bb76e71\' into manualmerge am:
dbaf613dea am:
5660e4ed82
am:
f6661535ab
* commit '
f6661535ab2f518932f03854992c8192bae8460d':
docs: added "billions" doc in Distribute>Essentials
Change-Id: Ic88bb38f3867663b97d56061882b25049d10295d
Dirk Dougherty [Thu, 12 May 2016 20:35:57 +0000 (20:35 +0000)]
Update billions page related links. am:
d66be4dcd0 am:
6ad1f133e3
am:
49bc081039
* commit '
49bc081039c24d49bf1644b76bd876ad7e889050':
Update billions page related links.
Change-Id: Ib902f3a1cf63199223138c51b9b2cd6ef26bbbfa
Dirk Dougherty [Thu, 12 May 2016 20:33:41 +0000 (20:33 +0000)]
Merge commit \'
20fde769affa8ff76251814004b22efa9bb76e71\' into manualmerge am:
dbaf613dea
am:
5660e4ed82
* commit '
5660e4ed82031b69165a6faf1e61b5ced48547e3':
docs: added "billions" doc in Distribute>Essentials
Change-Id: I92aa93777cdfe722dc2fc9c6da86ff24961b1560
Dirk Dougherty [Thu, 12 May 2016 20:33:38 +0000 (20:33 +0000)]
Update billions page related links. am:
d66be4dcd0
am:
6ad1f133e3
* commit '
6ad1f133e3ad1782fcbb7be3b0536f5cedecad63':
Update billions page related links.
Change-Id: I2a5617fcbe6d9a0d1de5a3b794f960924e835bb2
Dirk Dougherty [Thu, 12 May 2016 20:31:09 +0000 (20:31 +0000)]
Update billions page related links.
am:
d66be4dcd0
* commit '
d66be4dcd02f3367d34833fb15d55b796ae24373':
Update billions page related links.
Change-Id: I9af79689486ebfb079fcd1aad48882a1ee7217aa
Liz Yepsen [Thu, 12 May 2016 20:31:09 +0000 (20:31 +0000)]
Merge commit \'
20fde769affa8ff76251814004b22efa9bb76e71\' into manualmerge
am:
dbaf613dea
* commit '
dbaf613dea013caca62629bdc808ef50e4ebc7c1':
docs: added "billions" doc in Distribute>Essentials
Change-Id: I53574e17fb29a96c074e3653a06d4ee4d6bb7677
Dirk Dougherty [Thu, 12 May 2016 20:25:50 +0000 (13:25 -0700)]
Merge commit '
20fde769affa8ff76251814004b22efa9bb76e71' into manualmerge
Change-Id: I412660ce82c8ffd9e51899ddf0b8776d7294afaa
Philip Cuadra [Thu, 28 Apr 2016 22:26:49 +0000 (15:26 -0700)]
Pinner service for pinning files into memory
Pin key files into memory to prevent having to fetch from flash
after boot. Improves system performance by preventing page cache
thrash. Retrieves files from a device-specific overlay to allow
specialization.
bug
28251566
Change-Id: I8532f52bd70271794dd7576976d13a524849ce7b
smain@google.com [Thu, 12 May 2016 19:55:51 +0000 (12:55 -0700)]
missed another old link
Change-Id: I9f618e674a566b50fa2635a6e6cd2f00e53a27dd
Svetoslav Ganov [Thu, 12 May 2016 19:51:57 +0000 (19:51 +0000)]
Merge "Persist settings on a dedicated background thread" into nyc-dev
smain@google.com [Thu, 12 May 2016 19:48:41 +0000 (19:48 +0000)]
fix studio download links am:
17aabff6e0 am:
740d47f46f
am:
c878bcef1f
* commit '
c878bcef1f71c241473dcf59762155cc3e133fb4':
fix studio download links
Change-Id: Iad2d9da633014b138e090f152bdad9b4e6546441
smain@google.com [Thu, 12 May 2016 19:45:48 +0000 (19:45 +0000)]
fix studio download links am:
17aabff6e0
am:
740d47f46f
* commit '
740d47f46f65ced23f402e4cba6ea1e80501de61':
fix studio download links
Change-Id: I509f17ce4a0106b540a6d443d8a41d13976a094d
smain@google.com [Thu, 12 May 2016 19:42:19 +0000 (19:42 +0000)]
fix studio download links
am:
17aabff6e0
* commit '
17aabff6e0926415fd4e4521c88362ba97edfccb':
fix studio download links
Change-Id: Idc4c1bf1345cb9104ee43996c89bfd458868ef85
TreeHugger Robot [Thu, 12 May 2016 19:35:24 +0000 (19:35 +0000)]
Merge "Don't notify windows of resize during PIP animation." into nyc-dev
smain@google.com [Thu, 12 May 2016 19:34:30 +0000 (19:34 +0000)]
Merge "update banner to 2.1 and remove yellow" into mnc-mr-docs am:
7eac6f1289 am:
55aff78cfd
am:
b4c50e1235
* commit '
b4c50e123542b268ec3ff7ef64514557a1cf3701':
update banner to 2.1 and remove yellow
Change-Id: I10428534b0b4825e1b03818e682472525d5089a0
smain@google.com [Thu, 12 May 2016 19:32:42 +0000 (12:32 -0700)]
fix studio download links
Change-Id: I22f65c704ff94de58f0b0100a614107c08fde649
Scott Main [Thu, 12 May 2016 19:31:55 +0000 (19:31 +0000)]
Merge "update banner to 2.1 and remove yellow" into mnc-mr-docs am:
7eac6f1289
am:
55aff78cfd
* commit '
55aff78cfd2f60f938eae7f1564d3ccd5c2c9c84':
update banner to 2.1 and remove yellow
Change-Id: I5aa38003db9207bfc40f353cda6d86070c311520
smain@google.com [Thu, 12 May 2016 19:29:20 +0000 (19:29 +0000)]
Merge "update banner to 2.1 and remove yellow" into mnc-mr-docs
am:
7eac6f1289
* commit '
7eac6f1289052a0845de2fb6cd760d0c2d9b5da0':
update banner to 2.1 and remove yellow
Change-Id: I343bca6044cc7362d9337b7cddc3da2ab3676dc6
Scott Main [Thu, 12 May 2016 19:25:08 +0000 (19:25 +0000)]
Merge "update banner to 2.1 and remove yellow" into mnc-mr-docs
smain@google.com [Thu, 12 May 2016 19:23:20 +0000 (12:23 -0700)]
update banner to 2.1 and remove yellow
Change-Id: I27c5e046804bbfb79640fe544ff1f07d777c853d
Selim Cinek [Thu, 12 May 2016 19:09:58 +0000 (19:09 +0000)]
Merge "Fixed a crash when dumping groupmanager" into nyc-dev
Dirk Dougherty [Thu, 12 May 2016 19:04:14 +0000 (12:04 -0700)]
Update billions page related links.
Change-Id: I92585c1410b93000c13b567717905f3b3b24f923
TreeHugger Robot [Thu, 12 May 2016 18:57:57 +0000 (18:57 +0000)]
Merge "Fix surfaceInset adjustment." into nyc-dev
Chris Wren [Thu, 12 May 2016 17:21:08 +0000 (13:21 -0400)]
fix filter for listeners that are not the rocket
Bug:
28664037
Change-Id: Id1e4b243ed7423dbd2d4a8ead829cba9b20f30cd
Andrew Solovay [Thu, 12 May 2016 18:48:50 +0000 (18:48 +0000)]
Merge "docs: Noted that custom permissions must be unique per-device" into mnc-mr-docs am:
9be023f077 am:
76f95f5571
am:
dc4cd59183
* commit '
dc4cd59183fec0d5dc5661e6015f856f66d65ce9':
docs: Noted that custom permissions must be unique per-device
Change-Id: Ieaef597484008d63ce1660f89d50c8cd1515f9ed
Andrew Solovay [Thu, 12 May 2016 18:46:17 +0000 (18:46 +0000)]
Merge "docs: Noted that custom permissions must be unique per-device" into mnc-mr-docs am:
9be023f077
am:
76f95f5571
* commit '
76f95f557129a583a52b8d7c896510fc3e2e02e8':
docs: Noted that custom permissions must be unique per-device
Change-Id: I16fb362316afee6e6a4565184ef1c9798e1530be
Andrew Solovay [Thu, 12 May 2016 18:43:34 +0000 (18:43 +0000)]
Merge "docs: Noted that custom permissions must be unique per-device" into mnc-mr-docs
am:
9be023f077
* commit '
9be023f0772359137f7b4d933add43de2db1aaa0':
docs: Noted that custom permissions must be unique per-device
Change-Id: I3af5d87f77b5b40c2c7dd7c099f3c62fe4649d28
TreeHugger Robot [Thu, 12 May 2016 18:41:22 +0000 (18:41 +0000)]
Merge "docs: Noted that custom permissions must be unique per-device" into mnc-mr-docs
Jason Monk [Thu, 12 May 2016 18:34:42 +0000 (18:34 +0000)]
Merge "Update demo mode time" into nyc-dev
Robert Carr [Wed, 11 May 2016 21:57:36 +0000 (14:57 -0700)]
Don't notify windows of resize during PIP animation.
We are notifying windows of resize as the frame moves (even though the
size does not change) during the pinned animation, confusing and
upsetting the client. We do want to notify it of the one resize
at the beginning or end of the animation, so we can't just block
reportResized on bounds animating. Luckily the other area that adds
windows to reportResized (Task) is smart enough to only do so if the
size has actually changed and not just movement, so we let those reports
go through and block ones initiating from here (which doesn't perform
a check that the size has actually changed).
Bug:
28559097
Change-Id: If1f983e7cc875175ce1d098c385478a9922dea67
Selim Cinek [Thu, 12 May 2016 18:24:07 +0000 (11:24 -0700)]
Fixed a crash when dumping groupmanager
Change-Id: Id5ffb9e61c1a17d5bd7d8f58024bf84c0fbb6781
Fixes:
28706404
Jason Monk [Thu, 12 May 2016 18:05:18 +0000 (14:05 -0400)]
Update demo mode time
Change-Id: I50885c719ee06cb3fa8c3dda4fe5909efe1cb3e9
Fixes:
28740808
Phil Weaver [Thu, 12 May 2016 18:00:54 +0000 (18:00 +0000)]
Merge "Don't disrupt a11y state when user is unlocked." into nyc-dev
Liz Yepsen [Mon, 9 May 2016 18:50:12 +0000 (20:50 +0200)]
docs: added "billions" doc in Distribute>Essentials
Adding building for billions guide to Distribute>Essentials section
covering content on building for low-bandwidth and low-cost.
Bug:
27643355
Change-Id: Icb5089fe5528265f4e00b9b9e390a6743c691549
(cherry picked from commit
a9884af1e630645b88589c2885f042afb333cfef)
Android Build Merger (Role) [Thu, 12 May 2016 17:14:09 +0000 (17:14 +0000)]
Merge "Merge "Adding the sdk_vars centralized file back to fix the ndk download page links" into mnc-mr-docs am:
77e85d32d6 am:
220f09fb4f am:
9b22357c09" into nyc-dev
Amanda Kassay [Thu, 12 May 2016 17:13:47 +0000 (17:13 +0000)]
Merge "Adding the sdk_vars centralized file back to fix the ndk download page links" into mnc-mr-docs am:
77e85d32d6 am:
220f09fb4f
am:
9b22357c09
* commit '
9b22357c098963fb791ee86434b31fab0d8523d2':
Adding the sdk_vars centralized file back to fix the ndk download page links
Change-Id: I69362b0be69702e2be57873254ef6d4599dc16c6
Tingting Wang [Thu, 12 May 2016 17:11:42 +0000 (17:11 +0000)]
Merge "Rename CONTACT_METADATA_SYNC GService Flag." into nyc-dev
Amanda Kassay [Thu, 12 May 2016 17:11:10 +0000 (17:11 +0000)]
Merge "Adding the sdk_vars centralized file back to fix the ndk download page links" into mnc-mr-docs am:
77e85d32d6
am:
220f09fb4f
* commit '
220f09fb4f6509bec1c344dda542fe3fd04cd997':
Adding the sdk_vars centralized file back to fix the ndk download page links
Change-Id: I92dc8597a28eacf4d3766ee08473d56ab0e2c006
Amanda Kassay [Thu, 12 May 2016 17:08:38 +0000 (17:08 +0000)]
Merge "Adding the sdk_vars centralized file back to fix the ndk download page links" into mnc-mr-docs
am:
77e85d32d6
* commit '
77e85d32d61ce3f0e356a789b8d2dcd907913c1b':
Adding the sdk_vars centralized file back to fix the ndk download page links
Change-Id: Ib9d0ef5df501970bbca82b6ee59fb8e4c1959df0
Amanda Kassay [Thu, 12 May 2016 17:05:59 +0000 (17:05 +0000)]
Merge "Adding the sdk_vars centralized file back to fix the ndk download page links" into mnc-mr-docs
Amanda Kassay [Thu, 12 May 2016 17:02:54 +0000 (13:02 -0400)]
Adding the sdk_vars centralized file back to fix the ndk download page links
Change-Id: I9ef88f8b4dc64dd5260de54d8fbf4555bf630ffc
smain@google.com [Thu, 12 May 2016 16:36:13 +0000 (16:36 +0000)]
replace tools videos with latest reto studio videos. am:
b69830f76c am:
685953ae53
am:
55272f0f5e
* commit '
55272f0f5e695c4936af368d2774a3f78108ff56':
replace tools videos with latest reto studio videos.
Change-Id: I76751d738039f95559393471a33f17a45772749a
smain@google.com [Thu, 12 May 2016 16:33:32 +0000 (16:33 +0000)]
replace tools videos with latest reto studio videos. am:
b69830f76c
am:
685953ae53
* commit '
685953ae53b74007ec2049e0b01a9ad5bb3e9d1b':
replace tools videos with latest reto studio videos.
Change-Id: Ib2532713d29fe7e35765fb7d70fd4521caf3f6c6
Makoto Onuki [Thu, 12 May 2016 16:32:55 +0000 (16:32 +0000)]
Merge "Remove ShortcutManager" into nyc-dev
smain@google.com [Thu, 12 May 2016 16:30:58 +0000 (16:30 +0000)]
replace tools videos with latest reto studio videos.
am:
b69830f76c
* commit '
b69830f76ce3cc4660b6547e3bdeda3ba508d727':
replace tools videos with latest reto studio videos.
Change-Id: I697251519e2afebbb240e81782f325d801c3f428
smain@google.com [Thu, 12 May 2016 16:23:31 +0000 (09:23 -0700)]
replace tools videos with latest reto studio videos.
Change-Id: I7953a6834969251533b38f0a8dd67e0d91fede7e
OSDN Git Service
