Michael Wright
9468ded040
Merge "Actually wait until the display is ready." into oc-dev
...
am: 496267f93b
Change-Id: I40d9fb13190db81472cde320cccd9a868ea21516
2017-06-07 09:00:53 +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
Change-Id: I7abd446e96368b50eeff92ea134aeea6999f7c7a
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
Change-Id: Ib30211346cbce8dbb0853469c17994f23b7c456d
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
Change-Id: I0f564ed2cee6ad4e45968704a4c64029644bbc4c
2017-06-07 04:27:53 +00:00
Jorim Jaggi
3a981207ce
Merge "Fix crash in test" into oc-dev
...
am: d5ece513ec
Change-Id: I923f532600fe7b3fe372fd4cf2469c2ea2b03569
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
Change-Id: Iec199dd0cfe7beace7549d3e16e888458fd0306c
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
Change-Id: Ib6285780806a9bbffc9bb302085e78f72c27b1be
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
Change-Id: I3e8680067b360ed5792f9a9d1be953561fca7969
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
Change-Id: Ic93c6170813b8c43176d57b534e405500c4639c1
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
Change-Id: Ief5a666699e64cf5d5fc79de1b7964f473898f78
2017-06-07 03:41:13 +00:00
Hugo Benichi
24912bb93d
Merge "Revert "Captive portal login shows specific network name""
...
am: 7f423d00dd
Change-Id: I0d77f19cadbf5905215ae576e66057a259f2348e
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 .
Several branches are broken because of this.
Change-Id: I2d9f8b1cc8f93ed8de7d1e01d49c7cd29417820d
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
Change-Id: I9484e2d577ca547bbff4b516fcb445b4e8cdcdef
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
Change-Id: I88dc4240bc4a8eb84bc3edd7a9f5a873296075fd
2017-06-07 02:56:15 +00:00
Hugo Benichi
6f2d79464d
Merge "Captive portal login shows specific network name" am: ea7322d17e
...
am: d4cb33b83f
Change-Id: Ie52f17dced7db6dfb6c58f935bf976ff72fa723d
2017-06-07 02:49:05 +00:00
Hugo Benichi
d4cb33b83f
Merge "Captive portal login shows specific network name"
...
am: ea7322d17e
Change-Id: I48abfa9523854ea3f30883e92d6d3011d41c6a66
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
Change-Id: I76ffe2869425314f43b0fc2044b8bb8d80619689
2017-06-07 01:19:12 +00:00
Tyler Freeman
319a34ae87
Vibrator: Allow priority vibrations in low-power mode for accessibility.
...
This is mainly for Wear devices that don't have speakers.
Bug: 37543478
Test: Manual:
1. Activate low power mode `adb shell dumpsys battery unplug && adb shell settings put global low_power 1`
2. Then see if Alarm/Timer will vibrate.
3. Send a Hangout Test notification, make sure it does NOT vibrate.
On phones there should be no change. Alarms will not vibrate.
Change-Id: Ia6dffa7e528886e7c84390dbb33b44f298c7afa4
2017-06-06 18:12:50 -07:00
Evan Rosky
2b64c87366
Merge "Don't report focusableViewAvailable on add" into oc-dev
...
am: 8d4b72c68a
Change-Id: I4169c2ecf3890946090e4c171a666292262118f6
2017-06-07 01:09:17 +00:00
Android Build Merger (Role)
eb2b94d3f2
Merge "Merge "Fixed autofill filter comparison." into oc-dev am: 72f2d98c5a am: 4d47d7ad46"
2017-06-07 01:07:34 +00:00
Felipe Leme
a438c6c44e
Merge "Fixed autofill filter comparison." into oc-dev am: 72f2d98c5a
...
am: 4d47d7ad46
Change-Id: Ic6d4af3752da2672ce172f09022e0dfaf1bd0810
2017-06-07 01:05:39 +00:00
TreeHugger Robot
e049f0cb6d
Merge changes from topic 'dungeon-master'
...
* changes:
Hide redundant foreground service notifications.
Updates to Dianne's Dungeon.
2017-06-07 01:05:23 +00:00
Felipe Leme
0245eb9d59
Merge "Improved debug to diagnose Save issues." into oc-dev am: be4420cf13
...
am: 34e7f3b6ba
Change-Id: I86366b96742aafd1c9f6f9f7a1dc278f0275e3ff
2017-06-07 01:02:34 +00:00
Evan Rosky
8d4b72c68a
Merge "Don't report focusableViewAvailable on add" into oc-dev
2017-06-07 01:02:21 +00:00
Felipe Leme
f9a9bbf430
Merge "Use initial value on save when value didn't change." into oc-dev am: 2e723982d5
...
am: 08365011a2
Change-Id: I38b2e8096b7fe43a294afe400af093b49616335d
2017-06-07 00:57:16 +00:00
Felipe Leme
4d47d7ad46
Merge "Fixed autofill filter comparison." into oc-dev
...
am: 72f2d98c5a
Change-Id: I1fef87940fe08d875d3d449a830bd652871e2505
2017-06-07 00:55:27 +00:00
Felipe Leme
34e7f3b6ba
Merge "Improved debug to diagnose Save issues." into oc-dev
...
am: be4420cf13
Change-Id: Id65b8d62403af8883503d5b31903d73751f33bf2
2017-06-07 00:51:31 +00:00
Felipe Leme
c14129043f
Merge "Don't show AUTOFILL menu when text is selected." into oc-dev am: 49231f183f
...
am: fc4604f719
Change-Id: I73c6181f7fdd4b2b4c38338c13d9bf439199617f
2017-06-07 00:48:54 +00:00
Felipe Leme
08365011a2
Merge "Use initial value on save when value didn't change." into oc-dev
...
am: 2e723982d5
Change-Id: Ie8196727744de7b8a5d51fe671bca8c984ae321d
2017-06-07 00:46:53 +00:00
TreeHugger Robot
edb9af3e17
Merge "Replace mockito with a mock class in DynamicLayoutTest"
2017-06-07 00:45:09 +00:00
Marco Nelissen
9027504915
Merge "Close connection before retrying" into lmp-dev am: a8648ecebb am: 5181a7ab64 am: 4b78a79546 am: 6d5bc9a3c2 am: 3272cf26c1 am: e18e8c4113 am: 69b6a382a3 am: ce5c72e887 am: 4d9e6150f3 am: d7fe3ea6a8 am: db9d2588b8 am: 9e4e6c4b7c am: 6596f721fd
...
am: 3f4a368a7c
Change-Id: I9675446964d2bd5672fe87674571dae517f5ba3d
2017-06-07 00:39:56 +00:00
Felipe Leme
fc4604f719
Merge "Don't show AUTOFILL menu when text is selected." into oc-dev
...
am: 49231f183f
Change-Id: I5d182201cc568caa894dddd6352cbf6abb83a03b
2017-06-07 00:38:40 +00:00
Marco Nelissen
3f4a368a7c
Merge "Close connection before retrying" into lmp-dev am: a8648ecebb am: 5181a7ab64 am: 4b78a79546 am: 6d5bc9a3c2 am: 3272cf26c1 am: e18e8c4113 am: 69b6a382a3 am: ce5c72e887 am: 4d9e6150f3 am: d7fe3ea6a8 am: db9d2588b8 am: 9e4e6c4b7c
...
am: 6596f721fd
Change-Id: Iaf21b4182d659b4ffc5b2e514c7a4dfcb15cc143
2017-06-07 00:31:38 +00:00
Marco Nelissen
5301c498fe
Merge "Close connection before retrying" into lmp-dev am: a8648ecebb am: 5181a7ab64 am: 4b78a79546 am: 6d5bc9a3c2 am: 3272cf26c1 am: e18e8c4113 am: 69b6a382a3 am: ce5c72e887 am: 4d9e6150f3 am: d7fe3ea6a8 am: db9d2588b8 am: 9e4e6c4b7c am: 2c1d4f8f7b
...
am: 031a20a6c7
Change-Id: I5039c6fc8c0a18fcf14edd30f94975fff6c1fc35
2017-06-07 00:31:33 +00:00
Felipe Leme
72f2d98c5a
Merge "Fixed autofill filter comparison." into oc-dev
2017-06-07 00:30:53 +00:00