OSDN Git Service

android-x86/frameworks-base.git
7 years agoMerge "Make DND tile primary toggle remember favorite zen" into oc-dev am: 463985178c...
Jason Monk [Wed, 7 Jun 2017 17:43:12 +0000 (17:43 +0000)]
Merge "Make DND tile primary toggle remember favorite zen" into oc-dev am: 463985178c am: 54d49157fd
am: f470c8f3e1

Change-Id: I477dcdfc276eaaa0b71242f7f56bc59b27142c60

7 years agoMerge "Make DND tile primary toggle remember favorite zen" into oc-dev am: 463985178c
Jason Monk [Wed, 7 Jun 2017 17:36:36 +0000 (17:36 +0000)]
Merge "Make DND tile primary toggle remember favorite zen" into oc-dev am: 463985178c
am: 54d49157fd

Change-Id: I11fc1d70568497d264cdf76a9fe3687baa62a9ea

7 years agoMerge "Make DND tile primary toggle remember favorite zen" into oc-dev
Jason Monk [Wed, 7 Jun 2017 17:28:24 +0000 (17:28 +0000)]
Merge "Make DND tile primary toggle remember favorite zen" into oc-dev
am: 463985178c

Change-Id: I4f1d959c130a008aad49c4aab0aa225bfb035ab3

7 years agoMerge "Make DND tile primary toggle remember favorite zen" into oc-dev
Jason Monk [Wed, 7 Jun 2017 17:17:43 +0000 (17:17 +0000)]
Merge "Make DND tile primary toggle remember favorite zen" into oc-dev

7 years agoMerge "Merge "Clear native shader when Paint shader changes" into oc-dev am: d3e78478...
John Reck [Wed, 7 Jun 2017 17:11:20 +0000 (17:11 +0000)]
Merge "Merge "Clear native shader when Paint shader changes" into oc-dev am: d3e78478aa am: e871596f15" into oc-dr1-dev-plus-aosp
am: 70329318de

Change-Id: I4b49d917620b0659605866063478fd24aa285ba7

7 years agoMerge "Clear native shader when Paint shader changes" into oc-dev am: d3e78478aa...
John Reck [Wed, 7 Jun 2017 17:06:44 +0000 (17:06 +0000)]
Merge "Clear native shader when Paint shader changes" into oc-dev am: d3e78478aa am: 4ee3fb4c54
am: 1079279d53

Change-Id: I0806c1aea547075a92dfde8b0602ca4deb5cde53

7 years agoMerge "Merge "Clear native shader when Paint shader changes" into oc-dev am: d3e78478...
Android Build Merger (Role) [Wed, 7 Jun 2017 17:00:50 +0000 (17:00 +0000)]
Merge "Merge "Clear native shader when Paint shader changes" into oc-dev am: d3e78478aa am: e871596f15" into oc-dr1-dev-plus-aosp

7 years agoMerge "Clear native shader when Paint shader changes" into oc-dev am: d3e78478aa
John Reck [Wed, 7 Jun 2017 16:58:58 +0000 (16:58 +0000)]
Merge "Clear native shader when Paint shader changes" into oc-dev am: d3e78478aa
am: e871596f15

Change-Id: I9813e607ebaec363fe6cd1c7b389b8c4ce2d5e74

7 years agoMerge "Clear native shader when Paint shader changes" into oc-dev am: d3e78478aa
John Reck [Wed, 7 Jun 2017 16:58:09 +0000 (16:58 +0000)]
Merge "Clear native shader when Paint shader changes" into oc-dev am: d3e78478aa
am: 4ee3fb4c54

Change-Id: I9fceeec5fd1db92c7f47f0bcde5278b0e84a6b55

7 years agoMerge "Clear native shader when Paint shader changes" into oc-dev
John Reck [Wed, 7 Jun 2017 16:49:12 +0000 (16:49 +0000)]
Merge "Clear native shader when Paint shader changes" into oc-dev
am: d3e78478aa

Change-Id: I7d96db34b1894e1064116b830a8fb159ad4c57b0

7 years agoMerge "Clear native shader when Paint shader changes" into oc-dev
John Reck [Wed, 7 Jun 2017 16:49:08 +0000 (16:49 +0000)]
Merge "Clear native shader when Paint shader changes" into oc-dev
am: d3e78478aa

Change-Id: I8d9c87e232ee1bbc77f3c5618f5856e891c78a74

