OSDN Git Service
Prabir Pradhan [Mon, 19 Aug 2019 23:25:04 +0000 (16:25 -0700)]
Merge "apply empty transaction in startActivitySync" into qt-dev am:
f928b661d9 am:
5cd874d792
am:
fa6f50e13d
Change-Id: I563c3459ec859b62d100a9103f9e741c9088d686
Wei Wang [Mon, 19 Aug 2019 23:24:10 +0000 (16:24 -0700)]
Merge "ThermalService: add event log when temperature changed" into qt-qpr1-dev
am:
a046613c02
Change-Id: I28f65acb31eac27869a245e2e9e13ffea45748d0
Daniel Sandler [Mon, 19 Aug 2019 22:41:36 +0000 (22:41 +0000)]
Merge "resolve merge conflicts of
07d866a10e2633902270173108eb6d9d53e31eac to qt-qpr1-sysui-dev" into qt-qpr1-sysui-dev
Adrian Roos [Mon, 12 Aug 2019 15:47:39 +0000 (17:47 +0200)]
API: Explicitly track incompatibilities with previous API versions
Bug:
139128921
Test: make checkapi
Change-Id: I1f17b57705e2f7350b55ab278e06fc4e988771ff
Merged-In: I1f17b57705e2f7350b55ab278e06fc4e988771ff
(cherry picked from commit
369246b4cc3143a42eb176057d168473783d3d6b)
Lucas Dupin [Thu, 15 Aug 2019 18:41:52 +0000 (11:41 -0700)]
Only delay bouncer if bypass is off
Test: pull up bouncer with bypass on and off
Test: atest KeyguardBouncerTest
Fixes:
137563419
Change-Id: I5ca00ebacda2c893bf62d5c882fe0a244b77f4fc
TreeHugger Robot [Wed, 14 Aug 2019 21:23:10 +0000 (21:23 +0000)]
Merge "Removing unnecessary R.java declaration for subpackages, to make gradle setup simpler" into qt-qpr1-sysui-dev
Sunny Goyal [Wed, 14 Aug 2019 00:39:10 +0000 (17:39 -0700)]
Removing unnecessary R.java declaration for subpackages, to make gradle setup simpler
Removed:
com.android.settingslib.restrictedlockutils
com.android.settingslib.helputils
com.android.keyguard
Moving sysui settings to use sysui settings resource package name
Test: Everything compiles / presubmit
Bug:
130289146
Change-Id: I5d760fa2f04439d24b455839f7bdd5cc499e840f
Julia Tuttle [Wed, 14 Aug 2019 16:25:38 +0000 (12:25 -0400)]
resolve merge conflicts of
07d866a10e2633902270173108eb6d9d53e31eac to qt-qpr1-sysui-dev
Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Icfe845572ea5654aae145e771a593cd66eff2305
Govinda Wasserman [Tue, 13 Aug 2019 15:35:44 +0000 (11:35 -0400)]
Refactor SysUI to allow daggerization of implementations
Test: Tested locally
Change-Id: I7ccbc2aff1d911e255183c5468f10d4dd016dd86
Prabir Pradhan [Wed, 14 Aug 2019 08:53:13 +0000 (01:53 -0700)]
Merge "apply empty transaction in startActivitySync" into qt-dev am:
f928b661d9
am:
5cd874d792
Change-Id: I9c9ac83d6466c1d9c5ac666cfcfe0920b276ffdc
Prabir Pradhan [Wed, 14 Aug 2019 08:40:41 +0000 (01:40 -0700)]
Merge "apply empty transaction in startActivitySync" into qt-dev
am:
f928b661d9
Change-Id: Ic4b27be6729a3a7627a8fc499cd99fdec42cad35
TreeHugger Robot [Wed, 14 Aug 2019 06:42:05 +0000 (06:42 +0000)]
Merge "apply empty transaction in startActivitySync" into qt-dev
Wei Wang [Wed, 14 Aug 2019 03:41:44 +0000 (03:41 +0000)]
Merge "ThermalService: add event log when temperature changed" into qt-qpr1-dev
TreeHugger Robot [Tue, 13 Aug 2019 23:10:04 +0000 (23:10 +0000)]
Merge "Fix double auth issue" into qt-qpr1-dev
Felipe Leme [Tue, 13 Aug 2019 22:50:19 +0000 (15:50 -0700)]
Merge "Don't start intelligence services that are not provided by the OEM." into qt-qpr1-dev
am:
4e8070890a
Change-Id: I8b84c4d3148bc743b1c328399366cdcc7f429263
Govinda Wasserman [Tue, 13 Aug 2019 22:31:32 +0000 (22:31 +0000)]
Merge "Allow assistant handles to be requested by the assistant" into qt-qpr1-sysui-dev
TreeHugger Robot [Tue, 13 Aug 2019 21:52:56 +0000 (21:52 +0000)]
Merge "Don't start intelligence services that are not provided by the OEM." into qt-qpr1-dev
Wei Wang [Thu, 1 Aug 2019 18:51:15 +0000 (11:51 -0700)]
ThermalService: add event log when temperature changed
Bug:
126562025
Test: Use emul_temp to test event log
Change-Id: I4271d226f106cfd61960f858429de8042fb5a7c8
(cherry picked from commit
d295b27c3ad54cc67b0a0a6a96fba88e458b1548)
Vagdevi Kondeti [Tue, 13 Aug 2019 19:23:25 +0000 (12:23 -0700)]
Merge "[AT&T] Add key to show 4g for 3g RAT." into qt-r1-dev am:
d7a23cc714
am:
0e3973b1b0
Change-Id: If5ff94e19f5a3f3965e45830c15970f1d2c18b91
Vagdevi Kondeti [Tue, 13 Aug 2019 19:07:31 +0000 (12:07 -0700)]
Merge "[AT&T] Add key to show 4g for 3g RAT." into qt-r1-dev
am:
d7a23cc714
Change-Id: I6ac937185796a11cba2efe513877ed330915290a
Vagdevi Kondeti [Tue, 13 Aug 2019 18:57:29 +0000 (18:57 +0000)]
Merge "[AT&T] Add key to show 4g for 3g RAT." into qt-r1-dev
Miguel de Dios [Tue, 13 Aug 2019 18:24:27 +0000 (11:24 -0700)]
Merge "bootanimation: Change bootanim ioprio to highest in IOPRIO_CLASS_RT" into qt-r1-dev am:
f64c698ec7
am:
ccdc532426
Change-Id: Iea812e443b66c43f2eef52870b45403b24d6fbf5
Pinyao Ting [Tue, 13 Aug 2019 18:19:45 +0000 (11:19 -0700)]
Merge "fixes a security vulnerability in slice provider" into qt-qpr1-dev
am:
69018b0325
Change-Id: Ic44376803a29167de1e95f26aa7eef3e8baccd0c
Miguel de Dios [Tue, 13 Aug 2019 18:13:49 +0000 (11:13 -0700)]
Merge "bootanimation: Change bootanim ioprio to highest in IOPRIO_CLASS_RT" into qt-r1-dev
am:
f64c698ec7
Change-Id: I3f13d721d20a3610880cfc515caa732de121f766
Pinyao Ting [Tue, 13 Aug 2019 18:04:29 +0000 (18:04 +0000)]
Merge "fixes a security vulnerability in slice provider" into qt-qpr1-dev
TreeHugger Robot [Tue, 13 Aug 2019 17:45:57 +0000 (17:45 +0000)]
Merge "bootanimation: Change bootanim ioprio to highest in IOPRIO_CLASS_RT" into qt-r1-dev
Lucas Dupin [Fri, 9 Aug 2019 17:35:34 +0000 (10:35 -0700)]
Fix double auth issue
This was a regression from a security fix b/
135289187
Test: reach, auth, swipe up
Test: reach, auth, ait for timeout, reach again
Fixes:
138851575
Change-Id: Icd457dc79cb6f86a7cbb22a78ee80ebfbb4380a7
Merged-In: Icd457dc79cb6f86a7cbb22a78ee80ebfbb4380a7
wilsonshih [Tue, 13 Aug 2019 05:00:54 +0000 (22:00 -0700)]
Merge "Freezing screen when dismiss pip if orientation is going to change." into qt-r1-dev am:
41b006d8d6
am:
366a6e9995
Change-Id: I0548e41a12dee860c911b5570796bdfc78d09a74
wilsonshih [Tue, 13 Aug 2019 04:41:45 +0000 (21:41 -0700)]
Merge "Freezing screen when dismiss pip if orientation is going to change." into qt-r1-dev
am:
41b006d8d6
Change-Id: I4c66179b972c9137fc233df385cbf4699f635d55
TreeHugger Robot [Tue, 13 Aug 2019 04:09:12 +0000 (04:09 +0000)]
Merge "Freezing screen when dismiss pip if orientation is going to change." into qt-r1-dev
Lucas Dupin [Tue, 13 Aug 2019 01:31:25 +0000 (18:31 -0700)]
Merge "Fix sensor triggering issue" into qt-r1-dev am:
fba4296329
am:
a740635d8a
Change-Id: I6de1dd5863155a8b1eca165d2730b4dad1fefb74
Lucas Dupin [Tue, 13 Aug 2019 01:20:09 +0000 (18:20 -0700)]
Merge "Fix sensor triggering issue" into qt-r1-dev
am:
fba4296329
Change-Id: I4e361ec71856b572220bfebf47a62965ef79786f
Pinyao Ting [Thu, 8 Aug 2019 22:35:20 +0000 (15:35 -0700)]
fixes a security vulnerability in slice provider
Bug:
138441555
Test: Manual
Change-Id: Ib1b4fba54ebd3599fe11021d21dc9b09d34e8965
TreeHugger Robot [Tue, 13 Aug 2019 00:24:14 +0000 (00:24 +0000)]
Merge "Fix sensor triggering issue" into qt-r1-dev
Hyunyoung Song [Mon, 12 Aug 2019 23:45:50 +0000 (16:45 -0700)]
Merge "Log various types of back gesture using StatsLog Bug:
135152789 Test: m statsd_testdrive -j31 Test: out/host/linux-x86/bin/statsd_testdrive 224" into qt-r1-dev am:
fa38ed5296
am:
2984f34075
Change-Id: I1c0beaee10b628e2b57c1a4c20a25fb7685c6572
Hyunyoung Song [Mon, 12 Aug 2019 23:35:05 +0000 (16:35 -0700)]
Merge "Log various types of back gesture using StatsLog Bug:
135152789 Test: m statsd_testdrive -j31 Test: out/host/linux-x86/bin/statsd_testdrive 224" into qt-r1-dev
am:
fa38ed5296
Change-Id: I3250c533571e6b371de81e75fc8094a5b3c59d8e
Brad Ebinger [Mon, 12 Aug 2019 23:29:29 +0000 (16:29 -0700)]
Merge "Prevent Infinite Recursion in Telecom Sessions" into qt-qpr1-dev
am:
1ac5238f91
Change-Id: Ia8abf093f870f662bd8ef8a86b0990c5542b17e2
Selim Cinek [Mon, 12 Aug 2019 23:23:07 +0000 (16:23 -0700)]
Merge "Using the keyguard fading away duration for the scrim" into qt-r1-dev am:
85224a5834
am:
c28d623253
Change-Id: I7d83a85f30c5c5a6da7e3ea03e7c9562652951b8
TreeHugger Robot [Mon, 12 Aug 2019 23:18:04 +0000 (23:18 +0000)]
Merge "Log various types of back gesture using StatsLog Bug:
135152789 Test: m statsd_testdrive -j31 Test: out/host/linux-x86/bin/statsd_testdrive 224" into qt-r1-dev
TreeHugger Robot [Mon, 12 Aug 2019 23:08:04 +0000 (23:08 +0000)]
Merge "Prevent Infinite Recursion in Telecom Sessions" into qt-qpr1-dev
Selim Cinek [Mon, 12 Aug 2019 23:03:04 +0000 (16:03 -0700)]
Merge "Using the keyguard fading away duration for the scrim" into qt-r1-dev
am:
85224a5834
Change-Id: I11aafc252dc733ef01cafd510b3a602aea803804
Pengquan Meng [Mon, 12 Aug 2019 22:47:13 +0000 (15:47 -0700)]
Merge "Add timeout for displaying 5G icon" into qt-qpr1-dev
am:
8a66dd0357
Change-Id: Iee54d1910fbd473a2fb6b33d3c07d19a44a3d38b
TreeHugger Robot [Mon, 12 Aug 2019 22:44:56 +0000 (22:44 +0000)]
Merge "Using the keyguard fading away duration for the scrim" into qt-r1-dev
Yuncheol Heo [Mon, 12 Aug 2019 22:42:54 +0000 (15:42 -0700)]
Allow the vendor specific initialization of display_settings.xml.
am:
f646144ab2
Change-Id: I255a73f49837286109e41472a0e0f66a486f504a
Pengquan Meng [Mon, 12 Aug 2019 22:24:58 +0000 (22:24 +0000)]
Merge "Add timeout for displaying 5G icon" into qt-qpr1-dev
Lucas Dupin [Mon, 12 Aug 2019 21:14:08 +0000 (14:14 -0700)]
Fix sensor triggering issue
Code duplication was causing the wrong sensor to be re-registered,
also, binned brightness isn't a drop-in replacement for proximity
as expected.
Brightness can be low when prox is not covered, the correct behavior
is to verify if brightness is not 0
Test: manual, covering sensor
Test: atest DozeSensorsTest
Fixes:
139298207
Change-Id: I8673e7d9bcb56d7a34741cfad35cf397d976c18d
Dave Mankoff [Mon, 12 Aug 2019 19:52:00 +0000 (19:52 +0000)]
Merge "Pass FalsingManager down through more classes." into qt-qpr1-sysui-dev
Pengquan Meng [Wed, 26 Jun 2019 23:56:45 +0000 (16:56 -0700)]
Add timeout for displaying 5G icon
This change add an optional filed that allows carrier to change the
timeout.
System UI will show the 5G icon and start a timer with the timeout
from this config when the device connect to a 5G cell. System UI stop
displaying 5G icon when both the device disconnect from 5G cell and
the timer is expired.
Bug:
136107473
Test: build
Change-Id: I9720ec127865daa03fb2c23fbdd7d4ebf5e30e1b
Dave Mankoff [Fri, 28 Jun 2019 20:33:25 +0000 (16:33 -0400)]
Pass FalsingManager down through more classes.
The CP's http://ag/c/
8269205, with some minor modifications.
This removes FalsingManagerFactory, replacing it with
calls to Depedency.get() and pushes those calls further
up the stack in hopes that the FalsingManager can be directly
injected where it's needed in the future.
Contains a few random lint cleanups.
Bug:
136279712
Test: atest SystemUITests
Change-Id: Idd66e40d3bb9ebe9ca583166d5e961cc70ea51b8
Merged-In: Ie24acd33b0d81ae2112aead0c0d5a8658e04994e
Govinda Wasserman [Mon, 12 Aug 2019 16:22:13 +0000 (12:22 -0400)]
Allow assistant handles to be requested by the assistant
Test: Tested locally
BUG:
131615462
Change-Id: I428086d6d500ee8838c856bc867cbb40d3d2a581
Yuncheol Heo [Fri, 12 Jul 2019 17:03:40 +0000 (10:03 -0700)]
Allow the vendor specific initialization of display_settings.xml.
In hawk_md, I tried to copy the intial settings in vendor-init: ag/
7309059
Later, I found that this way doesn't work in SELINUX, since vendor-init is
not allowed to access core_data_files: http://shortn/_h6LOOHBVCF
So, I'd like to add a hook that vendor can provide the intial display
settings.
This is a stop-gap solution until b/
123226552 is resolved.
Bug:
137233447
Test: Check if /vendor/etc/display_settings.xml is copied into /data/system/.
Change-Id: Ib87219e62c3414f26d63f072a0e767287ddb156e
Dave Mankoff [Mon, 12 Aug 2019 15:51:11 +0000 (08:51 -0700)]
Merge "Disable falsing manager when face-authed." into qt-r1-dev am:
9249d828a1
am:
7e715542f5
Change-Id: I1b831244db68562c105563dcfda70d01ef3e0778
Dave Mankoff [Mon, 12 Aug 2019 15:41:30 +0000 (08:41 -0700)]
Merge "Disable falsing manager when face-authed." into qt-r1-dev
am:
9249d828a1
Change-Id: Icfba07cedf942e13c2a5747890b253e6f6d588c0
Dave Mankoff [Mon, 12 Aug 2019 15:17:39 +0000 (15:17 +0000)]
Merge "Disable falsing manager when face-authed." into qt-r1-dev
Dave Mankoff [Mon, 12 Aug 2019 15:10:08 +0000 (15:10 +0000)]
Merge "Initialize Dependency with the Application when Dagger starts." into qt-qpr1-sysui-dev
Bill Yi [Mon, 12 Aug 2019 04:51:37 +0000 (21:51 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am:
8931739c16 -s ours am:
a6e7345636 -s ours
am:
e8b96c4515 -s ours
am skip reason: subject contains skip directive
Change-Id: I06cbd488f23e6611cf8d48752f76adac184b14d3
Bill Yi [Mon, 12 Aug 2019 04:41:39 +0000 (21:41 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am:
8931739c16 -s ours
am:
a6e7345636 -s ours
am skip reason: subject contains skip directive
Change-Id: I1d5193e298818d94425d28492caaafcf4d6ea295
Bill Yi [Mon, 12 Aug 2019 04:31:51 +0000 (21:31 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am:
8931739c16 -s ours
am skip reason: subject contains skip directive
Change-Id: I968bb1d6987ac3baab44a20b642ef4196026a408
TreeHugger Robot [Mon, 12 Aug 2019 04:00:48 +0000 (04:00 +0000)]
Merge "Import translations. DO NOT MERGE" into qt-dev
Bill Yi [Mon, 12 Aug 2019 02:20:35 +0000 (19:20 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev
am:
d47951389d -s ours
am skip reason: subject contains skip directive
Change-Id: I04fc8e4500c1b067784db2c9dea3a08527459860
TreeHugger Robot [Mon, 12 Aug 2019 01:47:33 +0000 (01:47 +0000)]
Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev
TreeHugger Robot [Mon, 12 Aug 2019 01:24:52 +0000 (01:24 +0000)]
Merge "Import translations. DO NOT MERGE" into qt-qpr1-sysui-dev
Selim Cinek [Sat, 10 Aug 2019 00:19:57 +0000 (17:19 -0700)]
Using the keyguard fading away duration for the scrim
Previously we were using a fixed duration and as a result the
scrims duration was much shorter right after boot when the
fading away duration takes 2 seconds. We're now always using
the fading away duration which simplifies also the bypass
transition.
Fixes:
138305791
Test: atest SystemUITests
Change-Id: I2eba68c75c9777ab1ba6ffadadafed3836eb74e3
vagdevi [Fri, 9 Aug 2019 16:45:14 +0000 (09:45 -0700)]
[AT&T] Add key to show 4g for 3g RAT.
This key is introduced for AT&T
This will also require a carrier-config side change
to set show_4g_for_3g_data_icon_bool to true.
This will replace H/H+ that is shown by AT&T today.
Bug:
138655095
Test: manually
Change-Id: I480e14be41f8edbe607472351efd39d6d91b81b0
Nicholas Sauer [Fri, 9 Aug 2019 23:33:47 +0000 (16:33 -0700)]
Merge "Use the current user rather than USER_SYSTEM as default user for AccountManagerServiceShellCommand" into qt-qpr1-dev
am:
1a89a00e8c
Change-Id: I6a91789bb34a820f8dea5481c0a2efc4dbbcaa90
Nicholas Sauer [Fri, 9 Aug 2019 23:19:57 +0000 (23:19 +0000)]
Merge "Use the current user rather than USER_SYSTEM as default user for AccountManagerServiceShellCommand" into qt-qpr1-dev
Ned Burns [Fri, 9 Aug 2019 23:12:09 +0000 (16:12 -0700)]
[automerger skipped] Merge "Ensure isTopBucket() gets set when there is just one notification" into qt-dev am:
68f3bb1305 -s ours am:
f5933683a7 -s ours
am:
0bf54bccd7 -s ours
am skip reason: change_id I615b2f7fddca30dae67dbaab0e5d54a824a4c441 with SHA1
2d35980e72 is in history
Change-Id: I8d70957e9d28c3b0d4458274eebdc9f8d537bbaa
Ned Burns [Fri, 9 Aug 2019 22:51:53 +0000 (15:51 -0700)]
[automerger skipped] Merge "Ensure isTopBucket() gets set when there is just one notification" into qt-dev am:
68f3bb1305 -s ours
am:
f5933683a7 -s ours
am skip reason: change_id I615b2f7fddca30dae67dbaab0e5d54a824a4c441 with SHA1
2d35980e72 is in history
Change-Id: I1f3818b203591b5644b4def1db594fb029830487
Ned Burns [Fri, 9 Aug 2019 22:38:03 +0000 (15:38 -0700)]
[automerger skipped] Merge "Ensure isTopBucket() gets set when there is just one notification" into qt-dev
am:
68f3bb1305 -s ours
am skip reason: change_id I615b2f7fddca30dae67dbaab0e5d54a824a4c441 with SHA1
2d35980e72 is in history
Change-Id: I37cdb13b72ac7c4da5df1db6ee07209ed20353db
Sunny Goyal [Fri, 9 Aug 2019 22:37:59 +0000 (15:37 -0700)]
Merge "Hide the home handle in lock task home when home and overview are disabled" into qt-r1-dev am:
2862d538b6
am:
ffe8886cd3
Change-Id: I0533a8804ae6214708ded44cb3cbe030dca76aaa
Bill Yi [Fri, 9 Aug 2019 22:37:35 +0000 (15:37 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I024a8208106222e0f40e2c099532a4c2b3298dbf
Bill Yi [Fri, 9 Aug 2019 22:27:03 +0000 (15:27 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Ic9922a76ee09256ee0539d53d4c527911a869325
Ned Burns [Fri, 9 Aug 2019 22:21:45 +0000 (22:21 +0000)]
Merge "Ensure isTopBucket() gets set when there is just one notification" into qt-dev
Sunny Goyal [Fri, 9 Aug 2019 22:18:28 +0000 (15:18 -0700)]
Merge "Hide the home handle in lock task home when home and overview are disabled" into qt-r1-dev
am:
2862d538b6
Change-Id: Ied33a36a262ad766421321e9f4c53bb07a608fe7
Bill Yi [Fri, 9 Aug 2019 22:06:46 +0000 (15:06 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Ibb92c8650e8f63fd70e7a23dcbde26ce19868d4a
Dave Mankoff [Fri, 9 Aug 2019 21:58:56 +0000 (17:58 -0400)]
Disable falsing manager when face-authed.
Bug:
139202921
Test: manual
Change-Id: Icc24dfaa2958443d0927567c1e90184059fc7ae7
TreeHugger Robot [Fri, 9 Aug 2019 21:51:03 +0000 (21:51 +0000)]
Merge "Hide the home handle in lock task home when home and overview are disabled" into qt-r1-dev
Miguel de Dios [Wed, 7 Aug 2019 22:07:51 +0000 (15:07 -0700)]
bootanimation: Change bootanim ioprio to highest in IOPRIO_CLASS_RT
We see cases where bootanim is IO sleeping on boot and its causing
jank. Change the ioprio to the highest in an attempt to reduce this.
Bug:
138459662
Test: manual - flash and factory reset, looking for artifacts in the boot animation
Change-Id: I9734edea37c92e365a2b359a5180303e9b9284f7
Bill Yi [Fri, 9 Aug 2019 19:58:48 +0000 (12:58 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am:
fe2d421fab -s ours am:
5c0d577dea -s ours
am:
3fa31fb1cf -s ours
am skip reason: subject contains skip directive
Change-Id: Ie2cc0db2a564be7bbc66661554670297bdccb624
Bill Yi [Fri, 9 Aug 2019 19:38:47 +0000 (12:38 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am:
fe2d421fab -s ours
am:
5c0d577dea -s ours
am skip reason: subject contains skip directive
Change-Id: I8137f4945cc640f35f7de41ca90ba9c3ece572a3
Bill Yi [Fri, 9 Aug 2019 19:26:12 +0000 (12:26 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am:
fe2d421fab -s ours
am skip reason: subject contains skip directive
Change-Id: I2b7c8c005bb0d174a451243b9f0b4148f6c427bb
TreeHugger Robot [Fri, 9 Aug 2019 18:42:27 +0000 (18:42 +0000)]
Merge "Import translations. DO NOT MERGE" into qt-dev
Lucas Dupin [Fri, 9 Aug 2019 18:25:35 +0000 (11:25 -0700)]
Merge "Fade from black when reach" into qt-r1-dev am:
331cdb72e6
am:
78d9978fa6
Change-Id: I96afe925e002571cc2dff58507f79c58f2317464
Ned Burns [Fri, 9 Aug 2019 18:21:07 +0000 (11:21 -0700)]
Merge "Ensure isTopBucket() gets set when there is just one notification" into qt-r1-dev am:
9a38205327
am:
45fb016801
Change-Id: Ia7a5a790abf2148f1244a565a8e2c2151f94b42a
Fabian Kozynski [Fri, 9 Aug 2019 18:15:41 +0000 (11:15 -0700)]
Merge "Prevent QSPanel from remeasuring" into qt-qpr1-dev
am:
acc44b21a6
Change-Id: I267ef9a48b016a31afaab018bb512404205241c1
Lucas Dupin [Fri, 9 Aug 2019 18:11:14 +0000 (11:11 -0700)]
Merge "Do not set guts visibility to transient state" into qt-qpr1-dev
am:
4bcd36661d
Change-Id: I7498efc8657dd13db1110225a5f9c6388db04929
Lucas Dupin [Fri, 9 Aug 2019 18:05:45 +0000 (11:05 -0700)]
Merge "Assume sensors perform prox check" into qt-qpr1-dev
am:
e28124af92
Change-Id: I3371a8a8b2ae5b0ede7d8f21a3edf0c0ff017321
Lucas Dupin [Fri, 9 Aug 2019 18:00:00 +0000 (11:00 -0700)]
Merge "Fade from black when reach" into qt-r1-dev
am:
331cdb72e6
Change-Id: I94c39e651621b47e3bad580df1b0895e91cf1d42
Ned Burns [Fri, 9 Aug 2019 17:56:10 +0000 (10:56 -0700)]
Merge "Ensure isTopBucket() gets set when there is just one notification" into qt-r1-dev
am:
9a38205327
Change-Id: Ic9c363e93356cfdd6ae157da39064bf70b3b400d
Dave Mankoff [Fri, 9 Aug 2019 15:08:52 +0000 (11:08 -0400)]
Initialize Dependency with the Application when Dagger starts.
Dependency is no longer a subclass of SystemUI. It gets initialized
directly as part of the application, just like the rest of Dagger.
It was an awkward implementation of SystemUI anyways.
Bug:
137324767
Change-Id: Icf49e9262e8c0710210a8bc0231c4d16396ffdf3
Test: atest SystemUITests
Fabian Kozynski [Fri, 9 Aug 2019 17:53:39 +0000 (17:53 +0000)]
Merge "Prevent QSPanel from remeasuring" into qt-qpr1-dev
TreeHugger Robot [Fri, 9 Aug 2019 17:52:24 +0000 (17:52 +0000)]
Merge "Do not set guts visibility to transient state" into qt-qpr1-dev
Lucas Dupin [Fri, 9 Aug 2019 17:43:50 +0000 (17:43 +0000)]
Merge "Assume sensors perform prox check" into qt-qpr1-dev
TreeHugger Robot [Fri, 9 Aug 2019 17:39:40 +0000 (17:39 +0000)]
Merge "Fade from black when reach" into qt-r1-dev
Bill Yi [Fri, 9 Aug 2019 17:30:57 +0000 (10:30 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am:
c7a7eaa776 -s ours
am:
b3c1bb04b8 -s ours
am skip reason: subject contains skip directive
Change-Id: I90fe6c601de54f0583e7f1075601e8c05a190c81
Ned Burns [Thu, 8 Aug 2019 17:43:57 +0000 (13:43 -0400)]
Ensure isTopBucket() gets set when there is just one notification
My descendants will vilify this CL for generations to come. We'll
clean it up for R, but this is our last, best hope for fixing things
in Q.
Bug:
138775282
Test: manual
Change-Id: I615b2f7fddca30dae67dbaab0e5d54a824a4c441
Merged-In: I615b2f7fddca30dae67dbaab0e5d54a824a4c441
(cherry picked from commit
2d35980e7201e042e253fadd0eb55e1866fc28d9)
Ned Burns [Fri, 9 Aug 2019 17:27:58 +0000 (17:27 +0000)]
Merge "Ensure isTopBucket() gets set when there is just one notification" into qt-r1-dev
Bill Yi [Fri, 9 Aug 2019 17:11:47 +0000 (10:11 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
am:
c7a7eaa776 -s ours
am skip reason: subject contains skip directive
Change-Id: I0ec2792ce542e9c39bf25843d16ff5b4df038d68
TreeHugger Robot [Fri, 9 Aug 2019 16:52:31 +0000 (16:52 +0000)]
Merge "Import translations. DO NOT MERGE" into qt-r1-dev
Bill Yi [Fri, 9 Aug 2019 16:50:29 +0000 (09:50 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev
am:
3e9656e544 -s ours
am skip reason: subject contains skip directive
Change-Id: I1c4f8dcfded6d44e502d16ec5561da3fefb7445b
OSDN Git Service
