Commit Graph

263453 Commits

Author SHA1 Message Date
Andrew Solovay
45368cd044 Merge \\"docs: Updating N Preview \\"behavior changes\\" doc for DP5\\" into nyc-dev am: 9d3bc86207
am: 72022a691a

Change-Id: I4c85652bbc4d67507c419b5362341e993f932866
2016-07-16 00:41:33 +00:00
Andrew Solovay
72022a691a Merge \"docs: Updating N Preview \"behavior changes\" doc for DP5\" into nyc-dev
am: 9d3bc86207

Change-Id: Iede90cc135476ea34b82f49c464a14eba9d60a31
2016-07-16 00:35:41 +00:00
Android Build Merger (Role)
f00bbba326 Merge "Merge \\"docs: Updating N Preview \\"API Overview\\" doc for DP5\\" into nyc-dev am: 833722e049 am: f5f50cfc7a" into nyc-mr1-dev-plus-aosp 2016-07-16 00:30:15 +00:00
Andrew Solovay
d8333334f8 Merge \\"docs: Updating N Preview \\"API Overview\\" doc for DP5\\" into nyc-dev am: 833722e049
am: f5f50cfc7a

Change-Id: Icc3d60d6ad55805be520975033e2a0f157721c50
2016-07-16 00:29:49 +00:00
Andrew Solovay
3cbde13f9e Merge \\"docs: Updating N Preview \\"API Overview\\" doc for DP5\\" into nyc-dev am: 833722e049
am: 843979a3b3

Change-Id: I9a86bd40709f5a9006f669cbdbd94d10bfd8d555
2016-07-16 00:28:26 +00:00
TreeHugger Robot
9d3bc86207 Merge "docs: Updating N Preview "behavior changes" doc for DP5" into nyc-dev 2016-07-16 00:24:49 +00:00
Andrew Solovay
f5f50cfc7a Merge \"docs: Updating N Preview \"API Overview\" doc for DP5\" into nyc-dev
am: 833722e049

Change-Id: Id869d494381ff6e53066eab1dcbb4a3ee447384d
2016-07-16 00:23:00 +00:00
Andrew Solovay
843979a3b3 Merge \"docs: Updating N Preview \"API Overview\" doc for DP5\" into nyc-dev
am: 833722e049

Change-Id: I8b594c2f28db69dd6e645dc2d79405f6da764806
2016-07-16 00:22:59 +00:00
TreeHugger Robot
833722e049 Merge "docs: Updating N Preview "API Overview" doc for DP5" into nyc-dev 2016-07-16 00:13:17 +00:00
Amith Yamasani
d0cecf9d67 Merge \"Block camera gesture during secondary user SUW\" into nyc-mr1-dev
am: e1a3a449a4

Change-Id: I92755956d3047902086945ce7479fc16bfa70b84
2016-07-16 00:12:03 +00:00
Steve McKay
a8387db55e Merge \"Include an app icon.\" into nyc-mr1-dev
am: 3d8c9981b5

Change-Id: I14f2d90fc7c0f21ab0fe6b993c1ef6d8ed665831
2016-07-16 00:06:10 +00:00
TreeHugger Robot
e1a3a449a4 Merge "Block camera gesture during secondary user SUW" into nyc-mr1-dev 2016-07-16 00:03:52 +00:00
TreeHugger Robot
3d8c9981b5 Merge "Include an app icon." into nyc-mr1-dev 2016-07-15 23:59:46 +00:00
Doris Liu
f5b87ce908 Merge \"Ensure native allocation/free is correctly registered\" into nyc-mr1-dev
am: a7272b4cad

Change-Id: Ib1d07a6420d6800b290d0c47e9fcfe3690c541eb
2016-07-15 23:56:24 +00:00
Makoto Onuki
3d3e2e2b17 Merge \"Don\'t accept resource references in string fields\" into nyc-mr1-dev
am: 6fa0e4d518