7 years agoMerge "Clear native shader when Paint shader changes" into oc-dev
John Reck [Wed, 7 Jun 2017 16:42:43 +0000 (16:42 +0000)]
Merge "Clear native shader when Paint shader changes" into oc-dev

7 years agoMerge "Merge "Use correct timebase in fg service notifications." into oc-dev am:...
Daniel Sandler [Wed, 7 Jun 2017 15:52:00 +0000 (15:52 +0000)]
Merge "Merge "Use correct timebase in fg service notifications." into oc-dev am: 630e7841e5 am: 107bfc46c6" into oc-dr1-dev-plus-aosp
am: 5774a889d7

Change-Id: Iab055c57296302b9fbac93e8a7955781c1b416b8

7 years agoMerge "Use correct timebase in fg service notifications." into oc-dev am: 630e7841e5...
Daniel Sandler [Wed, 7 Jun 2017 15:49:41 +0000 (15:49 +0000)]
Merge "Use correct timebase in fg service notifications." into oc-dev am: 630e7841e5 am: 2fe945c3a9
am: fec9ff30c0

Change-Id: I53a604aa950de58970e9dfb43e5846ecbe56a634

7 years agoMerge "Merge "Fixed NPE in TaskStack.stepAppWindowAnimation" into oc-dev am: 7925f817...
Wale Ogunwale [Wed, 7 Jun 2017 15:47:11 +0000 (15:47 +0000)]
Merge "Merge "Fixed NPE in TaskStack.stepAppWindowAnimation" into oc-dev am: 7925f817d0 am: 805e32d19d" into oc-dr1-dev-plus-aosp
am: ce8b01a53a

Change-Id: I728b28e0ae326ca03ad020d2c243d9ebc70e1b80

7 years agoMerge "Fixed NPE in TaskStack.stepAppWindowAnimation" into oc-dev am: 7925f817d0...
Wale Ogunwale [Wed, 7 Jun 2017 15:45:05 +0000 (15:45 +0000)]
Merge "Fixed NPE in TaskStack.stepAppWindowAnimation" into oc-dev am: 7925f817d0 am: ffbef55373
am: 56fa261fec

Change-Id: I93eb7ccc1a12621dc1a06d4576b788c7fbde1d83

7 years agoMerge "Add additional mocking for Context innards" am: a65aa77c1c am: 35182218d3...
Erik Kline [Wed, 7 Jun 2017 15:42:31 +0000 (15:42 +0000)]
Merge "Add additional mocking for Context innards" am: a65aa77c1c am: 35182218d3 am: f22995eed5 am: 48c3c00ee1
am: 4a1059ca0e

Change-Id: I2695841bfc31280060754132e589af1ca95911da

7 years agoMerge "Change Android default icon b/35314247 Test: manual" into oc-dev am: bb4aeb19b...
Hyunyoung Song [Wed, 7 Jun 2017 15:39:58 +0000 (15:39 +0000)]
Merge "Change Android default icon b/35314247 Test: manual" into oc-dev am: bb4aeb19be am: 38568aff22
am: af63dabff9

Change-Id: I3e0df515908b03ff5af350d21f9e113d6606f0b4

7 years agoMerge "Actually wait until the display is ready." into oc-dev am: 496267f93b am:...
Michael Wright [Wed, 7 Jun 2017 15:37:33 +0000 (15:37 +0000)]
Merge "Actually wait until the display is ready." into oc-dev am: 496267f93b am: 9468ded040
am: 7e4ea727e2

Change-Id: I58a0f10a8a8c6e02b70218313319fd0de848c05d

7 years agoMerge "Captive portal login shows specific network name" am: 01fb05cf62 am: 93fe99aca...
Hugo Benichi [Wed, 7 Jun 2017 15:35:33 +0000 (15:35 +0000)]
Merge "Captive portal login shows specific network name" am: 01fb05cf62 am: 93fe99aca4 am: 75faf02f04 am: f5b8d18798
am: 6c91a5bfad

Change-Id: I63f264673f4eb34e69a199f39552704196ab6a78

7 years agoMerge "Change Android default icon b/35314247 Test: manual" into oc-dev am: bb4aeb19b...
Hyunyoung Song [Wed, 7 Jun 2017 15:33:05 +0000 (15:33 +0000)]
Merge "Change Android default icon b/35314247 Test: manual" into oc-dev am: bb4aeb19be am: 537a788091
am: d241ae7bd0

Change-Id: I6ad58d21f8ea2678f7ac954cf34cf55ef2f5b46f

