OSDN Git Service
Lucas Dupin [Sat, 19 May 2018 00:24:52 +0000 (17:24 -0700)]
Keep scrim black when "always on" is off
The first frame when waking up is expensive and we
need a black scrim hiding what was left behind.
Bug:
78022321
Test: atest packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/ScrimControllerTest.java
Change-Id: I99e2b7960daf2cbe51bec6aee4b15c74d532078c
Dmitry Dementyev [Fri, 18 May 2018 17:56:25 +0000 (17:56 +0000)]
Merge "Check the return values after updating Recoverable KeyStore Database." into pi-dev
TreeHugger Robot [Fri, 18 May 2018 17:34:51 +0000 (17:34 +0000)]
Merge "wifi.proto: Add metrics for softap band preference unsatisfied" into pi-dev
Jorim Jaggi [Fri, 18 May 2018 17:24:43 +0000 (17:24 +0000)]
Merge "Fixes for SyncRtSurfaceTransactionApplier" into pi-dev
TreeHugger Robot [Fri, 18 May 2018 17:09:36 +0000 (17:09 +0000)]
Merge "Add a hidden flag to indicate exif data block." into pi-dev
Jorim Jaggi [Fri, 18 May 2018 16:23:08 +0000 (18:23 +0200)]
Fixes for SyncRtSurfaceTransactionApplier
Such that launcher can use it.
Test: Open/close app
Bug:
78611607
Change-Id: I8e66b983035eb8da9dd8349e2a5b57d3631df74f
Selim Cinek [Fri, 18 May 2018 16:20:40 +0000 (16:20 +0000)]
Merge "Keep notification when sending smart reply." into pi-dev
Makoto Onuki [Fri, 18 May 2018 15:13:27 +0000 (15:13 +0000)]
Merge "Suppress service start timeout for services within system server," into pi-dev
Nicolas Geoffray [Fri, 18 May 2018 14:28:46 +0000 (14:28 +0000)]
Merge "More light grey APIs." into pi-dev
Adrian Roos [Fri, 18 May 2018 14:22:11 +0000 (14:22 +0000)]
Merge "WM: Perform layout based on the requested flags" into pi-dev
TreeHugger Robot [Fri, 18 May 2018 14:21:48 +0000 (14:21 +0000)]
Merge "Don't always set the clock to View.GONE" into pi-dev
TreeHugger Robot [Fri, 18 May 2018 14:06:18 +0000 (14:06 +0000)]
Merge "PIP: Fix transition to and from PiP when letterboxed" into pi-dev
TreeHugger Robot [Fri, 18 May 2018 13:30:29 +0000 (13:30 +0000)]
Merge "WM: Prevent unminimizing docked stack on AOD" into pi-dev
Nicolas Geoffray [Fri, 18 May 2018 13:10:43 +0000 (13:10 +0000)]
Merge "More light grey APIs." into pi-dev
Nicolas Geoffray [Fri, 18 May 2018 13:10:10 +0000 (13:10 +0000)]
Merge "Add one new API to light grey." into pi-dev
Adrian Roos [Tue, 15 May 2018 18:13:13 +0000 (20:13 +0200)]
PIP: Fix transition to and from PiP when letterboxed
When an app is letterboxed, it cannot always take up the full
task bounds, and we need to constrain the PIP animations to
the constraints imposed by the layout.
Change-Id: If238ddfb4462c7e1e5c975f76666ad1d4ec3b076
Fixes:
77802617
Test: Enable cutout emulation, enter landscape, verify transitions both into and out of pip work as intended.
Test: atest ActivityManagerPinnedStackTests
Adrian Roos [Thu, 17 May 2018 15:32:26 +0000 (17:32 +0200)]
WM: Prevent unminimizing docked stack on AOD
When we go to AOD, we hide Home's app token - which causes
the docked stack to unminimize. There was some protection against
that because the same thing happens on the keyguard, but that did
not work because the keyguard state is not aware of AOD. Instead,
we pipe the source of truth from AM down to WM and use this instead.
Change-Id: I68d1079a6bbd9080816ee52c1b5650623a661421
Fixes:
79267409
Test: Enter split screen, go to home, turn of screen, turn on screen. Verify docked stack stays minimized and there is no janky transition
Jorim Jaggi [Fri, 18 May 2018 11:49:56 +0000 (11:49 +0000)]
Merge changes I608d4b61,Ia7900e75 into pi-dev
* changes:
Follow up to Ia7900e753b29187a7a7b81f393666687e8b8e04b
Apply surface parameters in sync with RenderThread
Adrian Roos [Thu, 17 May 2018 17:08:21 +0000 (19:08 +0200)]
WM: Perform layout based on the requested flags
When the global system ui visibility changes,
this clears certain sysui flags from windows. However,
if we then use this value to perform layout, we might
lay out the window in a way the app did not expect and
that is not stable during transitions in and out of
full screen.
To fix this, always use the sysUiFl that the app provided
in its window attributes, instead of using the window state's
changing state.
Change-Id: I5f9b3ed37be84553e9e2d912a102675beb6fc11a
Fixes:
76084813
Test: Open Video in browser, enter full screen, play, press home. Verify transition into PiP is smooth.
Jorim Jaggi [Wed, 16 May 2018 21:37:02 +0000 (14:37 -0700)]
Follow up to Ia7900e753b29187a7a7b81f393666687e8b8e04b
Test: Open notification
Bug:
78611607
Change-Id: I608d4b619d5e236c1c874c8c7613f35574d45fd4
Merged-In: I608d4b619d5e236c1c874c8c7613f35574d45fd4
TreeHugger Robot [Fri, 18 May 2018 07:59:58 +0000 (07:59 +0000)]
Merge "Add explicit override for default Private DNS mode" into pi-dev
Kristian Monsen [Fri, 18 May 2018 07:44:55 +0000 (07:44 +0000)]
Merge "Remove most sounds" into pi-dev
Bill Yi [Fri, 18 May 2018 02:15:22 +0000 (19:15 -0700)]
Merge changes from topic "am-
99e79364-ab71-4d96-8a34-
000c07c66d3e" into oc-dev am:
abf0ff542a am:
4d58eb3bc1
am:
e388855c62
Change-Id: Ifc6bb00979b4390f099b9c169843a47f94a21235
Bill Yi [Fri, 18 May 2018 02:10:00 +0000 (19:10 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
c2a85c8927 skipped:
43bd9fa8b2 am:
f028e75015 -s ours am:
c22431c753 -s ours
am:
4ec0ca5336 -s ours
Change-Id: I6c275134419ff0a7e8e9d0fec9e7056492416913
Bill Yi [Fri, 18 May 2018 01:56:46 +0000 (18:56 -0700)]
Merge changes from topic "am-
e925dddc-33b5-48cc-bddb-
e978735e99b7" into oc-dev am:
c844ea5c96 am:
44042a74c7
am:
5ed1b8864a
Change-Id: Ie3f95b39dfb049f2bdd098866821f3fe5f5fd186
Bill Yi [Fri, 18 May 2018 01:49:54 +0000 (18:49 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
2f53cb7cc0 skipped:
ead9437423 am:
f3df46779d -s ours am:
2fe6455d18 -s ours
am:
1531155e0d -s ours
Change-Id: I9a3f23a981837deaa6d26c4acfc11f0c19b9d32e
Bill Yi [Fri, 18 May 2018 01:43:23 +0000 (18:43 -0700)]
Merge changes from topic "am-
3142fca9-100b-4dd4-8848-
117761166ffe" into oc-dev am:
a86ba9b6e5 am:
7c05674594
am:
08f437f2b4
Change-Id: Ic6c4b5b73064e6e1a0fa1e113caf3c638f09ae5d
Bill Yi [Fri, 18 May 2018 01:37:26 +0000 (18:37 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
7b2e87bd96 skipped:
913239f688 am:
1c6bdf5174 -s ours am:
a1df530ac7 -s ours
am:
407d517cb8 -s ours
Change-Id: If2961de1aeb6216c482b84b9fd00657c8d3e47bb
Bill Yi [Fri, 18 May 2018 01:32:19 +0000 (18:32 -0700)]
Merge changes from topic "am-
4a0c0e3d-b1ad-44cf-9088-
b37a160bc2ac" into oc-dev am:
70060539aa am:
aaddf187e4
am:
1803fec75f
Change-Id: I3f4f5501d41ea3b39ff616c0789f2be7b3ced54b
Bill Yi [Fri, 18 May 2018 01:25:29 +0000 (18:25 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
63cef597e2 skipped:
a492d4d55b am:
6959e2b475 -s ours am:
eef34578b3 -s ours
am:
ede8c555e0 -s ours
Change-Id: I0e5265b0cbc53856af61f0f7540ec9c265d28438
Bill Yi [Fri, 18 May 2018 01:14:50 +0000 (18:14 -0700)]
Merge changes from topic "am-
99e79364-ab71-4d96-8a34-
000c07c66d3e" into oc-dev am:
abf0ff542a
am:
4d58eb3bc1
Change-Id: I9bdbdaadbe40bba74e9ca9186e88d6881c25e022
Bill Yi [Fri, 18 May 2018 01:09:52 +0000 (18:09 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
c2a85c8927 skipped:
43bd9fa8b2 am:
f028e75015 -s ours
am:
c22431c753 -s ours
Change-Id: I186355d9122a1eb12b968ff05e91a631f1189b45
Bill Yi [Fri, 18 May 2018 01:03:39 +0000 (18:03 -0700)]
Merge changes from topic "am-
e925dddc-33b5-48cc-bddb-
e978735e99b7" into oc-dev am:
c844ea5c96
am:
44042a74c7
Change-Id: I39a0f64a8a2cb75fee5d9caf50c249f43637762f
Android Build Merger (Role) [Fri, 18 May 2018 01:00:22 +0000 (01:00 +0000)]
Merge changes from topic "am-
d2edaf8079284e4cb27fcc47cdd92f40" into pi-dev
* changes:
Merge changes from topic "am-
d375c8a9-01d8-44da-9ef2-
2e866e457b89" into oc-dev am:
e936691bfc am:
1ea636faa9 am:
e5eaa05dd9
[automerger skipped] Import translations. DO NOT MERGE skipped:
439fdb13fc skipped:
a98b588532 am:
1221af165e -s ours am:
aa961b929b -s ours am:
1190c6d633 -s ours
Bill Yi [Fri, 18 May 2018 00:59:42 +0000 (17:59 -0700)]
Merge changes from topic "am-
d375c8a9-01d8-44da-9ef2-
2e866e457b89" into oc-dev am:
e936691bfc am:
1ea636faa9
am:
e5eaa05dd9
Change-Id: I02abac786f8297ff2dfc225d3f93f82bd7904016
Bill Yi [Fri, 18 May 2018 00:58:50 +0000 (17:58 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
2f53cb7cc0 skipped:
ead9437423 am:
f3df46779d -s ours
am:
2fe6455d18 -s ours
Change-Id: Iddb6db689a98d1f569e79da1a96d716c49cdd5e0
TreeHugger Robot [Fri, 18 May 2018 00:55:35 +0000 (00:55 +0000)]
Merge "Do not allow bouncer translation when scrimmed" into pi-dev
Bill Yi [Fri, 18 May 2018 00:53:05 +0000 (17:53 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
439fdb13fc skipped:
a98b588532 am:
1221af165e -s ours am:
aa961b929b -s ours
am:
1190c6d633 -s ours
Change-Id: I6288d9d8afc635d3465b45b701079738e37f41c9
Bill Yi [Fri, 18 May 2018 00:52:28 +0000 (17:52 -0700)]
Merge changes from topic "am-
3142fca9-100b-4dd4-8848-
117761166ffe" into oc-dev am:
a86ba9b6e5
am:
7c05674594
Change-Id: I8da971740edb6e110fc02bc5ae4e92a3072b3637
TreeHugger Robot [Fri, 18 May 2018 00:51:36 +0000 (00:51 +0000)]
Merge "Fix issue where guts would require bouncer" into pi-dev
Bill Yi [Fri, 18 May 2018 00:47:23 +0000 (17:47 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
7b2e87bd96 skipped:
913239f688 am:
1c6bdf5174 -s ours
am:
a1df530ac7 -s ours
Change-Id: I06393327f4c6cfd8c5c6e4e17d19e2b21817b040
Calin Juravle [Fri, 18 May 2018 00:45:14 +0000 (00:45 +0000)]
Merge "Allow adb to pull profile snapshots" into pi-dev
Bill Yi [Fri, 18 May 2018 00:42:48 +0000 (17:42 -0700)]
Merge changes from topic "am-
646cf556-d36a-48f1-a414-
3797586a8a96" into oc-dev am:
ea5a5f49cc am:
5897727afc
am:
8993fe413b
Change-Id: I05a5acac4a59d51d8a76abbde75f69a76f8acac2
Bill Yi [Fri, 18 May 2018 00:41:19 +0000 (17:41 -0700)]
Merge changes from topic "am-
4a0c0e3d-b1ad-44cf-9088-
b37a160bc2ac" into oc-dev am:
70060539aa
am:
aaddf187e4
Change-Id: I674bd5be030c34e37443c8746c40bcae2704e1b2
Bill Yi [Fri, 18 May 2018 00:36:14 +0000 (17:36 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
a574713e4d skipped:
e7c60be83f am:
4bfac58817 -s ours am:
60682c726c -s ours
am:
ea4170f954 -s ours
Change-Id: I1bb9e3f8b411deaaade34a3e0a8f9c0152f4fc6b
Bill Yi [Fri, 18 May 2018 00:35:54 +0000 (17:35 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
63cef597e2 skipped:
a492d4d55b am:
6959e2b475 -s ours
am:
eef34578b3 -s ours
Change-Id: Ic0a169bd1c11dec7e4bcc8d7a8a2a9ba30d72a6b
Bill Yi [Fri, 18 May 2018 00:30:04 +0000 (17:30 -0700)]
Merge changes from topic "am-
76a20f08-9212-4001-a52b-
dd38a93faa9b" into oc-dev am:
9ede115c2b am:
43539011e4
am:
6aaa85d953
Change-Id: I18a0f5624fca0ff47e28c7a04849ec44fb2c9833
Bill Yi [Fri, 18 May 2018 00:29:10 +0000 (17:29 -0700)]
Merge changes from topic "am-
d375c8a9-01d8-44da-9ef2-
2e866e457b89" into oc-dev am:
e936691bfc
am:
1ea636faa9
Change-Id: I26d60740cd9afc04529a9fb431786c7829ef84f6
Bill Yi [Fri, 18 May 2018 00:23:03 +0000 (17:23 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
053b375862 skipped:
a7875e6a7d am:
81a6ef98f3 -s ours am:
4fb03f2730 -s ours
am:
10a8d67215 -s ours
Change-Id: I43c5a13ff556927a28b931645e197fa09c34b371
Bill Yi [Fri, 18 May 2018 00:23:00 +0000 (17:23 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
439fdb13fc skipped:
a98b588532 am:
1221af165e -s ours
am:
aa961b929b -s ours
Change-Id: Ic0790355c37d9f3501b519dc773466a53f41b3cc
Bill Yi [Fri, 18 May 2018 00:10:29 +0000 (17:10 -0700)]
Merge changes from topic "am-
646cf556-d36a-48f1-a414-
3797586a8a96" into oc-dev am:
ea5a5f49cc
am:
5897727afc
Change-Id: I9fa868feb79839c8090ba44901c09602d48a00d9
Bill Yi [Fri, 18 May 2018 00:09:03 +0000 (17:09 -0700)]
Merge changes from topic "am-
99e79364-ab71-4d96-8a34-
000c07c66d3e" into oc-dev
am:
abf0ff542a
Change-Id: Id3b645350fefaee4071d56d6e4bd368fa535350e
Bill Yi [Fri, 18 May 2018 00:07:45 +0000 (17:07 -0700)]
Merge changes from topic "am-
d1fbdf53-dccb-4215-99ff-
b24698b6bec8" into oc-dev am:
c6c611293d am:
b2f28267ad
am:
8d249b91bd
Change-Id: I98106dea821a12efd704adc279212136971f76bb
Bill Yi [Fri, 18 May 2018 00:07:40 +0000 (17:07 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
c2a85c8927 skipped:
43bd9fa8b2
am:
f028e75015 -s ours
Change-Id: I7415cd61d98275b3d07e17efa2be8026a2a6b6d5
Bill Yi [Fri, 18 May 2018 00:05:08 +0000 (17:05 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
a574713e4d skipped:
e7c60be83f am:
4bfac58817 -s ours
am:
60682c726c -s ours
Change-Id: I43fa56442b50d3935f9769de2fc22bcfb8f38f6f
Bill Yi [Fri, 18 May 2018 00:03:27 +0000 (17:03 -0700)]
Merge changes from topic "am-
e925dddc-33b5-48cc-bddb-
e978735e99b7" into oc-dev
am:
c844ea5c96
Change-Id: Iccd345fb289c4daae404186709dccd4e8fb67fd1
Bill Yi [Fri, 18 May 2018 00:01:48 +0000 (17:01 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
2f53cb7cc0 skipped:
ead9437423
am:
f3df46779d -s ours
Change-Id: I84b536b9e12331834feb59bbe3c58b554506f259
Bill Yi [Fri, 18 May 2018 00:00:55 +0000 (17:00 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
379dacd8c2 skipped:
20306f6ce0 am:
fb795ed727 -s ours am:
c31d960f5e -s ours
am:
3382016c1a -s ours
Change-Id: I241cb07264bd9bb0dc2f5e28ef13033789c17f56
Bill Yi [Thu, 17 May 2018 23:57:51 +0000 (16:57 -0700)]
Merge changes from topic "am-
76a20f08-9212-4001-a52b-
dd38a93faa9b" into oc-dev am:
9ede115c2b
am:
43539011e4
Change-Id: I64ee4058dd334bd0be975016361fa97c905a598d
Bill Yi [Thu, 17 May 2018 23:55:51 +0000 (16:55 -0700)]
Merge changes from topic "am-
3142fca9-100b-4dd4-8848-
117761166ffe" into oc-dev
am:
a86ba9b6e5
Change-Id: I46efd01a25ff71885d5573e28731593a1cebb865
Bill Yi [Thu, 17 May 2018 23:53:52 +0000 (16:53 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
7b2e87bd96 skipped:
913239f688
am:
1c6bdf5174 -s ours
Change-Id: If7d661f6e4fb7d74843ab3a948dba40b7349be55
Bill Yi [Thu, 17 May 2018 23:52:04 +0000 (16:52 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
053b375862 skipped:
a7875e6a7d am:
81a6ef98f3 -s ours
am:
4fb03f2730 -s ours
Change-Id: I0eddfd0423b803df34e4134c294bb58bf165f688
Bill Yi [Thu, 17 May 2018 23:48:54 +0000 (16:48 -0700)]
Merge changes from topic "am-
4a0c0e3d-b1ad-44cf-9088-
b37a160bc2ac" into oc-dev
am:
70060539aa
Change-Id: I871256a76c3af4e37959f729389114c694e15596
Bill Yi [Thu, 17 May 2018 23:47:28 +0000 (16:47 -0700)]
Merge changes from topic "am-
93ef86f6-d908-4917-b503-
5ba7fcefcad8" into oc-dev am:
5667f966e5 am:
e2790f5d0f
am:
7ff9dcf9ee
Change-Id: I7e950f2a72af3be5b030909b025749e3797763c9
Lucas Dupin [Thu, 17 May 2018 02:53:32 +0000 (19:53 -0700)]
Fix issue where guts would require bouncer
There is no need to save the priority if we're
just hiding the controls.
Change-Id: I96551c5d806d5cc4e01a82a7e010000dff029505
Fixes:
78222122
Test: manual
Bill Yi [Thu, 17 May 2018 23:46:58 +0000 (16:46 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
63cef597e2 skipped:
a492d4d55b
am:
6959e2b475 -s ours
Change-Id: I6951039ef2fc1a8770698c6da24944b3cb81ff2a
Bill Yi [Thu, 17 May 2018 23:45:06 +0000 (16:45 -0700)]
Merge changes from topic "am-
d1fbdf53-dccb-4215-99ff-
b24698b6bec8" into oc-dev am:
c6c611293d
am:
b2f28267ad
Change-Id: If282600586310eb4dc03523f4883ff15ac2db651
Bill Yi [Thu, 17 May 2018 23:43:04 +0000 (16:43 -0700)]
Merge changes from topic "am-
d375c8a9-01d8-44da-9ef2-
2e866e457b89" into oc-dev
am:
e936691bfc
Change-Id: I00cd12299a177549e980a01c5e8328306663bbee
Bill Yi [Thu, 17 May 2018 23:40:57 +0000 (16:40 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
439fdb13fc skipped:
a98b588532
am:
1221af165e -s ours
Change-Id: I87afb96b009dbc4bfbc152d5764bc8728f0b0fef
Lucas Dupin [Thu, 17 May 2018 03:41:35 +0000 (20:41 -0700)]
Do not allow bouncer translation when scrimmed
We had special cases when the bouncer shouldn't be translated but that
doesn't really scale. It's much simpler to just check if it's being
scrimmed - because otherwse it mus be translated.
Change-Id: Ide0af6718f1792ef1a1e16fa39512a2b3a0ba8be
Bug:
78222122
Fixes:
78205990
Fixes:
78140990
Test: atest packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/KeyguardBouncerTest.java
Test: atest packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManagerTest.java
Test: go/sysui-bouncer-tests
Bill Yi [Thu, 17 May 2018 23:40:30 +0000 (16:40 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
fc4347f98e skipped:
8b2ac4fffa am:
a72fe6a957 -s ours am:
dc9639ab7f -s ours
am:
ae7467295e -s ours
Change-Id: I635c566063b1a6b77508f434237fc53a6df00bca
Bill Yi [Thu, 17 May 2018 23:39:55 +0000 (16:39 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
379dacd8c2 skipped:
20306f6ce0 am:
fb795ed727 -s ours
am:
c31d960f5e -s ours
Change-Id: I43fdbbc880a880f61b86a1f9e569f8c65196d65b
TreeHugger Robot [Thu, 17 May 2018 23:37:48 +0000 (23:37 +0000)]
Merge "Taking full bug report to get screenshot" into pi-dev
Bill Yi [Thu, 17 May 2018 23:36:39 +0000 (16:36 -0700)]
Merge changes from topic "am-
646cf556-d36a-48f1-a414-
3797586a8a96" into oc-dev
am:
ea5a5f49cc
Change-Id: Ib4683b9918a30e45b255e03b5dc5b38567b0bbe9
Bill Yi [Thu, 17 May 2018 23:35:10 +0000 (16:35 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
a574713e4d skipped:
e7c60be83f
am:
4bfac58817 -s ours
Change-Id: I910a028d8a4945d0dbbd6334b1d95fc85dd162a1
Bill Yi [Thu, 17 May 2018 23:34:41 +0000 (16:34 -0700)]
Merge changes from topic "am-
93ef86f6-d908-4917-b503-
5ba7fcefcad8" into oc-dev am:
5667f966e5
am:
e2790f5d0f
Change-Id: Ifa350e4e880263f58b6eb5ade4fdee5427fcb08b
Bill Yi [Thu, 17 May 2018 23:31:32 +0000 (16:31 -0700)]
Merge changes from topic "am-
76a20f08-9212-4001-a52b-
dd38a93faa9b" into oc-dev
am:
9ede115c2b
Change-Id: Ida64b0840ce3569aa8a3ca5bb82a08de30ba3a23
Bill Yi [Thu, 17 May 2018 23:30:03 +0000 (16:30 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
fc4347f98e skipped:
8b2ac4fffa am:
a72fe6a957 -s ours
am:
dc9639ab7f -s ours
Change-Id: Ib6ede43f9ed266ca41dffc03cc26422471b2afe2
Bill Yi [Thu, 17 May 2018 23:29:55 +0000 (16:29 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
053b375862 skipped:
a7875e6a7d
am:
81a6ef98f3 -s ours
Change-Id: I653ae63bef34f046ac9fc9be7d0e04d818dd0d89
Bill Yi [Thu, 17 May 2018 23:26:51 +0000 (16:26 -0700)]
Merge changes from topic "am-
d1fbdf53-dccb-4215-99ff-
b24698b6bec8" into oc-dev
am:
c6c611293d
Change-Id: I74ee0d6e477345487b6056b3e1f92a41ba67731f
Bill Yi [Thu, 17 May 2018 23:25:01 +0000 (16:25 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
379dacd8c2 skipped:
20306f6ce0
am:
fb795ed727 -s ours
Change-Id: Id3bd937bf2aecd644b6c5ec4de4d8707196267f5
Bill Yi [Thu, 17 May 2018 23:24:11 +0000 (16:24 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
a52a0f49cc skipped:
a5619cc4e3 am:
19bf5aa466 -s ours am:
22961acba1 -s ours
am:
23cfb89980 -s ours
Change-Id: I5f1c30f48893cdd3ab0757e978f5b8ed36aa869f
TreeHugger Robot [Thu, 17 May 2018 23:23:10 +0000 (23:23 +0000)]
Merge changes from topic "am-
99e79364-ab71-4d96-8a34-
000c07c66d3e" into oc-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped:
c2a85c8927 skipped:
43bd9fa8b2
[automerger skipped] Import translations. DO NOT MERGE skipped:
c2a85c8927
Import translations. DO NOT MERGE
TreeHugger Robot [Thu, 17 May 2018 23:22:37 +0000 (23:22 +0000)]
Merge changes from topic "am-
e925dddc-33b5-48cc-bddb-
e978735e99b7" into oc-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped:
2f53cb7cc0 skipped:
ead9437423
[automerger skipped] Import translations. DO NOT MERGE skipped:
2f53cb7cc0
Import translations. DO NOT MERGE
TreeHugger Robot [Thu, 17 May 2018 23:21:49 +0000 (23:21 +0000)]
Merge changes from topic "am-
3142fca9-100b-4dd4-8848-
117761166ffe" into oc-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped:
7b2e87bd96 skipped:
913239f688
[automerger skipped] Import translations. DO NOT MERGE skipped:
7b2e87bd96
Import translations. DO NOT MERGE
TreeHugger Robot [Thu, 17 May 2018 23:20:31 +0000 (23:20 +0000)]
Merge changes from topic "am-
4a0c0e3d-b1ad-44cf-9088-
b37a160bc2ac" into oc-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped:
63cef597e2 skipped:
a492d4d55b
[automerger skipped] Import translations. DO NOT MERGE skipped:
63cef597e2
Import translations. DO NOT MERGE
Bill Yi [Thu, 17 May 2018 23:20:16 +0000 (16:20 -0700)]
Merge changes from topic "am-
93ef86f6-d908-4917-b503-
5ba7fcefcad8" into oc-dev
am:
5667f966e5
Change-Id: Iba9987a2228227107c2870f2a57b4c132e3f6e3e
Bill Yi [Thu, 17 May 2018 23:19:50 +0000 (16:19 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
a52a0f49cc skipped:
a5619cc4e3 am:
19bf5aa466 -s ours
am:
22961acba1 -s ours
Change-Id: I945ab1ecad9290ba64bad8b93fe7614b9a9778ae
Bill Yi [Thu, 17 May 2018 23:18:59 +0000 (16:18 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
fc4347f98e skipped:
8b2ac4fffa
am:
a72fe6a957 -s ours
Change-Id: I659644d1abcb04788c35591a290440e8a990e79c
TreeHugger Robot [Thu, 17 May 2018 23:17:54 +0000 (23:17 +0000)]
Merge changes from topic "am-
d375c8a9-01d8-44da-9ef2-
2e866e457b89" into oc-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped:
439fdb13fc skipped:
a98b588532
[automerger skipped] Import translations. DO NOT MERGE skipped:
439fdb13fc
Import translations. DO NOT MERGE
TreeHugger Robot [Thu, 17 May 2018 23:17:28 +0000 (23:17 +0000)]
Merge changes from topic "am-
646cf556-d36a-48f1-a414-
3797586a8a96" into oc-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped:
a574713e4d skipped:
e7c60be83f
[automerger skipped] Import translations. DO NOT MERGE skipped:
a574713e4d
Import translations. DO NOT MERGE
TreeHugger Robot [Thu, 17 May 2018 23:16:59 +0000 (23:16 +0000)]
Merge changes from topic "am-
76a20f08-9212-4001-a52b-
dd38a93faa9b" into oc-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped:
053b375862 skipped:
a7875e6a7d
[automerger skipped] Import translations. DO NOT MERGE skipped:
053b375862
Import translations. DO NOT MERGE
Bill Yi [Thu, 17 May 2018 23:15:13 +0000 (16:15 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
a52a0f49cc skipped:
a5619cc4e3
am:
19bf5aa466 -s ours
Change-Id: I99a15ef8e43c65f65d99c83c27d8779bbf03f864
TreeHugger Robot [Thu, 17 May 2018 23:11:49 +0000 (23:11 +0000)]
Merge changes from topic "am-
d1fbdf53-dccb-4215-99ff-
b24698b6bec8" into oc-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped:
379dacd8c2 skipped:
20306f6ce0
[automerger skipped] Import translations. DO NOT MERGE skipped:
379dacd8c2
Import translations. DO NOT MERGE
TreeHugger Robot [Thu, 17 May 2018 23:08:40 +0000 (23:08 +0000)]
Merge changes from topic "am-
93ef86f6-d908-4917-b503-
5ba7fcefcad8" into oc-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped:
fc4347f98e skipped:
8b2ac4fffa
[automerger skipped] Import translations. DO NOT MERGE skipped:
fc4347f98e
Import translations. DO NOT MERGE
TreeHugger Robot [Thu, 17 May 2018 23:04:48 +0000 (23:04 +0000)]
Merge "add javadoc for carrier ifd install API" into pi-dev
TreeHugger Robot [Thu, 17 May 2018 22:34:20 +0000 (22:34 +0000)]
Merge "ValueMetric pushed events should check condition" into pi-dev
fionaxu [Thu, 17 May 2018 01:52:27 +0000 (18:52 -0700)]
add javadoc for carrier ifd install API
Bug:
79426800
Change-Id: Iaf5af11220c85dc63164cee31414dce8e4d02037
Roshan Pius [Mon, 14 May 2018 22:53:44 +0000 (15:53 -0700)]
wifi.proto: Add metrics for softap band preference unsatisfied
Bug:
79701630
Test: Unit tests
Test: Validated that the metric is updated when STA + AP forces the AP
to not satisfy the band preference.
Change-Id: I7d749d33668d0b05ec4beedfa8d5b79b855e3372
Selim Cinek [Thu, 17 May 2018 21:02:01 +0000 (21:02 +0000)]
Merge "Fix that the empty shade view would be visible sometimes" into pi-dev
OSDN Git Service
