Ryan Mitchell
65bed52d7d
Merge "ResStringPool: Prevenet boot loop from se fix" into pi-dev am: 8dd9ef190b
...
am: 9964297b44
2018-05-22 14:27:58 -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
Jeff Sharkey
1fffd4bd12
Merge "Build browse intents based on target user." into pi-dev am: c49d44c3ef
...
am: fab272e037
2018-05-22 14:07:49 -07:00
TreeHugger Robot
4b2bd72b74
Merge "Add Settings Slice Whitelist key"
2018-05-22 21:02:45 +00:00
TreeHugger Robot
8dd9ef190b
Merge "ResStringPool: Prevenet boot loop from se fix" into pi-dev
2018-05-22 21:00:45 +00:00
Rohan Shah
0043a6c600
Merge "[Notif] Don't show bouncer on dismiss" into pi-dev am: fe1b1f19fe
...
am: 8fa6942fb1
2018-05-22 13:58:19 -07: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
Christopher Ferris
5e8dd808e4
[automerger skipped] Merge "Remove unnecessary references to libunwind." am: 10e3fdd263 am: 989d72cefc
...
am: 97ad6f5234
2018-05-22 13:51:14 -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
TreeHugger Robot
6ff2dd3213
Merge "Reorder the drawing of underline/stroke and text"
2018-05-22 20:26:58 +00:00
Michael Wright
6c1c5be87f
Merge "Uncanonicalize URIs before comparing them."
2018-05-22 19:41:13 +00:00
Jason Monk
9161faf7b5
Merge "Optimize slice permission checks a bit" into pi-dev am: a828705fc9
...
am: 54cfd42974
2018-05-22 12:24:09 -07:00
Christopher Ferris
10e3fdd263
Merge "Remove unnecessary references to libunwind."
2018-05-22 19:22:39 +00:00
Annie Meng
745039cb96
Merge "Allow restore of settings with nullable components" into pi-dev am: 2d6dbbac04
...
am: 89f02f871d
2018-05-22 12:17:45 -07: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
Evan Laird
2c22293cda
Merge "Hide status bar icons if showing bouncer on keyguard activity" into pi-dev am: 5cfe787dec
...
am: 7c526756b4
2018-05-22 11:58:53 -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
Zhi An Ng
7822ebbaf7
Merge "Disable direct share on low ram devices" into pi-dev am: 1f597da686
...
am: f5b7a6aef5
2018-05-22 11:39:39 -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
Ricardo Garcia
6897b975f1
Merge "Fix DynamicsProcessing effect defaults and documentation typo" into pi-dev am: 7d195a5a87
...
am: bbb7ab957c
2018-05-22 11:32:08 -07:00
TreeHugger Robot
c8ced91e94
Merge "Improve document for Location#setExtras(Bundle)."
2018-05-22 18:29:37 +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
David Brazdil
8a0e0a73e4
Merge "Add more hidden API to light greylist" into pi-dev am: f4f5eb0802
...
am: 673a554b62
2018-05-22 11:05:10 -07: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 Chen
9da07521d7
Merge "Marks deprecated StatsManager APIs." into pi-dev am: 4245b12ef9
...
am: 09889edcfb
2018-05-22 10:55:58 -07:00
Michael Wright
e8edee6f11
Merge "Initialize mPendingAutoBrightnessAdjustment to NaN." into pi-dev am: a424c79c49
...
am: d1f126193d
2018-05-22 10:50:37 -07: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
Michael Plass
dd0ff99ab4
Merge "wifi.proto score experiment id" into pi-dev am: 28aa545c57
...
am: 380372d086
2018-05-22 10:37:21 -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
Michael Wright
32fa5931f9
Uncanonicalize URIs before comparing them.
...
In order to ensure we maintain compatibility, we now configure the
canonical URIs instead of the raw URIs. Correspondingly, we need to
uncanonicalize before comparing them.
Note that we uncanonicalize the configured URI, rather than
canonicalizing the one given to us. This is because the canonicalization
format might change (e.g. add extra parameters) at which point they'll
no longer by equal, but should always uncanonicalize to the same value.
Bug: 75947705
Test: manual
Change-Id: If3b02dfef480245210fd2c585c7c727de77a4a73
2018-05-22 18:21:59 +01:00
TreeHugger Robot
4245b12ef9
Merge "Marks deprecated StatsManager APIs." into pi-dev
2018-05-22 17:20:34 +00:00
Winson Chung
094b761cb9
Merge "Fix issue with home activity started with standard activity type" into pi-dev am: 25a1d9d898
...
am: e485fe13be
2018-05-22 10:18:09 -07: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