7 years agoMerge "Actually wait until the display is ready." into oc-dev am: 496267f93b am:...
Michael Wright [Wed, 7 Jun 2017 15:30:40 +0000 (15:30 +0000)]
Merge "Actually wait until the display is ready." into oc-dev am: 496267f93b am: d581113dc1
am: 428bb9a193

Change-Id: I39ae10c4776bfabb7f3aadd893f650e9fcda32c7

7 years agoMerge "Merge "Use correct timebase in fg service notifications." into oc-dev am:...
Android Build Merger (Role) [Wed, 7 Jun 2017 15:10:58 +0000 (15:10 +0000)]
Merge "Merge "Use correct timebase in fg service notifications." into oc-dev am: 630e7841e5 am: 107bfc46c6" into oc-dr1-dev-plus-aosp

7 years agoMerge "Use correct timebase in fg service notifications." into oc-dev am: 630e7841e5
Daniel Sandler [Wed, 7 Jun 2017 15:09:57 +0000 (15:09 +0000)]
Merge "Use correct timebase in fg service notifications." into oc-dev am: 630e7841e5
am: 107bfc46c6

Change-Id: I407983d32ce8d2a6758f0125963d128db496d225

7 years agoMerge "Use correct timebase in fg service notifications." into oc-dev am: 630e7841e5
Daniel Sandler [Wed, 7 Jun 2017 15:07:25 +0000 (15:07 +0000)]
Merge "Use correct timebase in fg service notifications." into oc-dev am: 630e7841e5
am: 2fe945c3a9

Change-Id: I5d851b00b92c88bf9b23bbdd021c207714abd6d9

7 years agoMerge "Use correct timebase in fg service notifications." into oc-dev
Daniel Sandler [Wed, 7 Jun 2017 15:02:00 +0000 (15:02 +0000)]
Merge "Use correct timebase in fg service notifications." into oc-dev
am: 630e7841e5

Change-Id: Idde8d539f4f49bcf171e060d6c6483e375748346

7 years agoMerge "Use correct timebase in fg service notifications." into oc-dev
Daniel Sandler [Wed, 7 Jun 2017 15:02:00 +0000 (15:02 +0000)]
Merge "Use correct timebase in fg service notifications." into oc-dev
am: 630e7841e5

Change-Id: I3493f13c16b24d343f61e80d70f37cf62d6b8ee2

7 years agoMerge "Add a WM API to query the touch region for the input method window"
TreeHugger Robot [Wed, 7 Jun 2017 15:00:29 +0000 (15:00 +0000)]
Merge "Add a WM API to query the touch region for the input method window"

7 years agoMerge "Use correct timebase in fg service notifications." into oc-dev
Daniel Sandler [Wed, 7 Jun 2017 14:56:41 +0000 (14:56 +0000)]
Merge "Use correct timebase in fg service notifications." into oc-dev

7 years agoMerge "Merge "Fixed NPE in TaskStack.stepAppWindowAnimation" into oc-dev am: 7925f817...
Android Build Merger (Role) [Wed, 7 Jun 2017 14:00:43 +0000 (14:00 +0000)]
Merge "Merge "Fixed NPE in TaskStack.stepAppWindowAnimation" into oc-dev am: 7925f817d0 am: 805e32d19d" into oc-dr1-dev-plus-aosp

7 years agoMerge "Fixed NPE in TaskStack.stepAppWindowAnimation" into oc-dev am: 7925f817d0
Wale Ogunwale [Wed, 7 Jun 2017 13:58:26 +0000 (13:58 +0000)]
Merge "Fixed NPE in TaskStack.stepAppWindowAnimation" into oc-dev am: 7925f817d0
am: ffbef55373

Change-Id: I77e47932a4a74ddcebf9138b009407f144d5f725

7 years agoMerge "Fixed NPE in TaskStack.stepAppWindowAnimation" into oc-dev am: 7925f817d0
Wale Ogunwale [Wed, 7 Jun 2017 13:58:22 +0000 (13:58 +0000)]
Merge "Fixed NPE in TaskStack.stepAppWindowAnimation" into oc-dev am: 7925f817d0
am: 805e32d19d

Change-Id: If05930440d7e095b46a0a65ebe1e03fa1741b02b

7 years agoMerge "Fixed NPE in TaskStack.stepAppWindowAnimation" into oc-dev
Wale Ogunwale [Wed, 7 Jun 2017 13:50:25 +0000 (13:50 +0000)]
Merge "Fixed NPE in TaskStack.stepAppWindowAnimation" into oc-dev
am: 7925f817d0