Change-Id: I8bc05f17694aca0c24e280daa2fcd8464aa1fd05
2016-07-15 23:50:51 +00:00
Doris Liu
a7272b4cad Merge "Ensure native allocation/free is correctly registered" into nyc-mr1-dev 2016-07-15 23:46:08 +00:00
Makoto Onuki
6fa0e4d518 Merge "Don't accept resource references in string fields" into nyc-mr1-dev 2016-07-15 23:41:11 +00:00
Android Build Merger (Role)
40a4bf7dc1 Merge "Merge \"Build both filename views before deleting.\" into nyc-mr1-dev am: fff6a11438" into nyc-mr1-dev-plus-aosp 2016-07-15 23:16:57 +00:00
Jeff Sharkey
ab062fc81f Merge \"Build both filename views before deleting.\" into nyc-mr1-dev
am: fff6a11438

Change-Id: Ie97bade1f8396c3c08f622f2533d42d115568e08
2016-07-15 23:16:35 +00:00
Andrew Solovay
64c147b2cd Merge \\"docs: Updating N Preview release notes for DP5\\" into nyc-dev am: b91693fedd
am: 5de36f1ba0

Change-Id: Ib60985ae93a52c826a75c96df6b8d2d50d448ad4
2016-07-15 23:15:57 +00:00
Andrew Solovay
91eaa3ec0e Merge \\"docs: Updating N Preview release notes for DP5\\" into nyc-dev am: b91693fedd
am: e4846ae107

Change-Id: I81bb81225087441a2906b36a67ad68b247b36fb0
2016-07-15 23:10:58 +00:00
TreeHugger Robot
fff6a11438 Merge "Build both filename views before deleting." into nyc-mr1-dev 2016-07-15 23:05:15 +00:00
Andrew Solovay
469f8a5c80 docs: Updating N Preview "behavior changes" doc for DP5
See first comment for doc stage location.

Change-Id: I11720bdabca78fdbaca82c7e3467f47b51e60f15
2016-07-15 16:01:37 -07:00
Andrew Solovay
5de36f1ba0 Merge \"docs: Updating N Preview release notes for DP5\" into nyc-dev
am: b91693fedd

Change-Id: I2e697679697d56695bd6e26eeb4ff2dba58632d1
2016-07-15 22:55:38 +00:00
Andrew Solovay
e4846ae107 Merge \"docs: Updating N Preview release notes for DP5\" into nyc-dev
am: b91693fedd

Change-Id: I9e9a0982a141d09da5e7d68fb01df48adcb619a3
2016-07-15 22:55:37 +00:00
Android Build Merger (Role)
8ff25378a0 Merge "Merge \\"docs: Describe how to update N Preview test devices on N release\\" into nyc-dev am: 085b4e8f7b am: 64e25cf4d3" into nyc-mr1-dev-plus-aosp 2016-07-15 22:52:03 +00:00
Andrew Solovay
35f6be5014 Merge \\"docs: Describe how to update N Preview test devices on N release\\" into nyc-dev am: 085b4e8f7b
am: 64e25cf4d3

Change-Id: Ia118a84d08bfd049036e8a8dba107213f4732ca7
2016-07-15 22:51:27 +00:00
Andrew Solovay
3b6d0481c0 Merge \\"docs: Describe how to update N Preview test devices on N release\\" into nyc-dev am: 085b4e8f7b
am: 9ef754c105

Change-Id: Ia924b34cae241e95ba4354ebb795fd2003ba392a
2016-07-15 22:51:20 +00:00
Andrew Solovay
b91693fedd Merge "docs: Updating N Preview release notes for DP5" into nyc-dev 2016-07-15 22:46:51 +00:00
Andrew Solovay
9ef754c105 Merge \"docs: Describe how to update N Preview test devices on N release\" into nyc-dev
am: 085b4e8f7b

Change-Id: I9a005cea1e0e3b61d20003ebb975d4b04ebdba5c
2016-07-15 22:46:14 +00:00
Andrew Solovay
64e25cf4d3 Merge \"docs: Describe how to update N Preview test devices on N release\" into nyc-dev
am: 085b4e8f7b

Change-Id: Id0ad00358c59e0a4187bd1f67bfc329e328c17bd
2016-07-15 22:45:57 +00:00
TreeHugger Robot
085b4e8f7b Merge "docs: Describe how to update N Preview test devices on N release" into nyc-dev 2016-07-15 22:42:28 +00:00
Andrew Solovay
1721c3e7fa docs: Updating N Preview "API Overview" doc for DP5
Added new "WebView" section, and minor tweak to the "Always On VPN"
section.

See first comment for doc stage location.

