OSDN Git Service
Siyamed Sinir [Fri, 27 May 2016 23:40:55 +0000 (23:40 +0000)]
Merge "Revert "Fix TextView layout reuse when maxLines is set"" into nyc-dev am:
990e26118d am:
4dc77b7a5e
am:
4e96f6de03
* commit '
4e96f6de033cfc6d14398e321f783583d1881382':
Change-Id: I9b405db1b30fbdbf6d84af16d48c5e439cb5ac28
Siyamed Sinir [Fri, 27 May 2016 23:40:53 +0000 (23:40 +0000)]
Merge "Revert "Fix TextView layout reuse when maxLines is set"" into nyc-dev am:
990e26118d am:
6fe1ab7f21
am:
af57bd751f
* commit '
af57bd751f9402a54db3cb60dd7c93a8106ae2b0':
Revert "Fix TextView layout reuse when maxLines is set"
Change-Id: I6c4865dceff4debb17e679a67ffbb3d7eb33f817
Siyamed Sinir [Fri, 27 May 2016 23:40:14 +0000 (23:40 +0000)]
Merge "Merge "Set StaticLayout.maxLines only when ellipsize is set" into nyc-dev am:
92d0316d28 am:
3f23dad913" into nyc-mr1-dev-plus-aosp
am:
39cc3f20c2
* commit '
39cc3f20c28dcc6a2b5bd5b8290a28244cf778a6':
Change-Id: I032425a07bc2b1d8a31cdd6fd08737a7b435c153
Siyamed Sinir [Fri, 27 May 2016 23:40:05 +0000 (23:40 +0000)]
Merge "Set StaticLayout.maxLines only when ellipsize is set" into nyc-dev am:
92d0316d28 am:
361f03c4e2
am:
3e7177f91f
* commit '
3e7177f91f7e7097dcc4f6613c8baf7fff5a333e':
Set StaticLayout.maxLines only when ellipsize is set
Change-Id: Ic21d60a789a0361ffca8362621fa03ded8d96ae5
Chih-hung Hsieh [Fri, 27 May 2016 23:37:43 +0000 (23:37 +0000)]
Merge "Fix misc-macro-parentheses warnings in DngCreator." am:
d439efc361 am:
cfae35a400 am:
86f5b560af
am:
1099ea59c5
* commit '
1099ea59c575f4445364359cfa74d9afb6d1dd4d':
Fix misc-macro-parentheses warnings in DngCreator.
Change-Id: I7ddd16cdf438ab53726ea546c86e6f9e9b6027ce
Mark Goldstein [Fri, 27 May 2016 23:37:41 +0000 (23:37 +0000)]
Merge "Merge "Doc change: Fix broken link." into mnc-io-docs am:
d643ab1ddb am:
f9d8f6c5f3 am:
7f1330358a am:
1743e97f3a" into nyc-mr1-dev-plus-aosp
am:
747c16c1e0
* commit '
747c16c1e08ad9a7a107fc90ed2e4a6f8762bc3a':
Change-Id: I09b44bca1abd9b75dc49de084cd1e9c658ec4e03
Mark Goldstein [Fri, 27 May 2016 23:37:37 +0000 (23:37 +0000)]
Merge "Doc change: Fix broken link." into mnc-io-docs am:
d643ab1ddb am:
f9d8f6c5f3 am:
7f1330358a am:
90045710ca
am:
29c870e4e2
* commit '
29c870e4e254b741baf0e99257640ba0fac77102':
Doc change: Fix broken link.
Change-Id: I1e1815f6437aac9190849b5ed618cb97aa30e7ef
Jaewan Kim [Fri, 27 May 2016 23:37:35 +0000 (23:37 +0000)]
Merge "PIP: Improve PIP control row\'s focus change animation in Recents" into nyc-dev am:
f8c504db7f am:
cac5be859f
am:
831ddb659e
* commit '
831ddb659e9af7634be65b0c3d997b929a658981':
Change-Id: I9b748064506f5f9b5207263d2fafd138cf87276a
Jason Monk [Fri, 27 May 2016 23:37:33 +0000 (23:37 +0000)]
Merge "QS: Handle detail scroll properly" into nyc-dev am:
4f620d423f am:
582ee3eb65
am:
eb93365269
* commit '
eb933652690182689de5c34ca188409e8c37906e':
Change-Id: I6da52a09a7060862a9c6550ec6034cdfbab8f660
Chris Wren [Fri, 27 May 2016 23:35:45 +0000 (23:35 +0000)]
Merge "add metrics for gestural notification expansions" into nyc-dev am:
cd9ea74659 am:
14c87a5f3f
am:
0c99119f8f
* commit '
0c99119f8f32fc7a34aa708cb794f52fadccc072':
Change-Id: I387fcaba8566173f2281e12e90dd95c46f265ce1
Jaewan Kim [Fri, 27 May 2016 23:35:41 +0000 (23:35 +0000)]
Merge "PIP: Improve PIP control row\'s focus change animation in Recents" into nyc-dev am:
f8c504db7f am:
9e78ee80b8
am:
a8d75f8c1c
* commit '
a8d75f8c1c25c488ed817bd16b1462f192282a6b':
PIP: Improve PIP control row's focus change animation in Recents
Change-Id: Ie274501fa85bbee8c7d7accc37bdd420158799dd
Jason Monk [Fri, 27 May 2016 23:35:39 +0000 (23:35 +0000)]
Merge "QS: Handle detail scroll properly" into nyc-dev am:
4f620d423f am:
11aa8b009f
am:
295619694c
* commit '
295619694ce1a1726d92afd1862c98041ea82f76':
QS: Handle detail scroll properly
Change-Id: I5f4f17a72e8530b93cc853b67438f7e6631b4037
Amith Yamasani [Fri, 27 May 2016 23:35:36 +0000 (23:35 +0000)]
Merge "Revert "Revert "Remove ActivityManager calls with PM.mInstallLock held""" into nyc-mr1-dev am:
aabbfc5565
am:
a3bc135bb4
* commit '
a3bc135bb413bb159847926e0ccdf99acf125360':
Revert "Revert "Remove ActivityManager calls with PM.mInstallLock held""
Change-Id: Ifa8f6f8e195bca93af058914c5b1797f3294df6e
Chris Wren [Fri, 27 May 2016 23:35:34 +0000 (23:35 +0000)]
resolve merge conflicts of
cd9ea74 to nyc-mr1-dev am:
7ee8418076
am:
318f923e4f
* commit '
318f923e4f57a7babd79373660e00aa4cef329b7':
add metrics for gestural notification expansions
Change-Id: Ia7b0decd5601195cd3eaddf09c5c460a8b3364a0
Makoto Onuki [Fri, 27 May 2016 23:10:34 +0000 (16:10 -0700)]
resolve merge conflicts of
8de7c95 to master
Change-Id: I04447215323c7582554dc5f6ae8b105308c6f623
Julia Reynolds [Fri, 27 May 2016 22:55:46 +0000 (22:55 +0000)]
Merge "Merge "Announce upcoming tile state on click." into nyc-dev am:
293c967667 am:
4d55281b08" into nyc-mr1-dev-plus-aosp
am:
1e56074899
* commit '
1e560748995433ed323a8eeaf7e7f27c9f498dd3':
Change-Id: Iacf6e2eaa85216f825ab02d52cfb9c682a91285a
Julia Reynolds [Fri, 27 May 2016 22:53:54 +0000 (22:53 +0000)]
Merge "Announce upcoming tile state on click." into nyc-dev am:
293c967667 am:
0a5b17a1dc
am:
4181eeddff
* commit '
4181eeddff1e31c3d90c72d4c4f98ecb46e6db46':
Announce upcoming tile state on click.
Change-Id: Ic84d76bc5f5403ede1c10f3f80af0ae3a27e3150
Ruchi Kandoi [Fri, 27 May 2016 22:53:52 +0000 (22:53 +0000)]
Merge "Merge "PowerManager: Adds Documentation to isSustainedPerformanceModeSupported()" into nyc-dev am:
7730e57dc6 am:
cea28a3935" into nyc-mr1-dev-plus-aosp
am:
e27d8d7e07
* commit '
e27d8d7e076db2e2b5abb04d0a54f82c765a7d52':
Change-Id: Ica7e982c520aa0833ec7bf22a48f9ea1a7542a7b
Ruchi Kandoi [Fri, 27 May 2016 22:53:48 +0000 (22:53 +0000)]
Merge "PowerManager: Adds Documentation to isSustainedPerformanceModeSupported()" into nyc-dev am:
7730e57dc6 am:
e9f42318f6
am:
fcb3aa4a68
* commit '
fcb3aa4a681021c95f55673f18141502667320e3':
PowerManager: Adds Documentation to isSustainedPerformanceModeSupported()
Change-Id: I2acde231a58d82ea15a20757dbf3bac8f9edbba6
Alan Viverette [Fri, 27 May 2016 22:53:45 +0000 (22:53 +0000)]
Merge "resolve merge conflicts of
f118700 to nyc-dev-plus-aosp" into nyc-dev-plus-aosp am:
9ab249bef2
am:
32148220f7
* commit '
32148220f7e31ca100fad42c31841159aa639be4':
Chronometer: Update the value only if displayed on screen
Change-Id: Icf53d90ea83f54457b77bec28291efe92b4c1c88
Paul Jensen [Fri, 27 May 2016 22:53:42 +0000 (22:53 +0000)]
Merge "Merge "Don\'t drop IPv4 broadcast packets when WiFi multicast lock is held" into nyc-dev am:
83e50327fc am:
e8b8f1b48e" into nyc-mr1-dev-plus-aosp
am:
52925fd02e
* commit '
52925fd02eb14c7f1ca3469bead0c73e0c849f77':
Change-Id: I03ef98df0fb2758638a3cf308f0e517e8b417140
Paul Jensen [Fri, 27 May 2016 22:47:29 +0000 (22:47 +0000)]
Merge "Don\'t drop IPv4 broadcast packets when WiFi multicast lock is held" into nyc-dev am:
83e50327fc am:
ae8f345d15
am:
4aa3ffcded
* commit '
4aa3ffcded843d3b194517ef0d24698ee78a7fea':
Don't drop IPv4 broadcast packets when WiFi multicast lock is held
Change-Id: Ic3c246b6dfe368f942d961ddf3cd8aae3dfdbd03
Ivan Podogov [Fri, 27 May 2016 22:47:24 +0000 (22:47 +0000)]
Merge "Set the sensor batch size for accelerometer listener." into nyc-mr1-dev am:
22132cb6be
am:
758cfdc79b
* commit '
758cfdc79b15c47f85fc0753d60503da61e2a93d':
Set the sensor batch size for accelerometer listener.
Change-Id: I780e03a033be866cb2c48276977e38494f57ad4c
Lorenzo Colitti [Fri, 27 May 2016 22:47:21 +0000 (22:47 +0000)]
Merge "Merge "Restore DHCP client logging." into nyc-dev am:
0f8529236e am:
a0049256ed" into nyc-mr1-dev-plus-aosp
am:
9391317538
* commit '
9391317538812a9dc9b8d363c7a5cc3d14c533f2':
Change-Id: Id84f279565d1ac2f3dfa1fd9c78f03ab5d3d6743
Lorenzo Colitti [Fri, 27 May 2016 22:47:16 +0000 (22:47 +0000)]
Merge "Restore DHCP client logging." into nyc-dev am:
0f8529236e am:
4664b09778
am:
52c004d263
* commit '
52c004d2637d26b4f70dcba667e2d79e33c62c40':
Restore DHCP client logging.
Change-Id: I016b6d54004b8e24c50687e5f4f73f9c46e3d2b6
sreevanis [Fri, 27 May 2016 22:47:14 +0000 (22:47 +0000)]
Merge "Added android:tools specification on navigation and actions page." into mnc-io-docs am:
4ca0c8052c am:
fe33c063a9 am:
4b058ae5b7 am:
64b29d4f8c
am:
4afe8df3ee
* commit '
4afe8df3eec4b980fbfe83abf07877e8c0a65c9e':
Change-Id: I5ab7b8c189131f6b27f37c7cf53f151c158e81cb
Winson [Fri, 27 May 2016 22:40:51 +0000 (22:40 +0000)]
Merge "Prevent setting the launch task id when docking." into nyc-dev am:
386a947616 am:
fb8ff0fd31
am:
4499f5d5b7
* commit '
4499f5d5b775ad06db66343046160fb43bdfdb17':
Change-Id: I3ce772a06a73ee8f36ba581cb8e17a17ab3d07af
Wale Ogunwale [Fri, 27 May 2016 22:40:49 +0000 (22:40 +0000)]
Merge "Only make Recents activity invisible if not focused on TV devices." into nyc-dev am:
20237bc68f am:
f41776b211
am:
86fe32a1ee
* commit '
86fe32a1ee6b2ed6bd41c8a876c74d4774f18609':
Change-Id: Ib3b6098b9ecae68fe691b7168f797c96bef7dfc7
Bart Sears [Fri, 27 May 2016 22:40:45 +0000 (22:40 +0000)]
Revert "Remove ActivityManager calls with PM.mInstallLock held" am:
c51e725644
am:
02f466e491
* commit '
02f466e491715a958b6b06287272651d27eca9db':
Revert "Remove ActivityManager calls with PM.mInstallLock held"
Change-Id: I3d8c5767e33795ea19cc9ec630732843d772b097
Sreevani Sreejith [Fri, 27 May 2016 22:40:42 +0000 (22:40 +0000)]
Merge "Merge "Added android:tools specification on navigation and actions page." into mnc-io-docs am:
4ca0c8052c am:
fe33c063a9 am:
4b058ae5b7 am:
75fea11133" into nyc-mr1-dev-plus-aosp
am:
a19a6cc0b4
* commit '
a19a6cc0b4a29cb7cbb0920cf83a7a672b4b24ae':
Added android:tools specification on navigation and actions page.
Change-Id: Ia4af9fcb44de15585336e54dbd73a6cd628f6d25
Winson [Fri, 27 May 2016 22:40:38 +0000 (22:40 +0000)]
Merge "Merge "Prevent setting the launch task id when docking." into nyc-dev am:
386a947616 am:
2e494ecc21" into nyc-mr1-dev-plus-aosp
am:
ed5f73b124
* commit '
ed5f73b1245b62d0a7b9c46a9b6b6bfa66296a8e':
Prevent setting the launch task id when docking.
Change-Id: I9a0984cbf820de06095b6b0bb303251f3a09c4e1
Wale Ogunwale [Fri, 27 May 2016 22:38:48 +0000 (22:38 +0000)]
Merge "Merge "Only make Recents activity invisible if not focused on TV devices." into nyc-dev am:
20237bc68f am:
b3c7e1c4f2" into nyc-mr1-dev-plus-aosp
am:
b1aa5535d8
* commit '
b1aa5535d8e3095a956135112dbaa0f175cfdbd2':
Only make Recents activity invisible if not focused on TV devices.
Change-Id: I6bbcbbef25be062b187e0129cc04a6218453aa8b
Adam Lesinski [Fri, 27 May 2016 22:38:45 +0000 (22:38 +0000)]
Merge "Merge "Fix issue where max idle time > total idle time" into nyc-dev am:
89046edb4d am:
7e762beb7f" into nyc-mr1-dev-plus-aosp
am:
31f191099f
* commit '
31f191099f3e88a414b9d288a544fb20f3139e87':
Change-Id: Ib82202576756b1aeb8a5c89c0bd4eb217b57fadf
Adrian Roos [Fri, 27 May 2016 22:38:43 +0000 (22:38 +0000)]
Merge "Merge "Fix spurious crashes in StatusBarIconView" into nyc-dev am:
7fe83ab54e am:
63014c5f6c" into nyc-mr1-dev-plus-aosp
am:
8d7fb0df41
* commit '
8d7fb0df416cacdb6aee4031642933d427155209':
Change-Id: I56f30306c0a75849aae9cdda78f68bcfb21cc6ce
Roozbeh Pournader [Fri, 27 May 2016 22:38:40 +0000 (22:38 +0000)]
Merge "Merge "Ellipsize Preference summaries" into nyc-dev am:
0ca3829d4c am:
77efbbb3c5" into nyc-mr1-dev-plus-aosp
am:
e0ad40b5e7
* commit '
e0ad40b5e701ee9a1cee67e454d0a90cf90020f4':
Change-Id: I5f2211fb8bcd89f6b538a0589953a8c8bee33834
Wale Ogunwale [Fri, 27 May 2016 22:38:37 +0000 (22:38 +0000)]
Merge "Merge "Protect against NPE while to updating service connection activities." into nyc-dev am:
cef12198a7 am:
e3190c206c" into nyc-mr1-dev-plus-aosp
am:
5fd350997d
* commit '
5fd350997d3a575c1064a62df2735ed523fa20bd':
Change-Id: I2921851366489234c7d2b41b437922d42df5afce
Rob Carr [Fri, 27 May 2016 22:20:51 +0000 (22:20 +0000)]
Merge "Merge "Ensure surfaces only resize during relayout." into nyc-dev am:
58f1167ecf am:
197f9e1c7e" into nyc-mr1-dev-plus-aosp
am:
aeb1d151c5
* commit '
aeb1d151c58e06a5ce6391b9884242e5947c28fe':
Change-Id: I04abcc7f87048ae2d1e0575ba37482e3b8cfcef2
Garfield Tan [Fri, 27 May 2016 22:20:44 +0000 (22:20 +0000)]
Merge "Merge "Fix an assertion to avoid crash on deletions in Recent root." into nyc-dev am:
7a91029bff am:
66f7553862" into nyc-mr1-dev-plus-aosp
am:
989d2e6b17
* commit '
989d2e6b17ddcb82e60546dde0ee98bca99172a2':
Change-Id: I9830138645ff9ed49b178f02d724b4cc0ae94c6c
Robin Lee [Fri, 27 May 2016 22:20:37 +0000 (22:20 +0000)]
Merge "Merge "Move VPN restriction check into setup dialog" into nyc-dev am:
32ceb9c801 am:
b4835e4f14" into nyc-mr1-dev-plus-aosp
am:
2ae3428fd5
* commit '
2ae3428fd5e5b3375a36fb4ff0b8ce0e44c52a01':
Change-Id: I523f340b98bf6626ad133502ab3d022ba367259f
Jorim Jaggi [Fri, 27 May 2016 22:20:29 +0000 (22:20 +0000)]
Merge "Merge "Handle trampoline activites in different tasks" into nyc-dev am:
0d35765ca3 am:
1833aafe7f" into nyc-mr1-dev-plus-aosp
am:
fef5288111
* commit '
fef52881119f07c1d6bd928ac5e172680b8dc468':
Change-Id: Iba5ccc8aba6410b2890bd52a78d897092c139712
Akshay Thakker [Fri, 27 May 2016 22:20:23 +0000 (22:20 +0000)]
Merge "Merge "Finalize resource IDs for N." into nyc-dev am:
7bbab7e440 am:
66eeff63b7" into nyc-mr1-dev-plus-aosp
am:
4d95771836
* commit '
4d95771836090eed9f7489626a013048c157e96e':
Change-Id: I3983f25021b972af7143e2ba24e8131ab2b4d2b1
Bert McMeen [Fri, 27 May 2016 22:18:45 +0000 (22:18 +0000)]
Merge "Merge "Merge "docs: Refinements for testing" into mnc-io-docs am:
9da0730d66 am:
feb0b87230" into nyc-dev am:
3dba0fbd53 am:
260167cada" into nyc-mr1-dev-plus-aosp
am:
87f3aeeee2
* commit '
87f3aeeee2a9859cd312c3f1d8a18946cf8f582b':
Change-Id: Id76b2b1190c37f16d052199a833b9807d604b172
sreevanis [Fri, 27 May 2016 22:18:41 +0000 (22:18 +0000)]
Merge "Merge "Updated link to material design page. am:
ff05383baf am:
ee44b14cd4" into nyc-dev am:
3106e71ddc am:
af7d6fa9a7" into nyc-mr1-dev-plus-aosp
am:
90fa062c1a
* commit '
90fa062c1a9197ba558bb2a60c6f35cf8bccb960':
Change-Id: I3402319b5858fa7a41d15259f4f529cb827a0106
John Reck [Fri, 27 May 2016 22:18:36 +0000 (22:18 +0000)]
Merge "Merge "Change overdraw test to use windowbackground" into nyc-dev am:
34979a3af6 am:
769c456bc1" into nyc-mr1-dev-plus-aosp
am:
81956e5fc6
* commit '
81956e5fc60be9cb842d233a607fab1c570a9124':
Change-Id: I1e8d210ea86862dbc11ca0f2ac97723d59c1928e
Kevin Hufnagle [Fri, 27 May 2016 22:18:31 +0000 (22:18 +0000)]
Merge "Merge "resolve merge conflicts of
7f7eec3 to nyc-dev" into nyc-dev am:
8d063a396f am:
9e2c84014f" into nyc-mr1-dev-plus-aosp
am:
8e98306631
* commit '
8e98306631bcd91548b8ade960a7b35594e43212':
Change-Id: I7aa22af642e3e5a5cbff8fb1f580ea43c9107c42
Selim Cinek [Fri, 27 May 2016 22:18:25 +0000 (22:18 +0000)]
Merge "Merge "Fixed the relative time spoken with accessibility" into nyc-dev am:
38b5946fae am:
0361d504da" into nyc-mr1-dev-plus-aosp
am:
27432f0d60
* commit '
27432f0d605fd069b1ece84dcc9dfafd85773bec':
Change-Id: I4445ac7375ee85260040ae38b2f7b5daf4bde3da
Chris Tate [Fri, 27 May 2016 22:16:21 +0000 (22:16 +0000)]
Merge "Merge "Use backstop timeouts on asynchronous countdown during preflight" into nyc-dev am:
210f2ff198 am:
d9c9b591b7" into nyc-mr1-dev-plus-aosp
am:
eced95f626
* commit '
eced95f626cab914820c210545262098232251ba':
Change-Id: I6f6300209450a26ab8638e4edce6d895fdcbcfb5
Jorim Jaggi [Fri, 27 May 2016 22:16:19 +0000 (22:16 +0000)]
Merge "Fix toast with accessibility and app pinning am:
cf984c56ad am:
8e68533c9d" into nyc-mr1-dev-plus-aosp
am:
364e2b07a5
* commit '
364e2b07a5590800123ab4c8d9136f35b3e3794f':
Change-Id: Ia342a8374e89579b585f51c386ccd20fdf11cfdb
George Mount [Fri, 27 May 2016 22:16:17 +0000 (22:16 +0000)]
Merge "Merge "Fix Activity Transition mess-up." into nyc-dev am:
bd34103c5d am:
b148f83ec0" into nyc-mr1-dev-plus-aosp
am:
522a19a330
* commit '
522a19a33009bbb3efff93f166edb197436f08c1':
Change-Id: Ied9be68f656fd29411a4c6b306f3c41ceeabe56b
Wyatt Riley [Fri, 27 May 2016 22:16:14 +0000 (22:16 +0000)]
Merge "Merge "Prevent use of a null sCallbackObj by Hardware FLP" into nyc-dev am:
793ac34219 am:
a868723467" into nyc-mr1-dev-plus-aosp
am:
149ba9af6e
* commit '
149ba9af6ea6c1e3cd5aec5a7d234f7ac1c7a230':
Change-Id: I3cbc885ffbd985d3a719ea5e01f5c9bd7a12fa8d
Alan Viverette [Fri, 27 May 2016 22:16:11 +0000 (22:16 +0000)]
Merge "Merge "Prevent callbacks during DrawableContainer child initialization" into nyc-dev am:
0f1ae5fa0f am:
ae2a646295" into nyc-mr1-dev-plus-aosp
am:
144a044308
* commit '
144a044308f313d533af99e101638b7ef1e12773':
Change-Id: I154d727b70f8d3f255f9a8709386541c12647612
Winson Chung [Fri, 27 May 2016 22:14:00 +0000 (22:14 +0000)]
Merge "Merge "Fixing crash in SysUI due to invalid group." into nyc-dev am:
814358a24f am:
c1434b4559" into nyc-mr1-dev-plus-aosp
am:
626e587b56
* commit '
626e587b5609c003d1683395fd9fa795f20a750b':
Change-Id: I4720100aec18ed22cb18ac21a6bc17fafafc9e72
Adam Lesinski [Fri, 27 May 2016 22:13:57 +0000 (22:13 +0000)]
Merge "Merge "Fix issue where max idle time > total idle time" into nyc-dev am:
89046edb4d am:
fc7c27b215" into nyc-mr1-dev-plus-aosp
am:
0c67994e33
* commit '
0c67994e33f0c5ae471a83129cf8b7ec9eb54ef7':
Fix issue where max idle time > total idle time
Change-Id: Ia9cf5c89afc542f14ac3ca664e8a2baa0f3d1218
Adrian Roos [Fri, 27 May 2016 22:13:55 +0000 (22:13 +0000)]
Merge "Merge "Fix spurious crashes in StatusBarIconView" into nyc-dev am:
7fe83ab54e am:
59fd8dce39" into nyc-mr1-dev-plus-aosp
am:
7f65fca112
* commit '
7f65fca112bb45ae460ce3a9757e0de1ff524492':
Fix spurious crashes in StatusBarIconView
Change-Id: I13859dbaa556bd168296e0118b0c6a91b04c6a0e
Roozbeh Pournader [Fri, 27 May 2016 22:13:52 +0000 (22:13 +0000)]
Merge "Merge "Ellipsize Preference summaries" into nyc-dev am:
0ca3829d4c am:
51a8c19fb2" into nyc-mr1-dev-plus-aosp
am:
daaa2eed9a
* commit '
daaa2eed9a0523c6967acec9d7169dddf02aabc3':
Ellipsize Preference summaries
Change-Id: If1e95f300c89947794d40ace3f168e5213e876f3
Wale Ogunwale [Fri, 27 May 2016 22:13:49 +0000 (22:13 +0000)]
Merge "Merge "Protect against NPE while to updating service connection activities." into nyc-dev am:
cef12198a7 am:
06fac4f77b" into nyc-mr1-dev-plus-aosp
am:
6e5260f24f
* commit '
6e5260f24f10b9379cd69c6cda52e086bd9f45a0':
Protect against NPE while to updating service connection activities.
Change-Id: I26bacb23e569127aee3a3604029a5043033185d1
Rob Carr [Fri, 27 May 2016 22:11:50 +0000 (22:11 +0000)]
Merge "Merge "Ensure surfaces only resize during relayout." into nyc-dev am:
58f1167ecf am:
c67c7c0799" into nyc-mr1-dev-plus-aosp
am:
61903f9151
* commit '
61903f9151fd9dfad544bafed96a34b6825a6e41':
Ensure surfaces only resize during relayout.
Change-Id: Ic42c07fa74583d9052a824a4b707dc35b200507c
Daniel Sandler [Fri, 27 May 2016 22:11:48 +0000 (22:11 +0000)]
Merge "Merge "Time to #NameAndroidN!" into nyc-dev am:
45caebe035 am:
82aba559fa" into nyc-mr1-dev-plus-aosp
am:
d065fe5be5
* commit '
d065fe5be5eb506981ddf6185a691071fee203e0':
Change-Id: I5e9027b2c83f94817821d017d9bfbd670fbbaef5
Jeff Sharkey [Fri, 27 May 2016 22:11:46 +0000 (22:11 +0000)]
Merge "Merge "Delay PACKAGE_RESTARTED until after data cleared." into nyc-dev am:
d6ee899397 am:
ec298b1567" into nyc-mr1-dev-plus-aosp
am:
d5b17b2688
* commit '
d5b17b268823be9fe87b82098be55d136c7f9c5b':
Change-Id: I19daec361c36402cadb7d0ee31c821cdf03127fb
Jeff Sharkey [Fri, 27 May 2016 22:11:44 +0000 (22:11 +0000)]
Merge "Merge "Careful process validation for unaware providers." into nyc-dev am:
678dba737b am:
2efd671e48" into nyc-mr1-dev-plus-aosp
am:
a3b87c5d16
* commit '
a3b87c5d16962e76275b0e9a4b3f84ece53e9225':
Change-Id: I64e2a2755aa5b62fd4bc544e8bfb1d6592020d5b
Winson [Fri, 27 May 2016 22:11:42 +0000 (22:11 +0000)]
Merge "Defer calling the stack task removed callbacks. am:
6c8217ab30 am:
d5fada7253" into nyc-mr1-dev-plus-aosp
am:
19e8f51d7e
* commit '
19e8f51d7eed5bf2f640cb8df4492f146da9d849':
Change-Id: I4205e5b4ba5beda9c3e97fbadbff6eaec62a6843
Jeff Sharkey [Fri, 27 May 2016 22:03:12 +0000 (22:03 +0000)]
Merge changes from topic \'am-
e885a22f20324bb0b94c97a807186535\' into nyc-mr1-dev-plus-aosp
am:
268b04e160
* commit '
268b04e16052d5ef76954b6688f9d35b23509d83':
Change-Id: Ia32b871506040920765c906d324fb7df3f98c1bb
Eric Schmidt [Fri, 27 May 2016 22:03:05 +0000 (22:03 +0000)]
Merge "Merge "docs: Removing CLI steps in getting started docs" into mnc-io-docs am:
8e08dbe8f8 am:
400aed3556 am:
28bdf2907a am:
26ae893c03" into nyc-mr1-dev-plus-aosp
am:
04e20d3805
* commit '
04e20d380565b7d108422d5b15a14916703b6248':
Change-Id: I8a9bc33afa63de3477822f6db0259a3fce2015d4
Garfield Tan [Fri, 27 May 2016 22:02:59 +0000 (22:02 +0000)]
Merge "Merge "Fix an assertion to avoid crash on deletions in Recent root." into nyc-dev am:
7a91029bff am:
f846d8518b" into nyc-mr1-dev-plus-aosp
am:
f4e1c42240
* commit '
f4e1c422405d965f25e98ca4f505c7c269608db2':
Fix an assertion to avoid crash on deletions in Recent root.
Change-Id: Iafba5b17b7dd89ad9bfdc8e8719f4ade5ff4d8ee
Robin Lee [Fri, 27 May 2016 22:02:51 +0000 (22:02 +0000)]
Merge "Merge "Move VPN restriction check into setup dialog" into nyc-dev am:
32ceb9c801 am:
8d27936438" into nyc-mr1-dev-plus-aosp
am:
5af6e7d4b5
* commit '
5af6e7d4b5301690c3cd9df7a713fd905270c7b1':
Move VPN restriction check into setup dialog
Change-Id: I300b7bd3493106df90086ed88922b9806041da66
Jorim Jaggi [Fri, 27 May 2016 22:02:42 +0000 (22:02 +0000)]
Merge "Merge "Handle trampoline activites in different tasks" into nyc-dev am:
0d35765ca3 am:
03d0a3aeff" into nyc-mr1-dev-plus-aosp
am:
3b5aac257b
* commit '
3b5aac257bd9092de4c552ac095d5cbf7109a9b7':
Handle trampoline activites in different tasks
Change-Id: I369dc499ac8edadf3a3ec0fe3bfce23753331268
Akshay Thakker [Fri, 27 May 2016 21:59:08 +0000 (21:59 +0000)]
Merge "Merge "Finalize resource IDs for N." into nyc-dev am:
7bbab7e440 am:
c37fb8aa6e" into nyc-mr1-dev-plus-aosp
am:
e6c133249b -s ours
* commit '
e6c133249b44e5c504ed685a18e139627f2a6d9d':
Finalize resource IDs for N.
Change-Id: I8c0e791f14d40eecc16d159c6233611e23f20684
Bart Sears [Fri, 27 May 2016 04:12:51 +0000 (04:12 +0000)]
Revert "Remove ActivityManager calls with PM.mInstallLock held"
This reverts commit
ac06a4907bff7d5ee0612dbb85180222e1455791.
Change-Id: I27bedbd221a8d416b9040a96063e66a1ca69fe2e
The Android Automerger [Fri, 27 May 2016 20:05:56 +0000 (20:05 +0000)]
Merge commit '
93c1d3aa6e20b52a37548af0bf9f9a66948a7611'
* commit '
93c1d3aa6e20b52a37548af0bf9f9a66948a7611':
docs: Refinements for testing
Fix toast with accessibility and app pinning
Updated link to material design page.
Change overdraw test to use windowbackground
Prevent callbacks during DrawableContainer child initialization
Fixing crash in SysUI due to invalid group.
Cherry pick: docs: Edited "Features Reference" section in "<uses-feature>" page.
Fix Activity Transition mess-up.
Time to #NameAndroidN!
Prevent use of a null sCallbackObj by Hardware FLP
Fixed the relative time spoken with accessibility
Use backstop timeouts on asynchronous countdown during preflight
Bill Yi [Fri, 27 May 2016 19:53:31 +0000 (19:53 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am:
9aed8c2fa0 -s ours am:
9f2ffbcd66 -s ours" into nyc-mr1-dev-plus-aosp
am:
d5eb34ad35 -s ours
* commit '
d5eb34ad35d5a95095a2fce794e7680c0e7c58a7':
Change-Id: Icb4aa1fe9e891e2fb4570349e5ab427d635feca7
Bill Yi [Fri, 27 May 2016 19:48:49 +0000 (19:48 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am:
cb8c569414 -s ours am:
8272bb6af4 -s ours" into nyc-mr1-dev-plus-aosp
am:
902c693bae -s ours
* commit '
902c693bae6c3f432dd72f3b55680e13632bf928':
Change-Id: Iadd1aa8f179fec25ff8a9b0ef72698c2fd847b30
Jeff Sharkey [Fri, 27 May 2016 19:44:13 +0000 (19:44 +0000)]
Merge "Merge "Delay PACKAGE_RESTARTED until after data cleared." into nyc-dev am:
d6ee899397" into nyc-mr1-dev am:
4e8b6bfe69
am:
d948e39e94
* commit '
d948e39e949c939f2f26fb95bfd1dbacea60493c':
Delay PACKAGE_RESTARTED until after data cleared.
Change-Id: I5bf677218fe3ee19eb667f708d6220c7e82736ee
Jeff Sharkey [Fri, 27 May 2016 19:38:39 +0000 (19:38 +0000)]
Merge "Merge "Careful process validation for unaware providers." into nyc-dev am:
678dba737b" into nyc-mr1-dev am:
37b78dcdd7
am:
a822d4e73a
* commit '
a822d4e73af571a44f73da6701beb0966eb4c5b9':
Careful process validation for unaware providers.
Change-Id: Id1a9171c660ac2b9266cb36bdda03c1e235dfcdb
Winson [Fri, 27 May 2016 19:33:09 +0000 (19:33 +0000)]
Merge "Defer calling the stack task removed callbacks. am:
6c8217ab30" into nyc-mr1-dev am:
e351f281ef
am:
99a36a841a
* commit '
99a36a841aa50bc727e37cc7df4bc0d4be29dca6':
Defer calling the stack task removed callbacks.
Change-Id: I65e07e8fa366ea6781654b7bee4799f0ae3b35d8
Jeff Sharkey [Fri, 27 May 2016 19:26:38 +0000 (19:26 +0000)]
Merge changes from topic \'am-
e4ceb878ab564c70a4e1726ee7c0709a\' into nyc-mr1-dev am:
0ce1648f01
am:
68f4e9fbb2
* commit '
68f4e9fbb21d69e963bec22fd4c50721b3e400f9':
Suppress unlock notifications on non-FBE devices.
Replace caribou wallpaper without the stars b/
28339724
Change-Id: I2591d99120519c1850405bafccf88312418fa31d
Eric Schmidt [Fri, 27 May 2016 19:22:03 +0000 (19:22 +0000)]
Merge "Merge "docs: Removing CLI steps in getting started docs" into mnc-io-docs am:
8e08dbe8f8 am:
400aed3556 am:
28bdf2907a" into nyc-mr1-dev am:
b5cb2ff00a
am:
eacf998c56
* commit '
eacf998c561a5342fb104c4e478abb3e0df969f1':
docs: Removing CLI steps in getting started docs
Change-Id: I8ecffa630d71b9578cba814c5006c61e8e0c36ac
Christine Hallstrom [Fri, 27 May 2016 19:17:03 +0000 (19:17 +0000)]
Merge "Properly check if BT is off when shutting down radios" into nyc-mr1-dev am:
0f760e0815
am:
fa72d4caff
* commit '
fa72d4caffce6f1b7adf5e04f8643fc8e2ebb243':
Properly check if BT is off when shutting down radios
Change-Id: I16d921e8aac53b21c4007e697dc4d5e2f2a4fa4f
Julia Reynolds [Fri, 27 May 2016 19:12:04 +0000 (19:12 +0000)]
Merge "Unlocked access of mServices is bad." into nyc-dev am:
d9599faf6b am:
c2813e2501
am:
60453d14ad
* commit '
60453d14ad737b7bdb77cf8204dcb1450bc3b0c0':
Unlocked access of mServices is bad.
Change-Id: Iaa4cdffe47be29eb9e4f2302c78d38fb2a97176e
Julia Reynolds [Fri, 27 May 2016 19:08:46 +0000 (19:08 +0000)]
Merge "Reset slider animator on density change" into nyc-dev am:
d52a81eeae am:
0e64814c7d
am:
df5072d152
* commit '
df5072d1524b9f4c74366371efded596a8982d5e':
Reset slider animator on density change
Change-Id: I838c804b378147f9adb9a3ee50e1e61dffd1bc25
Siyamed Sinir [Fri, 27 May 2016 19:04:30 +0000 (19:04 +0000)]
Merge "Revert "Fix TextView layout reuse when maxLines is set"" into nyc-dev am:
990e26118d
am:
4dc77b7a5e
* commit '
4dc77b7a5ecd5d957175b85978471debdf45e028':
Change-Id: I63ca616b1a34b6973d1b97eca9004319fb43058f
Siyamed Sinir [Fri, 27 May 2016 19:00:11 +0000 (19:00 +0000)]
Merge "Revert "Fix TextView layout reuse when maxLines is set"" into nyc-dev am:
990e26118d
am:
6fe1ab7f21
* commit '
6fe1ab7f21a7b8d1b88334020a6f11aea6b7a771':
Revert "Fix TextView layout reuse when maxLines is set"
Change-Id: I9141cc021ed511988f8fd4d9f6b4ea7d04aca270
Android Build Merger (Role) [Fri, 27 May 2016 18:57:15 +0000 (18:57 +0000)]
Merge "Merge "Set StaticLayout.maxLines only when ellipsize is set" into nyc-dev am:
92d0316d28 am:
3f23dad913" into nyc-mr1-dev-plus-aosp
Siyamed Sinir [Fri, 27 May 2016 18:56:00 +0000 (18:56 +0000)]
Merge "Set StaticLayout.maxLines only when ellipsize is set" into nyc-dev am:
92d0316d28
am:
3f23dad913
* commit '
3f23dad913859d725ad1b63b12ee0e800a47beb7':
Set StaticLayout.maxLines only when ellipsize is set
Change-Id: I29c05c5359cbc5f969b0c89860a431b0f1342151
Siyamed Sinir [Fri, 27 May 2016 18:55:30 +0000 (18:55 +0000)]
Merge "Set StaticLayout.maxLines only when ellipsize is set" into nyc-dev am:
92d0316d28
am:
361f03c4e2
* commit '
361f03c4e2c774c074ef98ab2631e28288690034':
Set StaticLayout.maxLines only when ellipsize is set
Change-Id: I15d616a7b448dc8e63c1a7d0ac136be98669a869
Siyamed Sinir [Fri, 27 May 2016 18:50:51 +0000 (18:50 +0000)]
Merge "Revert "Fix TextView layout reuse when maxLines is set"" into nyc-dev
am:
990e26118d
* commit '
990e26118d5b6cad2d34483b1908ba6f8334a764':
Revert "Fix TextView layout reuse when maxLines is set"
Change-Id: I543c1944fafb920b697eb87c92cf0d4ae8339e54
Siyamed Sinir [Fri, 27 May 2016 18:50:50 +0000 (18:50 +0000)]
Merge "Revert "Fix TextView layout reuse when maxLines is set"" into nyc-dev
am:
990e26118d
* commit '
990e26118d5b6cad2d34483b1908ba6f8334a764':
Revert "Fix TextView layout reuse when maxLines is set"
Change-Id: Ia2c2d22b40c4613c54c9d86a29f21059da3f7a42
Siyamed Sinir [Fri, 27 May 2016 18:45:20 +0000 (18:45 +0000)]
Merge "Set StaticLayout.maxLines only when ellipsize is set" into nyc-dev
am:
92d0316d28
* commit '
92d0316d2837baceffb22e1a7eb0e5da50f0a025':
Set StaticLayout.maxLines only when ellipsize is set
Change-Id: I2b0281da1d8aba5f84da01c00f31d79af901db35
Siyamed Sinir [Fri, 27 May 2016 18:45:17 +0000 (18:45 +0000)]
Merge "Set StaticLayout.maxLines only when ellipsize is set" into nyc-dev
am:
92d0316d28
* commit '
92d0316d2837baceffb22e1a7eb0e5da50f0a025':
Set StaticLayout.maxLines only when ellipsize is set
Change-Id: I17934afae1d5e8b7fe3b3ad8b4286dd43f68393e
Siyamed Sinir [Fri, 27 May 2016 18:34:27 +0000 (18:34 +0000)]
Merge "Revert "Fix TextView layout reuse when maxLines is set"" into nyc-dev
Siyamed Sinir [Fri, 27 May 2016 18:34:27 +0000 (18:34 +0000)]
Merge "Set StaticLayout.maxLines only when ellipsize is set" into nyc-dev
Chih-Hung Hsieh [Fri, 27 May 2016 18:24:24 +0000 (18:24 +0000)]
Merge "Fix misc-macro-parentheses warnings in DngCreator." am:
d439efc361 am:
cfae35a400
am:
86f5b560af
* commit '
86f5b560af60d91ed67642bfb7392ba6a7cd45b4':
Fix misc-macro-parentheses warnings in DngCreator.
Change-Id: Id8b2d4ba5e721815dc612cbf349ceba8bbb32538
Android Build Merger (Role) [Fri, 27 May 2016 18:16:29 +0000 (18:16 +0000)]
Merge "Merge "Doc change: Fix broken link." into mnc-io-docs am:
d643ab1ddb am:
f9d8f6c5f3 am:
7f1330358a am:
1743e97f3a" into nyc-mr1-dev-plus-aosp
Chih-hung Hsieh [Fri, 27 May 2016 18:16:02 +0000 (18:16 +0000)]
Merge "Fix misc-macro-parentheses warnings in DngCreator." am:
d439efc361
am:
cfae35a400
* commit '
cfae35a4007316cdff280ecce3d71d8d6074bccc':
Fix misc-macro-parentheses warnings in DngCreator.
Change-Id: I0e6297b1e2182d4209bf6744e9d35e574883d7da
Mark Goldstein [Fri, 27 May 2016 18:15:50 +0000 (18:15 +0000)]
Merge "Doc change: Fix broken link." into mnc-io-docs am:
d643ab1ddb am:
f9d8f6c5f3 am:
7f1330358a
am:
1743e97f3a
* commit '
1743e97f3a1ec9c40b3c799ca34cf01186e38f35':
Doc change: Fix broken link.
Change-Id: Ic1a1c08af0e222948d0ebe3d0a92601af0a33238
Mark Goldstein [Fri, 27 May 2016 18:15:20 +0000 (18:15 +0000)]
Merge "Doc change: Fix broken link." into mnc-io-docs am:
d643ab1ddb am:
f9d8f6c5f3 am:
7f1330358a
am:
90045710ca
* commit '
90045710ca4d1bdad279c40084ad60341f13847d':
Doc change: Fix broken link.
Change-Id: I8c007a139b0ceb24abd2996649e222fee402ed12
Mark Goldstein [Fri, 27 May 2016 18:09:54 +0000 (18:09 +0000)]
Merge "Doc change: Fix broken link." into mnc-io-docs am:
d643ab1ddb am:
f9d8f6c5f3
am:
7f1330358a
* commit '
7f1330358ac8037e440f0a66f9abed0f5db0481f':
Doc change: Fix broken link.
Change-Id: I539b08283eee0c0d00fb5c04a97fd01c02780dd4
Chih-Hung Hsieh [Fri, 27 May 2016 18:09:49 +0000 (18:09 +0000)]
Merge "Fix misc-macro-parentheses warnings in DngCreator."
am:
d439efc361
* commit '
d439efc361535701f6d2d0b82cfa22b9d4a5898b':
Fix misc-macro-parentheses warnings in DngCreator.
Change-Id: I5fd1127ff3efde3b44ac6d358d48665f89d54e01
Mark Goldstein [Fri, 27 May 2016 18:09:42 +0000 (18:09 +0000)]
Merge "Doc change: Fix broken link." into mnc-io-docs am:
d643ab1ddb am:
f9d8f6c5f3
am:
7f1330358a
* commit '
7f1330358ac8037e440f0a66f9abed0f5db0481f':
Doc change: Fix broken link.
Change-Id: I5234b90d962f485510c0395b116b9565c58cf7ab
Jae Seo [Fri, 27 May 2016 18:01:47 +0000 (18:01 +0000)]
Merge "PIP: Improve PIP control row\'s focus change animation in Recents" into nyc-dev am:
f8c504db7f
am:
cac5be859f
* commit '
cac5be859ff4cbe0888fa0f3bcc8a6b43ff60bf1':
Change-Id: I738e256fe9ef0c1a35c01efb0f90a85eae272b86
Jason Monk [Fri, 27 May 2016 18:01:41 +0000 (18:01 +0000)]
Merge "QS: Handle detail scroll properly" into nyc-dev am:
4f620d423f
am:
582ee3eb65
* commit '
582ee3eb65623a25cb97f0a25ad6494c9d871475':
Change-Id: I676420dc7c696e40b8db8524b2cdbf7cba9a2ba7
OSDN Git Service