Change-Id: I0b957a0a67a9e245d51dce610acef97d6b72fa04

7 years agoMerge "Fixed NPE in TaskStack.stepAppWindowAnimation" into oc-dev
Wale Ogunwale [Wed, 7 Jun 2017 13:50:25 +0000 (13:50 +0000)]
Merge "Fixed NPE in TaskStack.stepAppWindowAnimation" into oc-dev
am: 7925f817d0

Change-Id: If142910eebf83a19e863004592335b38b94e1763

7 years agoMerge "Fixed NPE in TaskStack.stepAppWindowAnimation" into oc-dev
Wale Ogunwale [Wed, 7 Jun 2017 13:45:02 +0000 (13:45 +0000)]
Merge "Fixed NPE in TaskStack.stepAppWindowAnimation" into oc-dev

7 years agoMake DND tile primary toggle remember favorite zen
Jason Monk [Wed, 7 Jun 2017 13:15:54 +0000 (09:15 -0400)]
Make DND tile primary toggle remember favorite zen

Test: manual
Change-Id: I2b589dbabf4bd7704d4df968ecbd986604e3b757
Fixes: 37794901

7 years agoMerge "Add additional mocking for Context innards" am: a65aa77c1c am: 35182218d3...
Erik Kline [Wed, 7 Jun 2017 09:59:43 +0000 (09:59 +0000)]
Merge "Add additional mocking for Context innards" am: a65aa77c1c am: 35182218d3 am: f22995eed5
am: 48c3c00ee1

Change-Id: I9a05f34035a15b233a44d517f2b2426481679974

7 years agoMerge "Add additional mocking for Context innards" am: a65aa77c1c am: 35182218d3
Erik Kline [Wed, 7 Jun 2017 09:51:52 +0000 (09:51 +0000)]
Merge "Add additional mocking for Context innards" am: a65aa77c1c am: 35182218d3
am: f22995eed5

Change-Id: Ibde5e3e048236d32ea3c1ba2c2700bb6a75323e6

7 years agoMerge "Add additional mocking for Context innards" am: a65aa77c1c
Erik Kline [Wed, 7 Jun 2017 09:46:11 +0000 (09:46 +0000)]
Merge "Add additional mocking for Context innards" am: a65aa77c1c
am: 35182218d3

Change-Id: I7f08086badfddcf9d667a749cf035e36366f9a7c

7 years agoMerge "Add additional mocking for Context innards"
Erik Kline [Wed, 7 Jun 2017 09:40:37 +0000 (09:40 +0000)]
Merge "Add additional mocking for Context innards"
am: a65aa77c1c

Change-Id: I7f780c05c46b00457b194bfb13df5814735f0809

7 years agoMerge "Add additional mocking for Context innards"
Treehugger Robot [Wed, 7 Jun 2017 09:32:02 +0000 (09:32 +0000)]
Merge "Add additional mocking for Context innards"

7 years agoMerge "Change Android default icon b/35314247 Test: manual" into oc-dev am: bb4aeb19be
Hyunyoung Song [Wed, 7 Jun 2017 09:14:05 +0000 (09:14 +0000)]
Merge "Change Android default icon b/35314247 Test: manual" into oc-dev am: bb4aeb19be
am: 38568aff22

Change-Id: I913abeb2222f1fb4af814ea9741608671e30fa30

7 years agoMerge "Introduce legacy settings restore whitelists"
TreeHugger Robot [Wed, 7 Jun 2017 09:11:18 +0000 (09:11 +0000)]
Merge "Introduce legacy settings restore whitelists"

7 years agoMerge "Actually wait until the display is ready." into oc-dev am: 496267f93b
Michael Wright [Wed, 7 Jun 2017 09:11:06 +0000 (09:11 +0000)]
Merge "Actually wait until the display is ready." into oc-dev am: 496267f93b
am: 9468ded040

Change-Id: If985d418af3dae02bff7c40cdb30051c8eaaf7ab

7 years agoMerge "Change Android default icon b/35314247 Test: manual" into oc-dev
Hyunyoung Song [Wed, 7 Jun 2017 09:04:17 +0000 (09:04 +0000)]
Merge "Change Android default icon b/35314247 Test: manual" into oc-dev
am: bb4aeb19be

Change-Id: I7a80c68f227d2596f3863b9f234d31a7143ca33c