Change-Id: I1f57c2a73d1c8adaf4de0bf928711ba75f732436
2016-07-15 15:38:22 -07:00
Steve McKay
f00c161a22 Include an app icon.
Bug: 29880363
Change-Id: Ia8d9414ce536fb35acec1357d0f69d3ee158d853
2016-07-15 15:37:14 -07:00
Amith Yamasani
f16c3be10f Block camera gesture during secondary user SUW
Check for the current user's setup_complete state
before acting on the double-tap on power camera
launcher.

Bug: 30155500
Change-Id: I2ee8601411d270e288410e9d22ae07b97fa0de70
2016-07-15 15:33:03 -07:00
Makoto Onuki
6406be311c Merge \"Cache the default launcher.\" into nyc-mr1-dev
am: cf99263662

Change-Id: If8d15587702dad81d9a9025e13dec9820456287b
2016-07-15 22:26:15 +00:00
Andreas Gampe
a2bff32318 Merge \"Frameworks/base: Add compiler stats to Package Manager\" into nyc-mr1-dev
am: f52ce76d1f

Change-Id: Ifeb2471b276ef29e58c511f89bd27b1d9bb8591f
2016-07-15 22:26:09 +00:00
Makoto Onuki
cf99263662 Merge "Cache the default launcher." into nyc-mr1-dev 2016-07-15 22:22:34 +00:00
Ashutosh Joshi
820ab55e1c Merge \"Loading NanoApps now works.\" into nyc-mr1-dev
am: 095979b463

Change-Id: I8035e04cc0ca040357a8799136c9b31702a151c0
2016-07-15 22:21:01 +00:00
TreeHugger Robot
f52ce76d1f Merge "Frameworks/base: Add compiler stats to Package Manager" into nyc-mr1-dev 2016-07-15 22:20:38 +00:00
Cheryl Potter
c2d6b29bdd Merge \\"docs: Add redirect for new AS Help menu item b/30165151\\" into nyc-dev am: 462e5aae83
am: 8b9015899d

Change-Id: I374b51217e9e485c875599c33c5298c69ffd9028
2016-07-15 22:14:16 +00:00
Ashutosh Joshi
095979b463 Merge "Loading NanoApps now works." into nyc-mr1-dev 2016-07-15 22:12:42 +00:00
Cheryl Potter
cb8fbd4bea Merge \\"docs: Add redirect for new AS Help menu item b/30165151\\" into nyc-dev am: 462e5aae83
am: c9515ae39d

Change-Id: If4bf155a4f2afc268497ef6ddba646c3c5b6f335
2016-07-15 22:08:21 +00:00
Cheryl Potter
8b9015899d Merge \"docs: Add redirect for new AS Help menu item b/30165151\" into nyc-dev
am: 462e5aae83

Change-Id: Iaf769efa2d7e30d82d02f1e8fd1ee96da640bf57
2016-07-15 22:07:16 +00:00
Cheryl Potter
c9515ae39d Merge \"docs: Add redirect for new AS Help menu item b/30165151\" into nyc-dev
am: 462e5aae83

Change-Id: I13223f73b59cce6f9ed4256af0cfeba12e2d1771
2016-07-15 22:02:12 +00:00
Cheryl Potter
462e5aae83 Merge "docs: Add redirect for new AS Help menu item b/30165151" into nyc-dev 2016-07-15 21:55:05 +00:00
Makoto Onuki
3e3f0f1ba8 Merge \"Fix the allowed icon type error message\" into nyc-mr1-dev
am: fd57d549cf

Change-Id: Ibff8d87533d075f0af95ab98d44f67fd4405a951
2016-07-15 21:50:46 +00:00
TreeHugger Robot
fd57d549cf Merge "Fix the allowed icon type error message" into nyc-mr1-dev 2016-07-15 21:43:03 +00:00
Jeff Sharkey
c50875e42e Build both filename views before deleting.
Otherwise we'll throw when trying to create the second (visible)
filename because we just deleted it.

Bug: 30087518
Change-Id: I940a8f81c264fc17d477fadf46fd48eae29f2f6f
2016-07-15 15:34:44 -06:00
Mike Tsao
d4584a8fb5 Merge \"Back up Night Light settings\" into nyc-mr1-dev
am: 9a0e444c22

Change-Id: I4bc968dfced4671fecb140c50ce759b02d78c4a1
2016-07-15 21:33:57 +00:00