Bill Yi
8dad9187cd
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
...
am: 89d0fcc59c
2018-05-22 14:38:42 -07:00
TreeHugger Robot
89d0fcc59c
Merge "Import translations. DO NOT MERGE" into pi-dev
2018-05-22 21:23:56 +00:00
Jordan Liu
f9e9aa4f19
[automerger skipped] Merge "Change directory where apns-conf.xml is stored" into pi-dev
...
am: c7de985481
2018-05-22 14:21:46 -07:00
Ryan Mitchell
9964297b44
Merge "ResStringPool: Prevenet boot loop from se fix" into pi-dev
...
am: 8dd9ef190b
2018-05-22 14:16:13 -07:00
Jordan Liu
c7de985481
Merge "Change directory where apns-conf.xml is stored" into pi-dev
2018-05-22 21:12:31 +00:00
TreeHugger Robot
8dd9ef190b
Merge "ResStringPool: Prevenet boot loop from se fix" into pi-dev
2018-05-22 21:00:45 +00:00
Jeff Sharkey
fab272e037
Merge "Build browse intents based on target user." into pi-dev
...
am: c49d44c3ef
2018-05-22 13:57:30 -07:00
Rohan Shah
8fa6942fb1
Merge "[Notif] Don't show bouncer on dismiss" into pi-dev
...
am: fe1b1f19fe
2018-05-22 13:46:41 -07:00
Jeff Sharkey
c49d44c3ef
Merge "Build browse intents based on target user." into pi-dev
2018-05-22 20:43:27 +00:00
Christopher Ferris
97ad6f5234
Merge "Remove unnecessary references to libunwind." am: 10e3fdd263
...
am: 989d72cefc
2018-05-22 13:40:54 -07:00
TreeHugger Robot
fe1b1f19fe
Merge "[Notif] Don't show bouncer on dismiss" into pi-dev
2018-05-22 20:36:51 +00:00
Christopher Ferris
989d72cefc
Merge "Remove unnecessary references to libunwind."
...
am: 10e3fdd263
2018-05-22 13:28:14 -07:00
Bill Yi
cdd2c69213
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: Ia64d541d43542bffd17cb0cfba7e23419a84cfdc
2018-05-22 12:26:11 -07:00
Christopher Ferris
10e3fdd263
Merge "Remove unnecessary references to libunwind."
2018-05-22 19:22:39 +00:00
Jason Monk
54cfd42974
Merge "Optimize slice permission checks a bit" into pi-dev
...
am: a828705fc9
2018-05-22 12:07:18 -07:00
Annie Meng
89f02f871d
Merge "Allow restore of settings with nullable components" into pi-dev
...
am: 2d6dbbac04
2018-05-22 12:02:00 -07:00
TreeHugger Robot
a828705fc9
Merge "Optimize slice permission checks a bit" into pi-dev
2018-05-22 18:50:24 +00:00
Evan Laird
7c526756b4
Merge "Hide status bar icons if showing bouncer on keyguard activity" into pi-dev
...
am: 5cfe787dec
2018-05-22 11:48:26 -07:00
Annie Meng
2d6dbbac04
Merge "Allow restore of settings with nullable components" into pi-dev
2018-05-22 18:38:19 +00:00
TreeHugger Robot
5cfe787dec
Merge "Hide status bar icons if showing bouncer on keyguard activity" into pi-dev
2018-05-22 18:35:27 +00:00
Zhi An Ng
f5b7a6aef5
Merge "Disable direct share on low ram devices" into pi-dev
...
am: 1f597da686
2018-05-22 11:26:15 -07:00
Ricardo Garcia
bbb7ab957c
Merge "Fix DynamicsProcessing effect defaults and documentation typo" into pi-dev
...
am: 7d195a5a87
2018-05-22 11:15:52 -07:00
Zhi An Ng
1f597da686
Merge "Disable direct share on low ram devices" into pi-dev
2018-05-22 18:08:22 +00:00
Jeff Sharkey
b4ee5d7b42
Build browse intents based on target user.
...
SystemUI runs under a single user (user 0), and needs to build
browse intents for secondary users. To accommodate this, the safety
check recently added to buildBrowseIntent() needs to be relaxed
when building for a non-current user.
Bug: 79733193
Test: builds, boots
Change-Id: Icce014bf824d0a0ee15e3d84c34f1c2b73d213c1
2018-05-22 12:01:34 -06:00
Ricardo Garcia
7d195a5a87
Merge "Fix DynamicsProcessing effect defaults and documentation typo" into pi-dev
2018-05-22 18:00:06 +00:00
David Brazdil
673a554b62
Merge "Add more hidden API to light greylist" into pi-dev
...
am: f4f5eb0802
2018-05-22 10:47:03 -07:00
David Chen
09889edcfb
Merge "Marks deprecated StatsManager APIs." into pi-dev
...
am: 4245b12ef9
2018-05-22 10:41:51 -07:00
Michael Wright
d1f126193d
Merge "Initialize mPendingAutoBrightnessAdjustment to NaN." into pi-dev
...
am: a424c79c49
2018-05-22 10:37:34 -07:00
Rohan Shah
593e8f18cd
[Notif] Don't show bouncer on dismiss
...
For blocking helper, when user dismisses by interacting with elements
outside the current notification, we should not show the bouncer.
Changed the logic to only show bouncer/use the checksaverunnable when
the user hits 'stop notifications'
Test: Added test cases, ran via atest, verified manually too
Bug: 80132806
Change-Id: Ic204e1794360684cd6359ff93e77e184e39ad57e
2018-05-22 10:37:11 -07:00
TreeHugger Robot
f4f5eb0802
Merge "Add more hidden API to light greylist" into pi-dev
2018-05-22 17:28:38 +00:00
Michael Plass
380372d086
Merge "wifi.proto score experiment id" into pi-dev
...
am: 28aa545c57
2018-05-22 10:26:16 -07:00
TreeHugger Robot
4245b12ef9
Merge "Marks deprecated StatsManager APIs." into pi-dev
2018-05-22 17:20:34 +00:00
TreeHugger Robot
a424c79c49
Merge "Initialize mPendingAutoBrightnessAdjustment to NaN." into pi-dev
2018-05-22 17:17:51 +00:00
TreeHugger Robot
28aa545c57
Merge "wifi.proto score experiment id" into pi-dev
2018-05-22 17:15:01 +00:00
Evan Laird
343c1eae22
Hide status bar icons if showing bouncer on keyguard activity
...
When in a keyguard activity, we want to hide the status bar icons when
the status bar window is hidden or the bounce is showing.
Test: launch camera from keyguard, press home to show bouncer, don't see
icons
Fixes: 80107240
Change-Id: I66dd923da2b63b20fd766f8223de90f19e86b36e
2018-05-22 13:08:38 -04:00
Winson Chung
e485fe13be
Merge "Fix issue with home activity started with standard activity type" into pi-dev
...
am: 25a1d9d898
2018-05-22 10:07:47 -07:00
Winson Chung
25a1d9d898
Merge "Fix issue with home activity started with standard activity type" into pi-dev
2018-05-22 16:50:00 +00:00
David Brazdil
01f6055b46
Add more hidden API to light greylist
...
Bug: 64382372
Bug: 73996629
Bug: 79871934
Bug: 79576591
Bug: 78034693
Bug: 74355140
Bug: 79580933
Bug: 79560744
Bug: 79560739
Bug: 79571047
Test: make
Change-Id: I5606cd3f1649a5cbb9a47484c22c88d3f57a463f
2018-05-22 17:12:19 +01:00
Steven Wu
b37470ff6d
Merge "Do not throw IllegalArgumentException in slice manager." into pi-dev
...
am: 1a31586918
2018-05-22 08:27:58 -07:00
TreeHugger Robot
1a31586918
Merge "Do not throw IllegalArgumentException in slice manager." into pi-dev
2018-05-22 15:16:26 +00:00
Evan Laird
147025feb6
Merge "GM2 Icons (3 of (?3?))" into pi-dev
...
am: 6433ac13bd
2018-05-22 07:54:58 -07:00
Evan Laird
221ff9454b
Merge "Override getDrawingRect for wifi and mobile views" into pi-dev
...
am: f6837ffba0
2018-05-22 07:46:42 -07:00
Michael Wright
9fdf66b0f1
Initialize mPendingAutoBrightnessAdjustment to NaN.
...
It currently defaults to 0 which is a valid adjustment, so if you have
a pre-existing adjustment it will get reset at every reboot and look
like a user adjustment.
Also, go ahead and set the pending adjustment to NaN if we've seen it
before so we don't try to apply it again in the future.
Bug: 80119319
Test: manual
Change-Id: I206f6d631ec2977a2c1a44f91e0c6c6a09ccd7ec
2018-05-22 15:45:15 +01:00
TreeHugger Robot
6433ac13bd
Merge "GM2 Icons (3 of (?3?))" into pi-dev
2018-05-22 14:42:17 +00:00
Android Build Merger (Role)
06867af8ab
Merge "Merge "PacProcessor: Include libpac as a JNI_SHARED_LIBRARY." am: 00c0a5bb23 am: 1d33d10cda" into pi-dev-plus-aosp
2018-05-22 14:39:20 +00:00
Narayan Kamath
8350d547cb
Merge "PacProcessor: Include libpac as a JNI_SHARED_LIBRARY." am: 00c0a5bb23
...
am: 1d33d10cda
2018-05-22 07:38:49 -07:00
TreeHugger Robot
f6837ffba0
Merge "Override getDrawingRect for wifi and mobile views" into pi-dev
2018-05-22 14:38:27 +00:00
Mathew Inwood
4e82c50e15
Merge "Update light greylist from bug scrape." into pi-dev
...
am: 16a3af9370
2018-05-22 07:37:52 -07:00
Narayan Kamath
1d33d10cda
Merge "PacProcessor: Include libpac as a JNI_SHARED_LIBRARY."
...
am: 00c0a5bb23
2018-05-22 07:29:24 -07:00
Mathew Inwood
16a3af9370
Merge "Update light greylist from bug scrape." into pi-dev
2018-05-22 14:25:36 +00:00