7 years agoMerge "Actually wait until the display is ready." into oc-dev
Michael Wright [Wed, 7 Jun 2017 09:00:53 +0000 (09:00 +0000)]
Merge "Actually wait until the display is ready." into oc-dev
am: 496267f93b

Change-Id: I40d9fb13190db81472cde320cccd9a868ea21516

7 years agoMerge "Captive portal login shows specific network name" am: 01fb05cf62 am: 93fe99aca...
Hugo Benichi [Wed, 7 Jun 2017 08:58:04 +0000 (08:58 +0000)]
Merge "Captive portal login shows specific network name" am: 01fb05cf62 am: 93fe99aca4 am: 75faf02f04
am: f5b8d18798

Change-Id: I5f7e59c7bcd7df41e0e243612c93c16fb64038c4

7 years agoMerge "Captive portal login shows specific network name" am: 01fb05cf62 am: 93fe99aca4
Hugo Benichi [Wed, 7 Jun 2017 08:51:43 +0000 (08:51 +0000)]
Merge "Captive portal login shows specific network name" am: 01fb05cf62 am: 93fe99aca4
am: 75faf02f04

Change-Id: I1561ccd2676315f3110f20fcbfbd55453f92cbed

7 years agoAdd additional mocking for Context innards
Erik Kline [Wed, 7 Jun 2017 07:33:19 +0000 (16:33 +0900)]
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

7 years agoMerge "Captive portal login shows specific network name" am: 01fb05cf62
Hugo Benichi [Wed, 7 Jun 2017 08:43:08 +0000 (08:43 +0000)]
Merge "Captive portal login shows specific network name" am: 01fb05cf62
am: 93fe99aca4

Change-Id: Ie4a418296de498b7d4b4eca75f2d0b3192ed4c64

7 years agoMerge "Change Android default icon b/35314247 Test: manual" into oc-dev am: bb4aeb19be
Hyunyoung Song [Wed, 7 Jun 2017 08:39:54 +0000 (08:39 +0000)]
Merge "Change Android default icon b/35314247 Test: manual" into oc-dev am: bb4aeb19be
am: 537a788091

Change-Id: I002dd3afdbbdfe2db2fc42a4139936c198dccdac

7 years agoMerge "Actually wait until the display is ready." into oc-dev am: 496267f93b
Michael Wright [Wed, 7 Jun 2017 08:37:47 +0000 (08:37 +0000)]
Merge "Actually wait until the display is ready." into oc-dev am: 496267f93b
am: d581113dc1

Change-Id: I6a9d56e5c6678a1e1d75e9cf74c27362e288a7b3

7 years agoMerge "Captive portal login shows specific network name"
Hugo Benichi [Wed, 7 Jun 2017 08:35:51 +0000 (08:35 +0000)]
Merge "Captive portal login shows specific network name"
am: 01fb05cf62

Change-Id: I205b37d204250d7fc188b2d7d23593d22d03b89d

7 years agoMerge "Captive portal login shows specific network name"
Hugo Benichi [Wed, 7 Jun 2017 08:11:20 +0000 (08:11 +0000)]
Merge "Captive portal login shows specific network name"

7 years agoMerge "Change Android default icon b/35314247 Test: manual" into oc-dev am: bb4aeb19be
Hyunyoung Song [Wed, 7 Jun 2017 08:08:24 +0000 (08:08 +0000)]
Merge "Change Android default icon b/35314247 Test: manual" into oc-dev am: bb4aeb19be
am: 537a788091

Change-Id: I21cbccf44ebff1b7ed8c9cf21a6ca3583a5ec214

7 years agoMerge "Change Android default icon b/35314247 Test: manual" into oc-dev
Hyunyoung Song [Wed, 7 Jun 2017 07:58:58 +0000 (07:58 +0000)]
Merge "Change Android default icon b/35314247 Test: manual" into oc-dev
am: bb4aeb19be

Change-Id: Ie9996ca6a1197dbaf877229c932eba758e15eb5d

7 years agoMerge "Change Android default icon b/35314247 Test: manual" into oc-dev
TreeHugger Robot [Wed, 7 Jun 2017 07:50:14 +0000 (07:50 +0000)]
Merge "Change Android default icon b/35314247 Test: manual" into oc-dev

7 years agoMerge "Actually wait until the display is ready." into oc-dev am: 496267f93b
Michael Wright [Wed, 7 Jun 2017 07:40:56 +0000 (07:40 +0000)]
Merge "Actually wait until the display is ready." into oc-dev am: 496267f93b
am: d581113dc1

Change-Id: If144b976ba2e5e375760b1f26f8472533a5b20cc

