OSDN Git Service
Stephen Hines [Wed, 20 Jul 2016 00:16:12 +0000 (00:16 +0000)]
Merge \\\\"Disable warning triggered in Clang r271374\\\\" am:
bba87840d3 am:
4643acaa34 am:
46b64ae00e
am:
64baa7025d
Change-Id: I6f9fc52c50481b84db81410aa567cb2639279bb4
Pirama Arumuga Nainar [Tue, 19 Jul 2016 23:59:37 +0000 (23:59 +0000)]
Merge \\\"Disable warning triggered in Clang r271374\\\" am:
bba87840d3 am:
4643acaa34
am:
46b64ae00e
Change-Id: If4fb63fc20ba9cd10bd10c8255f2275a29477801
Selim Cinek [Tue, 19 Jul 2016 23:57:38 +0000 (23:57 +0000)]
Merge \\"Changed to vibrate on down instead of up when entering pin\\" into nyc-mr1-dev am:
798d69817d
am:
45ac88982f
Change-Id: I326ea761cfbb02d9f96b04c8cf51070d38673c8a
Stephen Hines [Tue, 19 Jul 2016 23:52:00 +0000 (23:52 +0000)]
Merge \\"Disable warning triggered in Clang r271374\\" am:
bba87840d3
am:
4643acaa34
Change-Id: Ie8f5bcee02f0235d06f7b0f5b11efd592026fce1
Selim Cinek [Tue, 19 Jul 2016 23:50:37 +0000 (23:50 +0000)]
Merge \"Changed to vibrate on down instead of up when entering pin\" into nyc-mr1-dev
am:
798d69817d
Change-Id: Ic940aa6733ddf9e7415f9ae43b849ae2c2c06cd0
TreeHugger Robot [Tue, 19 Jul 2016 23:47:33 +0000 (23:47 +0000)]
Merge "Changed to vibrate on down instead of up when entering pin" into nyc-mr1-dev
Pirama Arumuga Nainar [Tue, 19 Jul 2016 23:41:20 +0000 (23:41 +0000)]
Merge \"Disable warning triggered in Clang r271374\"
am:
bba87840d3
Change-Id: I03686c2e9c341d927b295c150aea8eea37f69338
Justin Klaassen [Tue, 19 Jul 2016 23:39:57 +0000 (23:39 +0000)]
Merge \\"Animate Night display transition\\" into nyc-mr1-dev am:
5c0ea3b5f4
am:
951a9820d8
Change-Id: I8f1965b69c0ec0963b5a41f9060a145c3e544689
Justin Klaassen [Tue, 19 Jul 2016 23:31:24 +0000 (23:31 +0000)]
Merge \"Animate Night display transition\" into nyc-mr1-dev
am:
5c0ea3b5f4
Change-Id: I423226e374fc3aed4d15db6a3b8424597d28794f
TreeHugger Robot [Tue, 19 Jul 2016 23:25:58 +0000 (23:25 +0000)]
Merge "Animate Night display transition" into nyc-mr1-dev
TreeHugger Robot [Tue, 19 Jul 2016 23:23:15 +0000 (23:23 +0000)]
Merge "Enable pull to refresh."
Youhan Wang [Tue, 19 Jul 2016 23:15:11 +0000 (23:15 +0000)]
Merge \\"Add getCdmaPrlVersion().\\" into nyc-mr1-dev am:
d71c64f715
am:
393ccd2a02
Change-Id: I62949a772e5355ca345f94d7dcedc8112de97863
Youhan Wang [Tue, 19 Jul 2016 23:10:27 +0000 (23:10 +0000)]
Merge \"Add getCdmaPrlVersion().\" into nyc-mr1-dev
am:
d71c64f715
Change-Id: I4c558086089b69c529019c9712e1fa2424a63e35
Tenghui Zhu [Tue, 19 Jul 2016 23:09:54 +0000 (23:09 +0000)]
Merge \\"Use a round rect background drawable for \\"clear all\\"\\" into nyc-mr1-dev am:
b8292a6401
am:
3deaaf5f3f
Change-Id: I7650d235ba9b9f80f5b04943df19ed2ed42e3b1c
Teng-Hui Zhu [Tue, 19 Jul 2016 23:04:14 +0000 (23:04 +0000)]
Merge \"Use a round rect background drawable for \"clear all\"\" into nyc-mr1-dev
am:
b8292a6401
Change-Id: I2201774012da04b8920e298899329af8339452f0
Youhan Wang [Tue, 19 Jul 2016 22:59:08 +0000 (22:59 +0000)]
Merge "Add getCdmaPrlVersion()." into nyc-mr1-dev
Tenghui Zhu [Tue, 19 Jul 2016 22:56:58 +0000 (22:56 +0000)]
Merge "Use a round rect background drawable for "clear all"" into nyc-mr1-dev
Mikhail Naganov [Tue, 19 Jul 2016 22:50:04 +0000 (22:50 +0000)]
Merge "Protect MIDI framework against client blocks in MidiReceiver.onSend"
Hall Liu [Tue, 19 Jul 2016 22:35:17 +0000 (22:35 +0000)]
Merge \\"Add carrier config keys for disabling HD icon\\" into nyc-mr1-dev am:
9adea2e246
am:
c05194428c
Change-Id: Ib54f7156d2f65ab65c64766a2249a5dc69b49562
Hall Liu [Tue, 19 Jul 2016 22:30:31 +0000 (22:30 +0000)]
Merge \"Add carrier config keys for disabling HD icon\" into nyc-mr1-dev
am:
9adea2e246
Change-Id: I1a43d0e6738a41860078ee710d5b57f9a9e66cd5
Teng-Hui Zhu [Tue, 19 Jul 2016 22:14:13 +0000 (15:14 -0700)]
Use a round rect background drawable for "clear all"
Such that we can remove the outline clip, which is triggering a new shader
compilation when "clear all" show up the first time.
b/
28795315
Change-Id: Ib3c4283e46c932090ec97233a5551da7b359c8c8
Hall Liu [Tue, 19 Jul 2016 22:23:05 +0000 (22:23 +0000)]
Merge "Add carrier config keys for disabling HD icon" into nyc-mr1-dev
Selim Cinek [Tue, 19 Jul 2016 22:18:30 +0000 (15:18 -0700)]
Changed to vibrate on down instead of up when entering pin
Change-Id: I180e67e65fa3b1230bd1737abf2f0605a254d348
Fixes:
30000347
Stephen Hines [Tue, 19 Jul 2016 22:02:31 +0000 (22:02 +0000)]
Merge "Disable warning triggered in Clang r271374"
Andrew Sapperstein [Tue, 19 Jul 2016 21:57:38 +0000 (21:57 +0000)]
Merge \\"Add new DeviceDefault.Light.Voice theme.\\" into nyc-mr1-dev am:
d7a59636b7
am:
fe137a86eb
Change-Id: I546631bf8cfabb78f69982cbbd483303ecda00a7
Andrew Sapperstein [Tue, 19 Jul 2016 21:52:34 +0000 (21:52 +0000)]
Merge \"Add new DeviceDefault.Light.Voice theme.\" into nyc-mr1-dev
am:
d7a59636b7
Change-Id: Ib920e93d640f616e44e2288f63ce18d817abaec0
Ecco Park [Tue, 19 Jul 2016 21:52:24 +0000 (21:52 +0000)]
Merge \\"GPS: Keep LPP_PROFILE for verizon\\" into nyc-mr1-dev am:
f308636e22
am:
7baf1b84db
Change-Id: I0805dceff46836aa31dfbcdd2bf4103733086a61
Ecco Park [Tue, 19 Jul 2016 21:46:59 +0000 (21:46 +0000)]
Merge \"GPS: Keep LPP_PROFILE for verizon\" into nyc-mr1-dev
am:
f308636e22
Change-Id: I90b01d784332c54b125dd6510a367e62b207d8e8
Garfield, Tan [Mon, 18 Jul 2016 23:45:27 +0000 (16:45 -0700)]
Enable pull to refresh.
Bug:
28334455
Change-Id: Ie98fbd0abfa4640e00e49d4726e47230276f96c3
Andrew Sapperstein [Tue, 19 Jul 2016 21:42:25 +0000 (21:42 +0000)]
Merge "Add new DeviceDefault.Light.Voice theme." into nyc-mr1-dev
Ecco Park [Tue, 19 Jul 2016 21:37:05 +0000 (21:37 +0000)]
Merge "GPS: Keep LPP_PROFILE for verizon" into nyc-mr1-dev
Justin Klaassen [Fri, 15 Jul 2016 04:00:06 +0000 (21:00 -0700)]
Animate Night display transition
Bug:
30130457
Change-Id: I9d50cb432e6214d6abee6b4cf8c8ac1ff8a1cf6e
Android Build Merger (Role) [Tue, 19 Jul 2016 21:35:59 +0000 (21:35 +0000)]
Merge "Merge \"Merge \\\"docs: Added two new logos to Auto index page. Merge commit \\\'
b94941d03ee77ed6c0e842683ec8bf5d420298d7\\\' into manual_merge_b94941d\\\" into nyc-dev am:
86e39225a9 am:
b7e80ca81f\" into nyc-mr1-dev-plus-aosp am:
37cdade481"
Android Build Merger (Role) [Tue, 19 Jul 2016 21:35:47 +0000 (21:35 +0000)]
Merge "Merge \\\"docs: Added two new logos to Auto index page. Merge commit \\\'
b94941d03ee77ed6c0e842683ec8bf5d420298d7\\\' into manual_merge_b94941d\\\" into nyc-dev am:
86e39225a9 am:
c4e2ae415b am:
8c4b7e9c0f"
Sreevani Sreejith [Tue, 19 Jul 2016 21:35:24 +0000 (21:35 +0000)]
Merge \"Merge \\\"docs: Added two new logos to Auto index page. Merge commit \\\'
b94941d03ee77ed6c0e842683ec8bf5d420298d7\\\' into manual_merge_b94941d\\\" into nyc-dev am:
86e39225a9 am:
b7e80ca81f\" into nyc-mr1-dev-plus-aosp
am:
37cdade481
Change-Id: Ic8e2f0139a78e3b570f1294d1b3d9f056448aad9
sreevanis [Tue, 19 Jul 2016 21:35:21 +0000 (21:35 +0000)]
Merge \\\"docs: Added two new logos to Auto index page. Merge commit \\\'
b94941d03ee77ed6c0e842683ec8bf5d420298d7\\\' into manual_merge_b94941d\\\" into nyc-dev am:
86e39225a9 am:
c4e2ae415b
am:
8c4b7e9c0f
Change-Id: Ib284b28d8af941056c3331a1b3dac86bdf339dbd
Sergei Vasilinetc [Tue, 19 Jul 2016 21:33:21 +0000 (21:33 +0000)]
Merge "Move hwuimacro to common native benchmark infrastructure"
Ecco Park [Mon, 18 Jul 2016 21:08:05 +0000 (14:08 -0700)]
GPS: Keep LPP_PROFILE for verizon
1) add isVerizon function to check verizon sim
2) Save the LPP_PROFILE into property when inserting verizon sim.
3) Use this Profile if device is rebooted after removing this sim.
4) This behavior is maintained unless non-verizon sim is inserted
Bug:
24860255
Change-Id: I3633e1adbbf35852f508877255d3f1664e5497f0
Signed-off-by: Ecco Park <eccopark@google.com>
Android Build Merger (Role) [Tue, 19 Jul 2016 21:26:26 +0000 (21:26 +0000)]
Merge "Merge \\"docs: Added two new logos to Auto index page. Merge commit \\'
b94941d03ee77ed6c0e842683ec8bf5d420298d7\\' into manual_merge_b94941d\\" into nyc-dev am:
86e39225a9 am:
b7e80ca81f" into nyc-mr1-dev-plus-aosp
Sreevani Sreejith [Tue, 19 Jul 2016 21:25:51 +0000 (21:25 +0000)]
Merge \\"docs: Added two new logos to Auto index page. Merge commit \\'
b94941d03ee77ed6c0e842683ec8bf5d420298d7\\' into manual_merge_b94941d\\" into nyc-dev am:
86e39225a9
am:
c4e2ae415b
Change-Id: I414e1c4fcd065fc730dca522b22fd73873bf02d2
Sreevani Sreejith [Tue, 19 Jul 2016 21:25:51 +0000 (21:25 +0000)]
Merge \\"docs: Added two new logos to Auto index page. Merge commit \\'
b94941d03ee77ed6c0e842683ec8bf5d420298d7\\' into manual_merge_b94941d\\" into nyc-dev am:
86e39225a9
am:
b7e80ca81f
Change-Id: Idfba53e954b0b4aa584dc80d134a33a06976fa3a
sreevanis [Tue, 19 Jul 2016 21:21:23 +0000 (21:21 +0000)]
Merge \"docs: Added two new logos to Auto index page. Merge commit \'
b94941d03ee77ed6c0e842683ec8bf5d420298d7\' into manual_merge_b94941d\" into nyc-dev
am:
86e39225a9
Change-Id: I204bdc1625d5ee66fabe5a17a551a645f1348506
sreevanis [Tue, 19 Jul 2016 21:21:17 +0000 (21:21 +0000)]
Merge \"docs: Added two new logos to Auto index page. Merge commit \'
b94941d03ee77ed6c0e842683ec8bf5d420298d7\' into manual_merge_b94941d\" into nyc-dev
am:
86e39225a9
Change-Id: Ifa28ee727034ba7f194baf674b058ddc3c1a1278
Chien-Yu Chen [Tue, 19 Jul 2016 21:16:56 +0000 (21:16 +0000)]
Merge \\"ImageReader: Make close thread safe\\" into nyc-mr1-dev am:
2f8bf1f024
am:
8b29ace33b
Change-Id: I94b195e2a7f43ed010ca3cebe933593c6960cfc6
Sreevani Sreejith [Tue, 19 Jul 2016 21:13:00 +0000 (21:13 +0000)]
Merge "docs: Added two new logos to Auto index page. Merge commit '
b94941d03ee77ed6c0e842683ec8bf5d420298d7' into manual_merge_b94941d" into nyc-dev
Chien-Yu Chen [Tue, 19 Jul 2016 21:12:07 +0000 (21:12 +0000)]
Merge \"ImageReader: Make close thread safe\" into nyc-mr1-dev
am:
2f8bf1f024
Change-Id: I9954f6b7b7ab997391acbe3f16cbce36d9c5de3c
Jason Monk [Tue, 19 Jul 2016 21:07:21 +0000 (21:07 +0000)]
Merge \\\"Don\\\'t allow enable/disable of tuner on lockscreen\\\" into nyc-dev am:
8933c41b35 am:
b9f06d829a
am:
d7fa2e9907
Change-Id: I8cd4834dfc09a5855fde4f1bb6facc205564acbb
Jason Monk [Tue, 19 Jul 2016 21:07:17 +0000 (21:07 +0000)]
Merge \\\"Pre-setup restrictions\\\" into nyc-dev am:
f84c05c360 am:
9220e9dec9
am:
13440a9f93
Change-Id: I278463bfe2a82a4496e3c5d35e80704a95d102f5
Chien-Yu Chen [Tue, 19 Jul 2016 21:05:35 +0000 (21:05 +0000)]
Merge "ImageReader: Make close thread safe" into nyc-mr1-dev
Jason Monk [Tue, 19 Jul 2016 20:55:41 +0000 (20:55 +0000)]
Merge \\\"Don\\\'t allow enable/disable of tuner on lockscreen\\\" into nyc-dev am:
8933c41b35 am:
50805412c8
am:
fd1bd66230
Change-Id: I60afb45ef885e5fad8fcbcc7564a78ef971cd65e
Jason Monk [Tue, 19 Jul 2016 20:55:35 +0000 (20:55 +0000)]
Merge \\\"Pre-setup restrictions\\\" into nyc-dev am:
f84c05c360 am:
47d17a4f18
am:
173aa27b6b
Change-Id: I9e4baf545beb7856c111df84f65ea72406e7a20f
Jason Monk [Tue, 19 Jul 2016 20:50:01 +0000 (20:50 +0000)]
Merge \\"Don\\'t allow enable/disable of tuner on lockscreen\\" into nyc-dev am:
8933c41b35
am:
b9f06d829a
Change-Id: Ib7fd3f495a1ce0cbc1e225d06ac5bca46453e02e
Jason Monk [Tue, 19 Jul 2016 20:49:57 +0000 (20:49 +0000)]
Merge \\"Pre-setup restrictions\\" into nyc-dev am:
f84c05c360
am:
9220e9dec9
Change-Id: Idc48e080e41d469bfb508b7fe37fd197b2119e90
Jason Monk [Tue, 19 Jul 2016 20:45:23 +0000 (20:45 +0000)]
Merge \\"Don\\'t allow enable/disable of tuner on lockscreen\\" into nyc-dev am:
8933c41b35
am:
50805412c8
Change-Id: If06e1f171f9920f9d23d9b7fa79909b8da5f2173
Jason Monk [Tue, 19 Jul 2016 20:45:20 +0000 (20:45 +0000)]
Merge \\"Pre-setup restrictions\\" into nyc-dev am:
f84c05c360
am:
47d17a4f18
Change-Id: I91a96f403911ffc899c082df0c010ff242848ebb
Jason Monk [Tue, 19 Jul 2016 20:37:28 +0000 (20:37 +0000)]
Merge \"Don\'t allow enable/disable of tuner on lockscreen\" into nyc-dev
am:
8933c41b35
Change-Id: I906016249dfb4667bfcaafde07900eee1d90570b
Jason Monk [Tue, 19 Jul 2016 20:37:22 +0000 (20:37 +0000)]
Merge \"Don\'t allow enable/disable of tuner on lockscreen\" into nyc-dev
am:
8933c41b35
Change-Id: I2e24199ee933ac9d18c97858f27408092c3546e5
Jason Monk [Tue, 19 Jul 2016 20:37:17 +0000 (20:37 +0000)]
Merge \"Pre-setup restrictions\" into nyc-dev
am:
f84c05c360
Change-Id: I116aae1bf052d14e69204ee60c7d65837d5c7590
Jason Monk [Tue, 19 Jul 2016 20:37:15 +0000 (20:37 +0000)]
Merge \"Pre-setup restrictions\" into nyc-dev
am:
f84c05c360
Change-Id: I2902c765eeacdbe05a393b01936572233c783988
sreevanis [Tue, 19 Jul 2016 20:32:30 +0000 (13:32 -0700)]
docs: Added two new logos to Auto index page.
Merge commit '
b94941d03ee77ed6c0e842683ec8bf5d420298d7' into manual_merge_b94941d
Bug:
29625414
Change-Id: Iab1b6d2cdf29fd45fae953626271efc2c4d5635d
Pirama Arumuga Nainar [Wed, 29 Jun 2016 05:09:50 +0000 (22:09 -0700)]
Disable warning triggered in Clang r271374
http://b/
28149048
http://b/
29823425
Disable -Wconstant-conversion that gets triggered in
native/imageproc/to_rgba.c.
Test: Tested build, boot and common usage for Arm, Arm64, x86, x86_64,
Mips images in AOSP and internal branch.
Change-Id: Ia8dbe49a1a8577599244642cbd2e3bb17ec1f83c
Jason Monk [Tue, 19 Jul 2016 20:31:21 +0000 (20:31 +0000)]
Merge "Don't allow enable/disable of tuner on lockscreen" into nyc-dev
Jason Monk [Tue, 19 Jul 2016 20:31:17 +0000 (20:31 +0000)]
Merge "Pre-setup restrictions" into nyc-dev
Julia Reynolds [Tue, 19 Jul 2016 20:17:27 +0000 (20:17 +0000)]
Merge \\"Prevent notifications from erroroneously bypassing \\'repeat callers\\' filter\\" into nyc-mr1-dev am:
9c3d64caef
am:
f60214bfad
Change-Id: I005d219bcc63458f813868f0131f66ecf9710d7e
Julia Reynolds [Tue, 19 Jul 2016 20:11:38 +0000 (20:11 +0000)]
Merge \"Prevent notifications from erroroneously bypassing \'repeat callers\' filter\" into nyc-mr1-dev
am:
9c3d64caef
Change-Id: I5fbe9d0c5da7084cede75aaaa57255844d836661
TreeHugger Robot [Tue, 19 Jul 2016 20:05:42 +0000 (20:05 +0000)]
Merge "Prevent notifications from erroroneously bypassing 'repeat callers' filter" into nyc-mr1-dev
Jason Monk [Tue, 19 Jul 2016 19:51:02 +0000 (19:51 +0000)]
Merge \\"QS: Make BT detail be more consistent with Settings\\" into nyc-mr1-dev am:
c357decc4f
am:
bdaa4a84cc
Change-Id: I0d8cfea779411dfb7652f2fc5491991521554db1
Jason Monk [Tue, 19 Jul 2016 19:45:56 +0000 (19:45 +0000)]
Merge \"QS: Make BT detail be more consistent with Settings\" into nyc-mr1-dev
am:
c357decc4f
Change-Id: I459f16f36789f87c5a178cb96f9948f75029be5c
TreeHugger Robot [Tue, 19 Jul 2016 19:39:32 +0000 (19:39 +0000)]
Merge "QS: Make BT detail be more consistent with Settings" into nyc-mr1-dev
Eric Schmidt [Tue, 19 Jul 2016 19:34:40 +0000 (19:34 +0000)]
Merge \"Merge \\\"docs: Added call to build to code snippet\\\" into nyc-dev am:
581815c652 am:
d1b23d6170\" into nyc-mr1-dev-plus-aosp
am:
5446810729
Change-Id: I86cae2ae1948f48ab6c4b9c533955bad41268db4
Eric Schmidt [Tue, 19 Jul 2016 19:34:36 +0000 (19:34 +0000)]
Merge \\\"docs: Added call to build to code snippet\\\" into nyc-dev am:
581815c652 am:
944572de1e
am:
e513dc5344
Change-Id: I17c9164efc46bc02e5207aaeb6c1327f5a8547ab
Android Build Merger (Role) [Tue, 19 Jul 2016 19:29:25 +0000 (19:29 +0000)]
Merge "Merge \\"docs: Added call to build to code snippet\\" into nyc-dev am:
581815c652 am:
d1b23d6170" into nyc-mr1-dev-plus-aosp
Eric Schmidt [Tue, 19 Jul 2016 19:29:03 +0000 (19:29 +0000)]
Merge \\"docs: Added call to build to code snippet\\" into nyc-dev am:
581815c652
am:
d1b23d6170
Change-Id: I7ca297d6e46e83fc1e4bcdaa103d542fab04c13f
Eric Schmidt [Tue, 19 Jul 2016 19:27:03 +0000 (19:27 +0000)]
Merge \\"docs: Added call to build to code snippet\\" into nyc-dev am:
581815c652
am:
944572de1e
Change-Id: I6064e72b085c42aba81ce2142f5cccbc1969dca6
Eric Schmidt [Tue, 19 Jul 2016 19:21:39 +0000 (19:21 +0000)]
Merge \"docs: Added call to build to code snippet\" into nyc-dev
am:
581815c652
Change-Id: Idbdb3f1d0429481bcb26b912ead3b5f9e8fb917f
Geoffrey Pitsch [Tue, 19 Jul 2016 19:17:37 +0000 (19:17 +0000)]
Merge \\"Play boot sound on the System stream.\\" into nyc-mr1-dev am:
7d2f4cc750
am:
bbb9d56a0e
Change-Id: I7286ca72cb20fa4f0339caff22ca50cd7564d43e
Geoffrey Pitsch [Tue, 19 Jul 2016 19:13:05 +0000 (19:13 +0000)]
Merge \"Play boot sound on the System stream.\" into nyc-mr1-dev
am:
7d2f4cc750
Change-Id: I83cea2be8c0f4700eb9f1808b1e713e08b1f2ef3
Michael Kwan [Tue, 19 Jul 2016 19:12:00 +0000 (19:12 +0000)]
Merge \\"Fix padding on round devices for AlertDialogs.\\" into nyc-mr1-dev am:
0cd4addd36
am:
e42b256d0d
Change-Id: Ia1d0a12f8ec520325ef0ece2c74faed0a51dbfd3
Geoffrey Pitsch [Tue, 19 Jul 2016 19:06:44 +0000 (19:06 +0000)]
Merge "Play boot sound on the System stream." into nyc-mr1-dev
Eric Schmidt [Tue, 19 Jul 2016 19:03:16 +0000 (19:03 +0000)]
Merge \"docs: Added call to build to code snippet\" into nyc-dev
am:
581815c652
Change-Id: Ic344ede7dafc95ab78e29724e1e6cc58115acc7c
Michael Kwan [Tue, 19 Jul 2016 18:57:11 +0000 (18:57 +0000)]
Merge \"Fix padding on round devices for AlertDialogs.\" into nyc-mr1-dev
am:
0cd4addd36
Change-Id: I5287b5cae2d18edc5dc2c5fbc2998c63fadbe583
Eric Schmidt [Tue, 19 Jul 2016 18:56:09 +0000 (18:56 +0000)]
Merge "docs: Added call to build to code snippet" into nyc-dev
Andrew Solovay [Tue, 19 Jul 2016 18:53:56 +0000 (18:53 +0000)]
Merge \"Merge \\\"docs: Late-breaking Behavior Changes addition for N Preview 5\\\" into nyc-dev am:
34d488b831 am:
626f9b0632\" into nyc-mr1-dev-plus-aosp
am:
19ab5f9a98
Change-Id: I14960790b79e542a0b6d2d81e569e3f9949c4609
Andrew Solovay [Tue, 19 Jul 2016 18:53:49 +0000 (18:53 +0000)]
Merge \\\"docs: Late-breaking Behavior Changes addition for N Preview 5\\\" into nyc-dev am:
34d488b831 am:
98a029f826
am:
ab84099852
Change-Id: I3641ff8a9accd6dce5e5d1ff8100c289c23ce283
TreeHugger Robot [Tue, 19 Jul 2016 18:48:26 +0000 (18:48 +0000)]
Merge "Fix padding on round devices for AlertDialogs." into nyc-mr1-dev
Android Build Merger (Role) [Tue, 19 Jul 2016 18:48:18 +0000 (18:48 +0000)]
Merge "Merge \\"docs: Late-breaking Behavior Changes addition for N Preview 5\\" into nyc-dev am:
34d488b831 am:
626f9b0632" into nyc-mr1-dev-plus-aosp
Andrew Solovay [Tue, 19 Jul 2016 18:47:52 +0000 (18:47 +0000)]
Merge \\"docs: Late-breaking Behavior Changes addition for N Preview 5\\" into nyc-dev am:
34d488b831
am:
626f9b0632
Change-Id: Ib01f47507444ddd0a1f4cadc0b3d38fcb21bb161
TreeHugger Robot [Tue, 19 Jul 2016 18:46:42 +0000 (18:46 +0000)]
Merge "Updated JavaDoc for getApplicationRestrictions"
Andrew Solovay [Tue, 19 Jul 2016 18:46:34 +0000 (18:46 +0000)]
Merge \\"docs: Late-breaking Behavior Changes addition for N Preview 5\\" into nyc-dev am:
34d488b831
am:
98a029f826
Change-Id: I7b91f368975cb5591890def4339690fde83017e3
Andrew Solovay [Tue, 19 Jul 2016 18:39:24 +0000 (18:39 +0000)]
Merge \"docs: Late-breaking Behavior Changes addition for N Preview 5\" into nyc-dev
am:
34d488b831
Change-Id: I3e1ec736dc753d56c515246e5a09f4679d14c296
Andrew Solovay [Tue, 19 Jul 2016 18:38:55 +0000 (18:38 +0000)]
Merge \"docs: Late-breaking Behavior Changes addition for N Preview 5\" into nyc-dev
am:
34d488b831
Change-Id: I25e914798ce778556fad4f2d0c97cb7175111892
Yuichi Biwa [Tue, 19 Jul 2016 18:38:52 +0000 (18:38 +0000)]
Merge \\"ChooserActivity: Cannot start app that the icon overflows the layout\\" into nyc-mr1-dev am:
586f23c14b
am:
8b059e8aa1
Change-Id: I13f36de289f0990967e4e5fc967ea64ecfbc0ab8
Andrew Solovay [Tue, 19 Jul 2016 18:34:13 +0000 (18:34 +0000)]
Merge "docs: Late-breaking Behavior Changes addition for N Preview 5" into nyc-dev
Yuichi Biwa [Tue, 19 Jul 2016 18:33:40 +0000 (18:33 +0000)]
Merge \"ChooserActivity: Cannot start app that the icon overflows the layout\" into nyc-mr1-dev
am:
586f23c14b
Change-Id: Ie6abdf3303e9f91ae474aca112e39576685d0e5d
TreeHugger Robot [Tue, 19 Jul 2016 18:29:09 +0000 (18:29 +0000)]
Merge "ChooserActivity: Cannot start app that the icon overflows the layout" into nyc-mr1-dev
Hall Liu [Tue, 19 Jul 2016 18:18:49 +0000 (11:18 -0700)]
Add carrier config keys for disabling HD icon
Add keys for whether a wifi call can be HD and whether a video call can
be HD.
Bug:
30013801
Change-Id: I36ab3647a96e5dbd217cff29030d3ac7a2e86f56
Jason Monk [Tue, 19 Jul 2016 18:13:37 +0000 (14:13 -0400)]
QS: Make BT detail be more consistent with Settings
- Show turning on as on
- Disable switch when in a turning on/off state
Change-Id: I55f977808d1b881f6dc27192dcc2e907b0576447
Fixes:
29237638
TreeHugger Robot [Tue, 19 Jul 2016 18:12:40 +0000 (18:12 +0000)]
Merge "Made WindowState.mChildWindow private scoped"
TreeHugger Robot [Tue, 19 Jul 2016 18:04:06 +0000 (18:04 +0000)]
Merge "Track hidden state of window in itself vs. all child windows."
Kevin Hufnagle [Tue, 19 Jul 2016 18:01:44 +0000 (18:01 +0000)]
Merge \"Merge \\\"docs: Updated images and content on \\\"Google Sign-In\\\" page.\\\" into nyc-dev am:
c13b84d38c am:
6e3bbf06a0\" into nyc-mr1-dev-plus-aosp
am:
c5900bce15
Change-Id: I445cf160386f7e946cece6780966ba1a5f127648