Erik Kline
f22995eed5
Merge "Add additional mocking for Context innards" am: a65aa77c1c
...
am: 35182218d3
2017-06-07 09:46:11 +00:00
Erik Kline
35182218d3
Merge "Add additional mocking for Context innards"
...
am: a65aa77c1c
2017-06-07 09:40:37 +00:00
Treehugger Robot
a65aa77c1c
Merge "Add additional mocking for Context innards"
2017-06-07 09:32:04 +00:00
Hyunyoung Song
af63dabff9
Merge "Change Android default icon b/35314247 Test: manual" into oc-dev am: bb4aeb19be
...
am: 38568aff22
2017-06-07 09:14:05 +00:00
Michael Wright
7e4ea727e2
Merge "Actually wait until the display is ready." into oc-dev am: 496267f93b
...
am: 9468ded040
2017-06-07 09:11:06 +00:00
Hyunyoung Song
38568aff22
Merge "Change Android default icon b/35314247 Test: manual" into oc-dev
...
am: bb4aeb19be
2017-06-07 09:04:17 +00:00
Michael Wright
9468ded040
Merge "Actually wait until the display is ready." into oc-dev
...
am: 496267f93b
2017-06-07 09:00:53 +00:00
Hugo Benichi
6c91a5bfad
Merge "Captive portal login shows specific network name" am: 01fb05cf62 am: 93fe99aca4 am: 75faf02f04
...
am: f5b8d18798
2017-06-07 08:58:04 +00:00
Hugo Benichi
f5b8d18798
Merge "Captive portal login shows specific network name" am: 01fb05cf62 am: 93fe99aca4
...
am: 75faf02f04
2017-06-07 08:51:43 +00:00
Erik Kline
ec37275ec9
Add additional mocking for Context innards
...
Test: as follows
- built
- flashed
- booted
- runtest frameworks-net passes
- cherry-picked to master and verified there as well
Bug: 32163131
Bug: 32561414
Change-Id: I0b5b1b12d55547d08c332c7d274f19f0023a7b07
2017-06-07 17:44:53 +09:00
Hugo Benichi
75faf02f04
Merge "Captive portal login shows specific network name" am: 01fb05cf62
...
am: 93fe99aca4
2017-06-07 08:43:08 +00:00
Hyunyoung Song
d241ae7bd0
Merge "Change Android default icon b/35314247 Test: manual" into oc-dev am: bb4aeb19be
...
am: 537a788091
2017-06-07 08:39:54 +00:00
Michael Wright
428bb9a193
Merge "Actually wait until the display is ready." into oc-dev am: 496267f93b
...
am: d581113dc1
2017-06-07 08:37:47 +00:00
Hugo Benichi
93fe99aca4
Merge "Captive portal login shows specific network name"
...
am: 01fb05cf62
2017-06-07 08:35:51 +00:00
Hugo Benichi
01fb05cf62
Merge "Captive portal login shows specific network name"
2017-06-07 08:11:22 +00:00
Hyunyoung Song
537a788091
Merge "Change Android default icon b/35314247 Test: manual" into oc-dev
...
am: bb4aeb19be
2017-06-07 07:58:58 +00:00
TreeHugger Robot
bb4aeb19be
Merge "Change Android default icon b/35314247 Test: manual" into oc-dev
2017-06-07 07:50:21 +00:00
Michael Wright
d581113dc1
Merge "Actually wait until the display is ready." into oc-dev
...
am: 496267f93b
2017-06-07 07:32:49 +00:00
TreeHugger Robot
496267f93b
Merge "Actually wait until the display is ready." into oc-dev
2017-06-07 07:22:59 +00:00
Tyler Freeman
a550801c30
Merge "Vibrator: Allow priority vibrations in low-power mode for accessibility." into oc-dev am: ac36c42a86
...
am: 8cb653925b
2017-06-07 06:48:58 +00:00
Tyler Freeman
8cb653925b
Merge "Vibrator: Allow priority vibrations in low-power mode for accessibility." into oc-dev
...
am: ac36c42a86
2017-06-07 06:38:38 +00:00
TreeHugger Robot
ac36c42a86
Merge "Vibrator: Allow priority vibrations in low-power mode for accessibility." into oc-dev
2017-06-07 06:33:10 +00:00
Roozbeh Pournader
ef762dc69d
Merge "Move tests with private APIs to coretests"
2017-06-07 06:21:45 +00:00
Qingxi Li
409e549059
Merge "Only show the "Disable eSIM" when eSIM profile is enabled"
2017-06-07 04:50:25 +00:00
Jorim Jaggi
3e34579bb8
Merge "Fix crash in test" into oc-dev am: d5ece513ec
...
am: 3a981207ce
2017-06-07 04:27:53 +00:00
Jorim Jaggi
3a981207ce
Merge "Fix crash in test" into oc-dev
...
am: d5ece513ec
2017-06-07 04:20:40 +00:00
TreeHugger Robot
d5ece513ec
Merge "Fix crash in test" into oc-dev
2017-06-07 04:12:50 +00:00
Doris Liu
ba087b09fc
Merge "Merge "Better handle non-recommended use and warn against it in JavaDoc" into oc-dev am: 8d06d8cbf1" into oc-dev-plus-aosp
...
am: 721ecfd21a
2017-06-07 03:58:45 +00:00
Hugo Benichi
8b7f72878f
Merge "Revert "Captive portal login shows specific network name"" am: 7f423d00dd am: 24912bb93d am: 41415facc8
...
am: 335a1d36ea
2017-06-07 03:54:12 +00:00
Android Build Merger (Role)
721ecfd21a
Merge "Merge "Better handle non-recommended use and warn against it in JavaDoc" into oc-dev am: 8d06d8cbf1" into oc-dev-plus-aosp
2017-06-07 03:50:37 +00:00
Doris Liu
a41b26481c
Merge "Better handle non-recommended use and warn against it in JavaDoc" into oc-dev
...
am: 8d06d8cbf1
2017-06-07 03:49:44 +00:00
Hugo Benichi
335a1d36ea
Merge "Revert "Captive portal login shows specific network name"" am: 7f423d00dd am: 24912bb93d
...
am: 41415facc8
2017-06-07 03:47:17 +00:00
Doris Liu
8d06d8cbf1
Merge "Better handle non-recommended use and warn against it in JavaDoc" into oc-dev
2017-06-07 03:43:13 +00:00
Hugo Benichi
41415facc8
Merge "Revert "Captive portal login shows specific network name"" am: 7f423d00dd
...
am: 24912bb93d
2017-06-07 03:41:13 +00:00
Hugo Benichi
3a222974e9
Captive portal login shows specific network name
...
Bug: 62274222
Bug: 38197949
Bug: 36532213
Test: manually tested by triggering the captive portal login activity
Change-Id: I31439b13a87a78982560828f9ea8a3a57591471b
2017-06-07 12:35:49 +09:00
Hugo Benichi
24912bb93d
Merge "Revert "Captive portal login shows specific network name""
...
am: 7f423d00dd
2017-06-07 03:32:09 +00:00
Hugo Benichi
7f423d00dd
Merge "Revert "Captive portal login shows specific network name""
2017-06-07 03:23:18 +00:00
Hugo Benichi
ef0884f2e5
Revert "Captive portal login shows specific network name"
...
This reverts commit 8032ff32ff
2017-06-07 03:22:20 +00:00
Hugo Benichi
cbec98fb15
Merge "Captive portal login shows specific network name" am: ea7322d17e am: d4cb33b83f am: 6f2d79464d
...
am: 8d60db5241
2017-06-07 03:03:12 +00:00
Hugo Benichi
8d60db5241
Merge "Captive portal login shows specific network name" am: ea7322d17e am: d4cb33b83f
...
am: 6f2d79464d
2017-06-07 02:56:15 +00:00
Hugo Benichi
6f2d79464d
Merge "Captive portal login shows specific network name" am: ea7322d17e
...
am: d4cb33b83f
2017-06-07 02:49:05 +00:00
Hugo Benichi
d4cb33b83f
Merge "Captive portal login shows specific network name"
...
am: ea7322d17e
2017-06-07 02:42:36 +00:00
TreeHugger Robot
0e23507f08
Merge "Remove unnecessary code"
2017-06-07 02:36:19 +00:00
Hugo Benichi
ea7322d17e
Merge "Captive portal login shows specific network name"
2017-06-07 02:33:04 +00:00
Andrew Sapperstein
b5fae92266
Merge "Add config_headlineFontFamily."
2017-06-07 02:21:57 +00:00
TreeHugger Robot
09c9543692
Merge "Add strings for improving Wifi wrong password UX"
2017-06-07 02:21:07 +00:00
Andrew Sapperstein
2876ee9815
Add config_headlineFontFamily.
...
Creates a config string called config_headlineFontFamily that allows
vendors to override the default font family if they so desire.
Bug: 36855735
Test: ag/2360364
Change-Id: I145e33650d0feec2a52132ac46322c51a23d8ccd
2017-06-06 19:07:51 -07:00
Doris Liu
88bb31b954
Better handle non-recommended use and warn against it in JavaDoc
...
BUG: 62386748
Test: Follow repro steps in b/62358678. The issue is no
longer reproducible
Change-Id: Ic3cec7c4947296224edb5365d81988d4da7ee5e1
2017-06-07 01:41:34 +00:00
TreeHugger Robot
2ba41a9431
Merge "Fix "OK" speed label string."
2017-06-07 01:23:37 +00:00
Evan Rosky
fd80d0e8ac
Merge "Don't report focusableViewAvailable on add" into oc-dev am: 8d4b72c68a
...
am: 2b64c87366
2017-06-07 01:19:12 +00:00