7 years agoMerge "Actually wait until the display is ready." into oc-dev
Michael Wright [Wed, 7 Jun 2017 07:32:49 +0000 (07:32 +0000)]
Merge "Actually wait until the display is ready." into oc-dev
am: 496267f93b

Change-Id: I41bf93f65c215cc841485c7570c7a7e78a0fdf93

7 years agoMerge "Actually wait until the display is ready." into oc-dev
TreeHugger Robot [Wed, 7 Jun 2017 07:22:52 +0000 (07:22 +0000)]
Merge "Actually wait until the display is ready." into oc-dev

7 years agoMerge "Vibrator: Allow priority vibrations in low-power mode for accessibility."...
Tyler Freeman [Wed, 7 Jun 2017 06:48:58 +0000 (06:48 +0000)]
Merge "Vibrator: Allow priority vibrations in low-power mode for accessibility." into oc-dev am: ac36c42a86
am: 8cb653925b

Change-Id: I7abd446e96368b50eeff92ea134aeea6999f7c7a

7 years agoMerge "Vibrator: Allow priority vibrations in low-power mode for accessibility."...
Tyler Freeman [Wed, 7 Jun 2017 06:38:38 +0000 (06:38 +0000)]
Merge "Vibrator: Allow priority vibrations in low-power mode for accessibility." into oc-dev
am: ac36c42a86

Change-Id: Ib30211346cbce8dbb0853469c17994f23b7c456d

7 years agoMerge "Vibrator: Allow priority vibrations in low-power mode for accessibility."...
TreeHugger Robot [Wed, 7 Jun 2017 06:33:03 +0000 (06:33 +0000)]
Merge "Vibrator: Allow priority vibrations in low-power mode for accessibility." into oc-dev

7 years agoMerge "Move tests with private APIs to coretests"
Roozbeh Pournader [Wed, 7 Jun 2017 06:21:40 +0000 (06:21 +0000)]
Merge "Move tests with private APIs to coretests"

7 years agoMerge "Only show the "Disable eSIM" when eSIM profile is enabled"
Qingxi Li [Wed, 7 Jun 2017 04:50:21 +0000 (04:50 +0000)]
Merge "Only show the "Disable eSIM" when eSIM profile is enabled"

7 years agoMerge "Fix crash in test" into oc-dev am: d5ece513ec
Jorim Jaggi [Wed, 7 Jun 2017 04:27:53 +0000 (04:27 +0000)]
Merge "Fix crash in test" into oc-dev am: d5ece513ec
am: 3a981207ce

Change-Id: I0f564ed2cee6ad4e45968704a4c64029644bbc4c

7 years agoMerge "Fix crash in test" into oc-dev
Jorim Jaggi [Wed, 7 Jun 2017 04:20:40 +0000 (04:20 +0000)]
Merge "Fix crash in test" into oc-dev
am: d5ece513ec

Change-Id: I923f532600fe7b3fe372fd4cf2469c2ea2b03569

7 years agoMerge "Fix crash in test" into oc-dev
TreeHugger Robot [Wed, 7 Jun 2017 04:12:44 +0000 (04:12 +0000)]
Merge "Fix crash in test" into oc-dev

7 years agoMerge "Merge "Better handle non-recommended use and warn against it in JavaDoc" into...
Doris Liu [Wed, 7 Jun 2017 03:58:45 +0000 (03:58 +0000)]
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

7 years agoMerge "Revert "Captive portal login shows specific network name"" am: 7f423d00dd...
Hugo Benichi [Wed, 7 Jun 2017 03:54:12 +0000 (03:54 +0000)]
Merge "Revert "Captive portal login shows specific network name"" am: 7f423d00dd am: 24912bb93d am: 41415facc8
am: 335a1d36ea

Change-Id: Ib6285780806a9bbffc9bb302085e78f72c27b1be

7 years agoMerge "Merge "Better handle non-recommended use and warn against it in JavaDoc" into...
Android Build Merger (Role) [Wed, 7 Jun 2017 03:50:33 +0000 (03:50 +0000)]
Merge "Merge "Better handle non-recommended use and warn against it in JavaDoc" into oc-dev am: 8d06d8cbf1" into oc-dev-plus-aosp

7 years agoMerge "Better handle non-recommended use and warn against it in JavaDoc" into oc-dev
Doris Liu [Wed, 7 Jun 2017 03:49:44 +0000 (03:49 +0000)]
Merge "Better handle non-recommended use and warn against it in JavaDoc" into oc-dev
am: 8d06d8cbf1

