OSDN Git Service
Oren Blasberg [Tue, 26 Apr 2016 22:41:00 +0000 (22:41 +0000)]
Merge "Accommodate NaN in new context menu methods." into nyc-dev
Oren Blasberg [Tue, 26 Apr 2016 22:38:56 +0000 (22:38 +0000)]
Merge "Don't show icons for top level menus unless forced." into nyc-dev
Shreyas Basarge [Tue, 26 Apr 2016 22:36:45 +0000 (22:36 +0000)]
Merge "Account info on job wakelocks" into nyc-dev
Ruben Brunk [Tue, 26 Apr 2016 22:05:28 +0000 (22:05 +0000)]
Merge "Add manifest attribute for VR activities." into nyc-dev
Android Build Merger (Role) [Tue, 26 Apr 2016 21:58:51 +0000 (21:58 +0000)]
Merge "Merge "docs: URL and App Indexing API updates for AS 2.0 support b/
26642964" into mnc-docs am:
cffbbc8 am:
8af8d4d am:
13308fc2 am:
39579d7" into nyc-dev
Android Build Merger (Role) [Tue, 26 Apr 2016 21:58:41 +0000 (21:58 +0000)]
Merge "Merge "update Develop tab landing page with Studio 2.0 announcement." into mnc-mr-docs am:
b9709f6 am:
c4ec690 am:
73b5cc9" into nyc-dev
Android Build Merger (Role) [Tue, 26 Apr 2016 21:58:31 +0000 (21:58 +0000)]
Merge "change Mac JDK requirement to 6 am:
611a2f4 am:
3b1f66c am:
0619ef2" into nyc-dev
Android Build Merger (Role) [Tue, 26 Apr 2016 21:58:20 +0000 (21:58 +0000)]
Merge "Merge "Docs: Added Instant Run feature overview section" into mnc-mr-docs am:
3dbc405 am:
6eed040 am:
f654443" into nyc-dev
Android Build Merger (Role) [Tue, 26 Apr 2016 21:58:10 +0000 (21:58 +0000)]
Merge "Docs: Added Android Plugin for Gradle v2.0.0 Release Notes am:
b896cd1 am:
abb5afc am:
fe47b6d" into nyc-dev
Android Build Merger (Role) [Tue, 26 Apr 2016 21:58:01 +0000 (21:58 +0000)]
Merge "Merge "Docs: Added instructions to launch instrumented tests in AS using CTL" into mnc-mr-docs am:
7961413 am:
88d1e91 am:
8776f89" into nyc-dev
Android Build Merger (Role) [Tue, 26 Apr 2016 21:57:51 +0000 (21:57 +0000)]
Merge "Update studio landing page and add all-new install flow docs. bug:
27850063 (update system reqs for 2.0) bug:
27725026 (update download page for 2.0) bug:
23908299 (clean up download and get started) am:
9577d31 am:
fc35cf2 am:
478463a" into nyc-dev
Android Build Merger (Role) [Tue, 26 Apr 2016 21:57:39 +0000 (21:57 +0000)]
Merge "Merge "docs: "Result is:" paragraph now in correct position on page." into mnc-mr-docs am:
7c909cc am:
090e5fb am:
5f6a355" into nyc-dev
Android Build Merger (Role) [Tue, 26 Apr 2016 21:57:30 +0000 (21:57 +0000)]
Merge "Merge "docs: Added new partner logos to the car brands section of auto index page." into mnc-docs am:
63f15a9 am:
e7b8c79 am:
29c6f81 am:
26ed50a" into nyc-dev
Android Build Merger (Role) [Tue, 26 Apr 2016 21:57:20 +0000 (21:57 +0000)]
Merge "Merge "Add missing </pin-set>" into mnc-mr-docs am:
5f415c2 am:
0ed59f9 am:
f1ac8fa" into nyc-dev
Android Build Merger (Role) [Tue, 26 Apr 2016 21:57:11 +0000 (21:57 +0000)]
Merge "Merge "Fix application manifest XML" into mnc-mr-docs am:
c8dcc2b am:
3fdc800 am:
fc688ec" into nyc-dev
Android Build Merger (Role) [Tue, 26 Apr 2016 21:57:02 +0000 (21:57 +0000)]
Merge "Merge "docs: April 2016 Dashboard update" into mnc-mr-docs am:
4ec3749 am:
83113d6 am:
824429f" into nyc-dev
Android Build Merger (Role) [Tue, 26 Apr 2016 21:56:53 +0000 (21:56 +0000)]
Merge "Merge "Revert "Updates for Play" April Fool\'s joke." into mnc-mr-docs am:
242f06cd am:
0015bf0 am:
bb64fe3" into nyc-dev
Android Build Merger (Role) [Tue, 26 Apr 2016 21:56:44 +0000 (21:56 +0000)]
Merge "Merge "Updates for Play." into mnc-mr-docs am:
3afd52a am:
f4658e2 am:
ab3721a" into nyc-dev
Android Build Merger (Role) [Tue, 26 Apr 2016 21:56:24 +0000 (21:56 +0000)]
Merge "Merge "docs: Add note about missing recording functionality in Live Channels" into mnc-mr-docs am:
cac018b am:
9e16ddc am:
461e731" into nyc-dev
Android Build Merger (Role) [Tue, 26 Apr 2016 21:56:12 +0000 (21:56 +0000)]
Merge "Merge "docs: Fixed namespace shown in a line of style XML" into mnc-mr-docs am:
2f5a204 am:
ddbf8d2c am:
f63a1c4" into nyc-dev
Android Build Merger (Role) [Tue, 26 Apr 2016 21:56:02 +0000 (21:56 +0000)]
Merge "Merge "docs: Removed dead link in "create project" TOC." into mnc-mr-docs am:
f380435 am:
0da507d am:
7f0d4d0" into nyc-dev
Android Build Merger (Role) [Tue, 26 Apr 2016 21:55:53 +0000 (21:55 +0000)]
Merge "Merge "docs: Corrected reference link for NotificationManager.notify()." into mnc-mr-docs am:
c9afecd am:
1c076e8 am:
8d336e6" into nyc-dev
Android Build Merger (Role) [Tue, 26 Apr 2016 21:55:43 +0000 (21:55 +0000)]
Merge "Merge "docs: Added missing semicolon within code sample." into mnc-mr-docs am:
9deafe5 am:
fcf68ef am:
c56d885" into nyc-dev
Android Build Merger (Role) [Tue, 26 Apr 2016 21:55:35 +0000 (21:55 +0000)]
Merge "Merge "docs: Fixed Marshmallow links in API level table." into mnc-mr-docs am:
88e19d1 am:
2d9cc0f am:
a732be1" into nyc-dev
Android Build Merger (Role) [Tue, 26 Apr 2016 21:55:25 +0000 (21:55 +0000)]
Merge "Merge "docs: Removed "Drive Installs from Search" page." into mnc-mr-docs am:
8ea3fd8 am:
f1cb86cc am:
690cba0" into nyc-dev
Android Build Merger (Role) [Tue, 26 Apr 2016 21:55:14 +0000 (21:55 +0000)]
Merge "Merge "docs: NDK r11c - release notes and downloads" into mnc-mr-docs am:
42a3312 am:
faa815d am:
2ca2a2c" into nyc-dev
Android Build Merger (Role) [Tue, 26 Apr 2016 21:55:05 +0000 (21:55 +0000)]
Merge "docs: Added link to "preparing for multiwindow" blog post am:
d93472b am:
5db4e1f am:
04b4190" into nyc-dev
Android Build Merger (Role) [Tue, 26 Apr 2016 21:54:53 +0000 (21:54 +0000)]
Merge "Merge "docs: Clarified how multi-window applies to activities in task stack" into mnc-mr-docs am:
a23e28f am:
fbb8b65 am:
3832614" into nyc-dev
Android Build Merger (Role) [Tue, 26 Apr 2016 21:54:43 +0000 (21:54 +0000)]
Merge "Merge "Change colons to equals for custom_link_attributes." into mnc-mr-docs am:
abb9f4d am:
fe0cc90 am:
e8b402e" into nyc-dev
Android Build Merger (Role) [Tue, 26 Apr 2016 21:54:33 +0000 (21:54 +0000)]
Merge "Merge "[RenderScript] Update documentation about API level and RS Support Lib." into mnc-mr-docs am:
f2988f5 am:
2291d03 am:
25570d5" into nyc-dev
Android Build Merger (Role) [Tue, 26 Apr 2016 21:54:24 +0000 (21:54 +0000)]
Merge "Merge "cherrypick from mnc-docs docs: Updated API changes for Dinar wearable support." into mnc-mr-docs am:
f70f0f4 am:
9f57db1 am:
cedb262" into nyc-dev
Android Build Merger (Role) [Tue, 26 Apr 2016 21:54:15 +0000 (21:54 +0000)]
Merge "Merge "docs: Updated API changes for Dinar wearable support." into mnc-docs am:
71b1f0b -s ours am:
a6d7166 am:
0446ed4 am:
f786db7" into nyc-dev
Android Build Merger (Role) [Tue, 26 Apr 2016 21:54:03 +0000 (21:54 +0000)]
Merge "simplification and clarification to the Studio Overview am:
e9b3ada am:
f1a5076 am:
1f8be54" into nyc-dev
Android Build Merger (Role) [Tue, 26 Apr 2016 21:53:53 +0000 (21:53 +0000)]
Merge "Merge "improved structure and organization between video and training docs on the Training landing page." into mnc-mr-docs am:
49b17d3 am:
30c61f9 am:
07bfe29" into nyc-dev
Cheryl Potter [Tue, 26 Apr 2016 21:50:44 +0000 (21:50 +0000)]
Merge "docs: URL and App Indexing API updates for AS 2.0 support b/
26642964" into mnc-docs am:
cffbbc8 am:
8af8d4d am:
13308fc2
am:
39579d7
* commit '
39579d70b3d729a228c76ae06beeff06c5e94150':
docs: URL and App Indexing API updates for AS 2.0 support b/
26642964
Change-Id: Id71f67c7af800535071103c16924daaf6efa72d8
smain@google.com [Tue, 26 Apr 2016 21:49:15 +0000 (21:49 +0000)]
Merge "update Develop tab landing page with Studio 2.0 announcement." into mnc-mr-docs am:
b9709f6 am:
c4ec690
am:
73b5cc9
* commit '
73b5cc9cf34b1705a7bb9e30d8d58fb94a01c7b8':
update Develop tab landing page with Studio 2.0 announcement.
Change-Id: I84027bc7f474b7a614bc80de5a83210cba73ef32
smain@google.com [Tue, 26 Apr 2016 21:47:09 +0000 (21:47 +0000)]
change Mac JDK requirement to 6 am:
611a2f4 am:
3b1f66c
am:
0619ef2
* commit '
0619ef243f887119b921d0874b155287ace70edc':
change Mac JDK requirement to 6
Change-Id: I8a35ad475c64aa7d687398100c0e3df76777d14a
Adarsh Fernando [Tue, 26 Apr 2016 21:44:35 +0000 (21:44 +0000)]
Merge "Docs: Added Instant Run feature overview section" into mnc-mr-docs am:
3dbc405 am:
6eed040
am:
f654443
* commit '
f6544435b561a4ca50a070dc4dd665dda94becff':
Docs: Added Instant Run feature overview section
Change-Id: Id14287bc04647fc19e477e9ce9469ff9874e322a
Adarsh Fernando [Tue, 26 Apr 2016 21:42:02 +0000 (21:42 +0000)]
Docs: Added Android Plugin for Gradle v2.0.0 Release Notes am:
b896cd1 am:
abb5afc
am:
fe47b6d
* commit '
fe47b6d6455dc9e13e7a80e50107fc007ad3daf1':
Docs: Added Android Plugin for Gradle v2.0.0 Release Notes
Change-Id: I4b00bcf7936dc1c5db1d3f54417a4aa1381853c0
Sergei Vasilinetc [Tue, 26 Apr 2016 21:39:42 +0000 (21:39 +0000)]
Merge "DisplayListCanvas: throw exception at attempt to draw bitmap with size > 100MB" into nyc-dev
Adarsh Fernando [Tue, 26 Apr 2016 21:39:34 +0000 (21:39 +0000)]
Merge "Docs: Added instructions to launch instrumented tests in AS using CTL" into mnc-mr-docs am:
7961413 am:
88d1e91
am:
8776f89
* commit '
8776f8940a7a73a5763550ab8e902f4ad6210808':
Docs: Added instructions to launch instrumented tests in AS using CTL
Change-Id: If1512e3bc20cfdaed5c08317bdf5889857909b00
Sergei Vasilinetc [Tue, 26 Apr 2016 21:39:07 +0000 (21:39 +0000)]
Merge "Stop always set OffsetByFudgeFactor in renderVertexBuffer" into nyc-dev
Dirk Dougherty [Tue, 26 Apr 2016 21:37:24 +0000 (21:37 +0000)]
Update studio landing page and add all-new install flow docs. bug:
27850063 (update system reqs for 2.0) bug:
27725026 (update download page for 2.0) bug:
23908299 (clean up download and get started) am:
9577d31 am:
fc35cf2
am:
478463a
* commit '
478463ac42fecf7811d0299005ebe1d800b3483b':
Change-Id: I1788b6e613ecd7ae3850dd5fc838787efab7387a
Kevin Hufnagle [Tue, 26 Apr 2016 21:34:40 +0000 (21:34 +0000)]
Merge "docs: "Result is:" paragraph now in correct position on page." into mnc-mr-docs am:
7c909cc am:
090e5fb
am:
5f6a355
* commit '
5f6a355d610474411a826ad9a896d18f7827d7d0':
Change-Id: Ide8d78800c35e5735e18efea2e90b82a0ed65636
sreevanis [Tue, 26 Apr 2016 21:31:56 +0000 (21:31 +0000)]
Merge "docs: Added new partner logos to the car brands section of auto index page." into mnc-docs am:
63f15a9 am:
e7b8c79 am:
29c6f81
am:
26ed50a
* commit '
26ed50a8cae1ce78a83704e5f104038e53b784b5':
Change-Id: Id2776bdb87590b3dea5acb302573942c5c605abb
Chad Brubaker [Tue, 26 Apr 2016 21:29:57 +0000 (21:29 +0000)]
Merge "Add missing </pin-set>" into mnc-mr-docs am:
5f415c2 am:
0ed59f9
am:
f1ac8fa
* commit '
f1ac8fac41c69114f815f7226c5b695509f8c2ca':
Change-Id: I6cbe92afc06391abd5285471f03629767b598752
Chad Brubaker [Tue, 26 Apr 2016 21:27:05 +0000 (21:27 +0000)]
Merge "Fix application manifest XML" into mnc-mr-docs am:
c8dcc2b am:
3fdc800
am:
fc688ec
* commit '
fc688ec32eaf5815ce3f1ccba6023d5290b8d336':
Change-Id: I35f3641ad371da743a2159eaf14e704b7ff229c2
Joe Fernandez [Tue, 26 Apr 2016 21:23:59 +0000 (21:23 +0000)]
Merge "docs: April 2016 Dashboard update" into mnc-mr-docs am:
4ec3749 am:
83113d6
am:
824429f
* commit '
824429f93ad0ab15b4776acda40f91f972b5e173':
Change-Id: I01b8d416c6c350c1707676d3682800d61fc6442a
Andrew Solovay [Tue, 26 Apr 2016 21:21:48 +0000 (21:21 +0000)]
Merge "Revert "Updates for Play" April Fool\'s joke." into mnc-mr-docs am:
242f06cd am:
0015bf0
am:
bb64fe3
* commit '
bb64fe34ae6ecf0fafa74ddc4d416a21062dc516':
Change-Id: I36475216bbb46c474d1b693250d9392021a6903c
Dirk Dougherty [Tue, 26 Apr 2016 21:19:18 +0000 (21:19 +0000)]
Merge "Updates for Play." into mnc-mr-docs am:
3afd52a am:
f4658e2
am:
ab3721a
* commit '
ab3721ae74d5808ccffb713e256ac48abe895dba':
Change-Id: I37a1841fa7f51bd8ba58b866a8ee255a3aa15954
Daniel Yu [Tue, 26 Apr 2016 21:16:23 +0000 (21:16 +0000)]
Merge "docs: Add note about missing recording functionality in Live Channels" into mnc-mr-docs am:
cac018b am:
9e16ddc
am:
461e731
* commit '
461e731583aad91ca952cba2bab13898e37bb33e':
Change-Id: If3f5053f4d7e12fc0ccf2d5dc94b7141ffaef57b
Kevin Hufnagle [Tue, 26 Apr 2016 21:13:31 +0000 (21:13 +0000)]
Merge "docs: Fixed namespace shown in a line of style XML" into mnc-mr-docs am:
2f5a204 am:
ddbf8d2c
am:
f63a1c4
* commit '
f63a1c4cfddc0c4ac065c8a5ce09e38fe71c3137':
Change-Id: I09a99fd61f157e171c1a873d91c311cac8bfc0c2
Kevin Hufnagle [Tue, 26 Apr 2016 21:10:50 +0000 (21:10 +0000)]
Merge "docs: Removed dead link in "create project" TOC." into mnc-mr-docs am:
f380435 am:
0da507d
am:
7f0d4d0
* commit '
7f0d4d0799622a803316c201ed7cc1e5135de89e':
Change-Id: I7febd987b8e397f38d34cf0a79b7de399a31fce3
Kevin Hufnagle [Tue, 26 Apr 2016 21:08:48 +0000 (21:08 +0000)]
Merge "docs: Corrected reference link for NotificationManager.notify()." into mnc-mr-docs am:
c9afecd am:
1c076e8
am:
8d336e6
* commit '
8d336e6c51380986ac78c348234bd0e0cf4a7380':
Change-Id: Ifa45c62212e81fb9cfaebe98703775715cd14cd0
Kevin Hufnagle [Tue, 26 Apr 2016 21:05:57 +0000 (21:05 +0000)]
Merge "docs: Added missing semicolon within code sample." into mnc-mr-docs am:
9deafe5 am:
fcf68ef
am:
c56d885
* commit '
c56d8853ff8a15aa5a5b5ec40c242745fed6a3b6':
Change-Id: I7db5e0257eb921cc391306f69e21b95c9a296863
Kevin Hufnagle [Tue, 26 Apr 2016 21:03:09 +0000 (21:03 +0000)]
Merge "docs: Fixed Marshmallow links in API level table." into mnc-mr-docs am:
88e19d1 am:
2d9cc0f
am:
a732be1
* commit '
a732be179d7bc06580b66669d6b6c7ebe05b9e01':
Change-Id: I1a2d3eba374fe931b28e0358740d545348ebceba
Kevin Hufnagle [Tue, 26 Apr 2016 21:00:06 +0000 (21:00 +0000)]
Merge "docs: Removed "Drive Installs from Search" page." into mnc-mr-docs am:
8ea3fd8 am:
f1cb86cc
am:
690cba0
* commit '
690cba02682e89299f94d58a5ea9f212006c11c4':
Change-Id: I958d262d9022e91a85f75af7f3e8cb9af1e1f355
Joe Fernandez [Tue, 26 Apr 2016 20:57:54 +0000 (20:57 +0000)]
Merge "docs: NDK r11c - release notes and downloads" into mnc-mr-docs am:
42a3312 am:
faa815d
am:
2ca2a2c
* commit '
2ca2a2c86571d0ad05b95ea0bda7d33414e4cb89':
Change-Id: Ica6e6425d795da330da197536a0e516fb53c8b7d
Andrew Solovay [Tue, 26 Apr 2016 20:55:21 +0000 (20:55 +0000)]
docs: Added link to "preparing for multiwindow" blog post am:
d93472b am:
5db4e1f
am:
04b4190
* commit '
04b41903f9c4ceebc0f5d2e03f8f921f5dc95e69':
Change-Id: I789b9b1066978a665b1262e46a8331c07cd7e9c3
Andrew Solovay [Tue, 26 Apr 2016 20:52:24 +0000 (20:52 +0000)]
Merge "docs: Clarified how multi-window applies to activities in task stack" into mnc-mr-docs am:
a23e28f am:
fbb8b65
am:
3832614
* commit '
3832614650f39719dbbb52ee092c0826291d6516':
Change-Id: Ic5aab52976bceb23ad6c584b87ee86fcff634c76
Elliot Waite [Tue, 26 Apr 2016 20:49:26 +0000 (20:49 +0000)]
Merge "Change colons to equals for custom_link_attributes." into mnc-mr-docs am:
abb9f4d am:
fe0cc90
am:
e8b402e
* commit '
e8b402e20533d5ce7387a4666683c971b22ba381':
Change-Id: Ie43452782ce7ab1e1bdbce67c007b2d3705c7910
Miao Wang [Tue, 26 Apr 2016 20:46:23 +0000 (20:46 +0000)]
Merge "[RenderScript] Update documentation about API level and RS Support Lib." into mnc-mr-docs am:
f2988f5 am:
2291d03
am:
25570d5
* commit '
25570d531904594d0e73cbc5c7a5105006aa8cdd':
Change-Id: I91af0cd7f8a87e3bf00261cece1bf19c9fb88790
sreevanis [Tue, 26 Apr 2016 20:43:10 +0000 (20:43 +0000)]
Merge "cherrypick from mnc-docs docs: Updated API changes for Dinar wearable support." into mnc-mr-docs am:
f70f0f4 am:
9f57db1
am:
cedb262
* commit '
cedb262cfaffed00f091d2a0abe22f92f9809d3e':
Change-Id: I216382c84e33766b5d6d3bdc6c831ffd9afa6560
sreevanis [Tue, 26 Apr 2016 20:40:13 +0000 (20:40 +0000)]
Merge "docs: Updated API changes for Dinar wearable support." into mnc-docs am:
71b1f0b -s ours am:
a6d7166 am:
0446ed4
am:
f786db7
* commit '
f786db7b9bcc6ebfa79b4bc60a837877e5a8a380':
Change-Id: I0c8528b9a6a0313f8983cd4d75adc244ec68f92d
smain@google.com [Tue, 26 Apr 2016 20:36:57 +0000 (20:36 +0000)]
simplification and clarification to the Studio Overview am:
e9b3ada am:
f1a5076
am:
1f8be54
* commit '
1f8be548ae1c21be6651ddc2621018b2028c58d0':
Change-Id: I2e08479aadd3d223b11e10d873239e14ed1a6976
smain@google.com [Tue, 26 Apr 2016 20:34:41 +0000 (20:34 +0000)]
Merge "improved structure and organization between video and training docs on the Training landing page." into mnc-mr-docs am:
49b17d3 am:
30c61f9
am:
07bfe29
* commit '
07bfe296d0e7337ba42fcf260d1029746308a262':
Change-Id: Iedc8b307eba45aa106b52fac980fe1c0fe8cdae3
Chris Craik [Tue, 26 Apr 2016 20:20:37 +0000 (20:20 +0000)]
Merge "Improve SurfaceView postion snapping" into nyc-dev
Mady Mellor [Tue, 26 Apr 2016 19:38:42 +0000 (19:38 +0000)]
Merge "Fix a crash when setting vertical gear location and content view null" into nyc-dev
Chris Banes [Tue, 26 Apr 2016 19:20:14 +0000 (19:20 +0000)]
Merge "Fix onPrepareActionMode() not being called" into nyc-dev
Svetoslav Ganov [Tue, 26 Apr 2016 18:36:26 +0000 (18:36 +0000)]
Merge "Ensure local settings caches are not stale" into nyc-dev
TreeHugger Robot [Tue, 26 Apr 2016 18:33:03 +0000 (18:33 +0000)]
Merge "Remove -night qualified resources" into nyc-dev
Svet Ganov [Wed, 20 Apr 2016 02:38:00 +0000 (19:38 -0700)]
Ensure local settings caches are not stale
We used the system proterties as a shared memory mechanism
to propagate information to local settings caches when the
content has changed and the cache should be cleared. The
system properties are unfortunately updated asynchronously
leading to cases where clients may read stale data.
This change adds a simple int array data structure backed
by shared memory which guarantees individual values are
atomically read and updated without memory tear. Multi-
index opearations are not synchronized between each other.
The settings provider is using the new data structure to
propagate the settings generation which drives when caches
are purged.
We have a single memory array keeping the generation for
different settings tables per user. Since memory array is
not a compact data structure and the user space exceeds
the memory array size we use an in-memory map from keys
to indices in the memory array where the generation id of
a key is stored. A key is derived by the setting type in
the 4 most significant bits and the user id in the 28 least
significant bits.
The mapping from a key to an index is cleared if the user is
removed and the corresponding index in the memory arry is
reset to make it available for other users. The size of the
memory array is derived from the max user count that can be
created at the same time.
bug:
18826179
Change-Id: I64009cc5105309ef9aa83aba90b82afc8ad8c659
Eino-Ville Talvala [Tue, 26 Apr 2016 18:21:42 +0000 (18:21 +0000)]
Merge "SchedulingPolicyService: Fix UID for cameraserver" into nyc-dev
Mady Mellor [Tue, 26 Apr 2016 18:01:03 +0000 (11:01 -0700)]
Fix a crash when setting vertical gear location and content view null
When setting the vertical location of the gear we need the collapsed
height of the parent, the parent might not be fully laid out so move
setting the vertical location into onLayout instead
Bug:
28390732
Change-Id: I7c1bf14a54e9f1ef0a693fa13e1a6533f5967631
TreeHugger Robot [Tue, 26 Apr 2016 17:43:20 +0000 (17:43 +0000)]
Merge "Bluetooth: Fine tune audio gain for Absolute Volume case" into nyc-dev
TreeHugger Robot [Tue, 26 Apr 2016 17:40:27 +0000 (17:40 +0000)]
Merge "Don't opt-out of warning dialog by default on user builds." into nyc-dev
Todd Kennedy [Tue, 26 Apr 2016 17:17:48 +0000 (17:17 +0000)]
Merge "Add "do not kill" install option" into nyc-dev
TreeHugger Robot [Tue, 26 Apr 2016 17:17:02 +0000 (17:17 +0000)]
Merge "Apply tint when setting check mark drawable" into nyc-dev
Liejun Tao [Wed, 9 Mar 2016 21:52:13 +0000 (15:52 -0600)]
Bluetooth: Fine tune audio gain for Absolute Volume case
Fine tune the audio gain for Bluetooth Absolute Volume.
Use 50%, 70% and 85% for lowest volume steps 1, 2 and 3.
Thus the volume change sounds smoother, more linear.
When remote end tune volume out of mute, we should also
tune the audio gain for the lowest volume steps.
Bug:
26694114
Change-Id: I298a334a4b40ddb87495fda1935349bfce8b0537
Julia Reynolds [Tue, 26 Apr 2016 15:29:09 +0000 (15:29 +0000)]
Merge changes from topic 'api_review' into nyc-dev
* changes:
Api review: Settings.
Reduce spacing.
Chris Wren [Tue, 26 Apr 2016 15:26:33 +0000 (15:26 +0000)]
Merge "cancel group children before summaries" into nyc-dev
Julia Reynolds [Tue, 26 Apr 2016 15:26:26 +0000 (15:26 +0000)]
Merge "Swap star tint." into nyc-dev
TreeHugger Robot [Tue, 26 Apr 2016 15:25:43 +0000 (15:25 +0000)]
Merge "Frameworks/base: Make debug helper lazy in ConnectivityManager" into nyc-dev
Julia Reynolds [Tue, 26 Apr 2016 13:17:08 +0000 (09:17 -0400)]
Swap star tint.
Bug:
27558254
Change-Id: Ia72cdc89d4cdcf3f5a5210f14632c15271922a98
David Brazdil [Tue, 26 Apr 2016 12:22:14 +0000 (12:22 +0000)]
Merge "Change app selection policy for post-OTA verification" into nyc-dev
Narayan Kamath [Mon, 25 Apr 2016 18:16:56 +0000 (19:16 +0100)]
LoadedApk: Don't set up JIT profile support inside the system_server.
We shouldn't profile *any* packages loaded by the system_server, not
just the system_servers own ("android") package.
bug:
28241500
Change-Id: I5f3f477b40c758030a5bdc8e97d17cab6e68e204
Chris Banes [Tue, 26 Apr 2016 11:53:59 +0000 (12:53 +0100)]
Fix onPrepareActionMode() not being called
Happens because mActionMode was set at the end
of the call, which means that invalidate() doesn't
actually do anything.
BUG:
28392319
Change-Id: Ifdc97c03dc43bfbe74790f90764d1575bd9ca951
David Brazdil [Mon, 18 Apr 2016 13:08:52 +0000 (14:08 +0100)]
Change app selection policy for post-OTA verification
Changes the policy for selecting packages which will be pre-verified
during post-OTA boot animation.
For Nx to Ny, an app is pre-verified if used in the foreground in the
last 7 days, or if its APK was loaded by other apps.
For M to N (or early N builds without detailed stats), an app is
pre-verified if it has any recorded use in the last 7 days.
Bug:
27902702
Bug:
27350503
Change-Id: I2b38daf017ecd0e5aa5ed596ed9351cffa03dbcb
David Brazdil [Tue, 26 Apr 2016 11:39:41 +0000 (11:39 +0000)]
Merge "Enable profile merging for post-OTA package verification" into nyc-dev
David Brazdil [Tue, 26 Apr 2016 09:18:04 +0000 (10:18 +0100)]
Enable profile merging for post-OTA package verification
Currently post-OTA verification will attempt to compile with
'verify-profile' but does not merge the profiles prior to calling
dex2oat. As a result, we may miss some or all classes that need
verification.
Bug:
27688727
Change-Id: I1aa93cad2686513594cb37f6d3d181ae5c718d1d
TreeHugger Robot [Tue, 26 Apr 2016 09:31:55 +0000 (09:31 +0000)]
Merge "WebView downgrade prevention logic" into nyc-dev
Shreyas Basarge [Mon, 25 Apr 2016 23:14:02 +0000 (00:14 +0100)]
Account info on job wakelocks
Adds account information to wakelock
names for JobScheduler jobs.
Bug:
28321515
Change-Id: Ifaf289c2a9a11843769a3b40eea57d93dbd7d075
Shreyas Basarge [Tue, 26 Apr 2016 09:23:28 +0000 (09:23 +0000)]
Merge "Wait for JobService to start before scheduling syncs" into nyc-dev
Lorenzo Colitti [Tue, 26 Apr 2016 08:52:24 +0000 (08:52 +0000)]
Merge "Close open sockets when enabling firewall rules." into nyc-dev
Erik Kline [Tue, 26 Apr 2016 07:14:58 +0000 (07:14 +0000)]
Merge "IpManager: delete dead getLinkProperties() code" into nyc-dev
Erik Kline [Tue, 26 Apr 2016 05:39:49 +0000 (14:39 +0900)]
IpManager: delete dead getLinkProperties() code
Now that it's long since been unused also delete the locking that was
introduced to make it possible.
Bug:
17733693
Bug:
24837343
Change-Id: Iee817a7c2e1d1dc9c080d3124d5986232dcda00f
Jaewan Kim [Tue, 26 Apr 2016 06:02:59 +0000 (06:02 +0000)]
Merge "PIP: Send KEYCODE_WINDOW to app first if PIP isn't exist" into nyc-dev
Cheryl Potter [Tue, 26 Apr 2016 04:53:15 +0000 (04:53 +0000)]
Merge "docs: URL and App Indexing API updates for AS 2.0 support b/
26642964" into mnc-docs am:
cffbbc8 am:
8af8d4d
am:
13308fc2
* commit '
13308fc2197a664152164fa97d7aa7cf89813390':
docs: URL and App Indexing API updates for AS 2.0 support b/
26642964
Change-Id: I04df592849842145a99aae15835614d7547432fb
Scott Main [Tue, 26 Apr 2016 04:51:27 +0000 (04:51 +0000)]
Merge "update Develop tab landing page with Studio 2.0 announcement." into mnc-mr-docs am:
b9709f6
am:
c4ec690
* commit '
c4ec690df257c0ad5393fe450ba0843746fd1b7f':
update Develop tab landing page with Studio 2.0 announcement.
Change-Id: Ibf084348b6923fa52e845a07d7c9bc2451eb16a1
smain@google.com [Tue, 26 Apr 2016 04:50:01 +0000 (04:50 +0000)]
change Mac JDK requirement to 6 am:
611a2f4
am:
3b1f66c
* commit '
3b1f66c5f745b969cc7ea611736f546c6364b085':
change Mac JDK requirement to 6
Change-Id: I7b5d0c628ff74dbd5ad398022e25473bcc580f57