Change-Id: I3e8680067b360ed5792f9a9d1be953561fca7969

7 years agoMerge "Revert "Captive portal login shows specific network name"" am: 7f423d00dd...
Hugo Benichi [Wed, 7 Jun 2017 03:47:17 +0000 (03:47 +0000)]
Merge "Revert "Captive portal login shows specific network name"" am: 7f423d00dd am: 24912bb93d
am: 41415facc8

Change-Id: Ic93c6170813b8c43176d57b534e405500c4639c1

7 years agoMerge "Better handle non-recommended use and warn against it in JavaDoc" into oc-dev
Doris Liu [Wed, 7 Jun 2017 03:43:07 +0000 (03:43 +0000)]
Merge "Better handle non-recommended use and warn against it in JavaDoc" into oc-dev

7 years agoMerge "Revert "Captive portal login shows specific network name"" am: 7f423d00dd
Hugo Benichi [Wed, 7 Jun 2017 03:41:13 +0000 (03:41 +0000)]
Merge "Revert "Captive portal login shows specific network name"" am: 7f423d00dd
am: 24912bb93d

Change-Id: Ief5a666699e64cf5d5fc79de1b7964f473898f78

7 years agoCaptive portal login shows specific network name
Hugo Benichi [Thu, 1 Jun 2017 03:58:49 +0000 (12:58 +0900)]
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

7 years agoMerge "Revert "Captive portal login shows specific network name""
Hugo Benichi [Wed, 7 Jun 2017 03:32:09 +0000 (03:32 +0000)]
Merge "Revert "Captive portal login shows specific network name""
am: 7f423d00dd

Change-Id: I0d77f19cadbf5905215ae576e66057a259f2348e

7 years agoMerge "Revert "Captive portal login shows specific network name""
Hugo Benichi [Wed, 7 Jun 2017 03:23:16 +0000 (03:23 +0000)]
Merge "Revert "Captive portal login shows specific network name""

7 years agoRevert "Captive portal login shows specific network name"
Hugo Benichi [Wed, 7 Jun 2017 03:22:20 +0000 (03:22 +0000)]
Revert "Captive portal login shows specific network name"

This reverts commit 8032ff32ff9c2b6684bd365059f88a858272b633.

Several branches are broken because of this.

Change-Id: I2d9f8b1cc8f93ed8de7d1e01d49c7cd29417820d

7 years agoMerge "Captive portal login shows specific network name" am: ea7322d17e am: d4cb33b83...
Hugo Benichi [Wed, 7 Jun 2017 03:03:12 +0000 (03:03 +0000)]
Merge "Captive portal login shows specific network name" am: ea7322d17e am: d4cb33b83f am: 6f2d79464d
am: 8d60db5241

Change-Id: I9484e2d577ca547bbff4b516fcb445b4e8cdcdef

7 years agoMerge "Captive portal login shows specific network name" am: ea7322d17e am: d4cb33b83f
Hugo Benichi [Wed, 7 Jun 2017 02:56:15 +0000 (02:56 +0000)]
Merge "Captive portal login shows specific network name" am: ea7322d17e am: d4cb33b83f
am: 6f2d79464d

Change-Id: I88dc4240bc4a8eb84bc3edd7a9f5a873296075fd

7 years agoMerge "Captive portal login shows specific network name" am: ea7322d17e
Hugo Benichi [Wed, 7 Jun 2017 02:49:05 +0000 (02:49 +0000)]
Merge "Captive portal login shows specific network name" am: ea7322d17e
am: d4cb33b83f

Change-Id: Ie52f17dced7db6dfb6c58f935bf976ff72fa723d

7 years agoMerge "Captive portal login shows specific network name"
Hugo Benichi [Wed, 7 Jun 2017 02:42:36 +0000 (02:42 +0000)]
Merge "Captive portal login shows specific network name"
am: ea7322d17e

Change-Id: I48abfa9523854ea3f30883e92d6d3011d41c6a66

7 years agoMerge "Remove unnecessary code"
TreeHugger Robot [Wed, 7 Jun 2017 02:36:12 +0000 (02:36 +0000)]
Merge "Remove unnecessary code"

7 years agoMerge "Captive portal login shows specific network name"
Hugo Benichi [Wed, 7 Jun 2017 02:33:02 +0000 (02:33 +0000)]
Merge "Captive portal login shows specific network name"

7 years agoMerge "Add config_headlineFontFamily."
Andrew Sapperstein [Wed, 7 Jun 2017 02:21:53 +0000 (02:21 +0000)]
Merge "Add config_headlineFontFamily."

7 years agoMerge "Add strings for improving Wifi wrong password UX"
TreeHugger Robot [Wed, 7 Jun 2017 02:20:59 +0000 (02:20 +0000)]
Merge "Add strings for improving Wifi wrong password UX"

7 years agoAdd config_headlineFontFamily.
Andrew Sapperstein [Tue, 6 Jun 2017 01:30:06 +0000 (18:30 -0700)]
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

7 years agoBetter handle non-recommended use and warn against it in JavaDoc
Doris Liu [Tue, 6 Jun 2017 21:56:02 +0000 (14:56 -0700)]
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

7 years agoMerge "Fix "OK" speed label string."
TreeHugger Robot [Wed, 7 Jun 2017 01:23:31 +0000 (01:23 +0000)]
Merge "Fix "OK" speed label string."

7 years agoMerge "Don't report focusableViewAvailable on add" into oc-dev am: 8d4b72c68a
Evan Rosky [Wed, 7 Jun 2017 01:19:12 +0000 (01:19 +0000)]
Merge "Don't report focusableViewAvailable on add" into oc-dev am: 8d4b72c68a
am: 2b64c87366

Change-Id: I76ffe2869425314f43b0fc2044b8bb8d80619689

7 years agoVibrator: Allow priority vibrations in low-power mode for accessibility.
Tyler Freeman [Fri, 5 May 2017 00:23:35 +0000 (17:23 -0700)]
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

7 years agoMerge "Don't report focusableViewAvailable on add" into oc-dev
Evan Rosky [Wed, 7 Jun 2017 01:09:17 +0000 (01:09 +0000)]
Merge "Don't report focusableViewAvailable on add" into oc-dev
am: 8d4b72c68a

Change-Id: I4169c2ecf3890946090e4c171a666292262118f6

7 years agoMerge "Merge "Fixed autofill filter comparison." into oc-dev am: 72f2d98c5a am: 4d47d...
Android Build Merger (Role) [Wed, 7 Jun 2017 01:07:26 +0000 (01:07 +0000)]
Merge "Merge "Fixed autofill filter comparison." into oc-dev am: 72f2d98c5a am: 4d47d7ad46"

7 years agoMerge "Fixed autofill filter comparison." into oc-dev am: 72f2d98c5a
Felipe Leme [Wed, 7 Jun 2017 01:05:39 +0000 (01:05 +0000)]
Merge "Fixed autofill filter comparison." into oc-dev am: 72f2d98c5a
am: 4d47d7ad46

Change-Id: Ic6d4af3752da2672ce172f09022e0dfaf1bd0810

7 years agoMerge changes from topic 'dungeon-master'
TreeHugger Robot [Wed, 7 Jun 2017 01:05:16 +0000 (01:05 +0000)]
Merge changes from topic 'dungeon-master'

* changes:
  Hide redundant foreground service notifications.
  Updates to Dianne's Dungeon.

7 years agoMerge "Improved debug to diagnose Save issues." into oc-dev am: be4420cf13
Felipe Leme [Wed, 7 Jun 2017 01:02:34 +0000 (01:02 +0000)]
Merge "Improved debug to diagnose Save issues." into oc-dev am: be4420cf13
am: 34e7f3b6ba

Change-Id: I86366b96742aafd1c9f6f9f7a1dc278f0275e3ff

7 years agoMerge "Don't report focusableViewAvailable on add" into oc-dev
Evan Rosky [Wed, 7 Jun 2017 01:02:13 +0000 (01:02 +0000)]
Merge "Don't report focusableViewAvailable on add" into oc-dev

7 years agoMerge "Use initial value on save when value didn't change." into oc-dev am: 2e723982d5
Felipe Leme [Wed, 7 Jun 2017 00:57:16 +0000 (00:57 +0000)]
Merge "Use initial value on save when value didn't change." into oc-dev am: 2e723982d5
am: 08365011a2

Change-Id: I38b2e8096b7fe43a294afe400af093b49616335d

7 years agoMerge "Fixed autofill filter comparison." into oc-dev
Felipe Leme [Wed, 7 Jun 2017 00:55:27 +0000 (00:55 +0000)]
Merge "Fixed autofill filter comparison." into oc-dev
am: 72f2d98c5a

Change-Id: I1fef87940fe08d875d3d449a830bd652871e2505