OSDN Git Service

android-x86/frameworks-base.git
6 years agoMerge "Migrated various apps under frameworks/base/packages/Shell to androidx"
TreeHugger Robot [Wed, 23 May 2018 01:53:23 +0000 (01:53 +0000)]
Merge "Migrated various apps under frameworks/base/packages/Shell  to androidx"

6 years agoOptimise the hit test algorithm
Mihai Popa [Wed, 9 May 2018 16:31:48 +0000 (17:31 +0100)]
Optimise the hit test algorithm

Layout#getOffsetForHorizontal was running in O(n^2) time, where n is the
length of the current line. The method is used when a touch event
happens on a text line, to compute the cursor offset (and the character)
where it happened. Although this is not an issue in common usecases,
where the number of characters on a line is relatively small, this can
be very inefficient as a consequence of Unicode containing 0-width
(invisible) characters. Specifically, there are characters defining the
text direction (LTR or RTL), which cause our algorithm to touch the
worst case quadratic runtime. For example, a person is able to send a
message containing a few visible characters, and also a lot of these
direction changing invisible ones. When the receiver touches the message
(causing the Layout#getOffsetForHorizontal method to be called), the
receiver's application would become not responsive.

This CL optimizes the method to run in O(n) worst case. This is achieved
by computing the measurements of all line prefixes at first, which can
be done in a single pass. Then, all the prefix measurement queries will
be answered in O(1), rather than O(n) as it was happening before.

Bug: 79215201
Test: manual testing
Change-Id: Ib66ef392c19c937718e7101f6d48fac3abe51ad0

6 years ago[automerger skipped] Merge "DO NOT MERGE - Defer migration to CarUserManagerHelper...
Ying Zheng [Tue, 22 May 2018 22:34:05 +0000 (15:34 -0700)]
[automerger skipped] Merge "DO NOT MERGE - Defer migration to CarUserManagerHelper, until CarSysUI" into pi-dev am: 330713b381
am: 66e2fbf7ca  -s ours

Change-Id: Iec8c9790ef4bea061648e4bf65ebec2114cfd899

6 years agoMerge "DO NOT MERGE - Defer migration to CarUserManagerHelper, until CarSysUI" into...
Ying Zheng [Tue, 22 May 2018 22:20:29 +0000 (15:20 -0700)]
Merge "DO NOT MERGE - Defer migration to CarUserManagerHelper, until CarSysUI" into pi-dev
am: 330713b381

Change-Id: I16ae2912f0650a9712bd6e0dd8dd1986537c9050

6 years agoAdd theme mode design let user can choose theme self am: f0800fa3bd
Tony Huang [Tue, 22 May 2018 22:11:02 +0000 (15:11 -0700)]
Add theme mode design let user can choose theme self am: f0800fa3bd
am: aef9007d12

Change-Id: I240f76ff5cb982a15aff65e3d683c9c9df031fa3

6 years agoAdd theme mode design let user can choose theme self
Tony Huang [Tue, 22 May 2018 22:04:57 +0000 (15:04 -0700)]
Add theme mode design let user can choose theme self
am: f0800fa3bd

Change-Id: Ie4b645af602aac8575e1c220714b094118a3aaa6

6 years agoMerge "DO NOT MERGE - Defer migration to CarUserManagerHelper, until CarSysUI" into...
Ying Zheng [Tue, 22 May 2018 22:04:57 +0000 (22:04 +0000)]
Merge "DO NOT MERGE - Defer migration to CarUserManagerHelper, until CarSysUI" into pi-dev

6 years agoMerge "Fixed a issue where notification icons don't align vertically while peeking...
shawnlin [Tue, 22 May 2018 22:00:34 +0000 (15:00 -0700)]
Merge "Fixed a issue where notification icons don't align vertically while peeking" into pi-dev am: 118b1e3bb8
am: b64f057045

Change-Id: I4606bc3981f95d4bb3e675f192a30bf36b6c0816

6 years agoMerge "Autofill: fix ClassCastException in SaveUi" into pi-dev am: 11d8765624
Dake Gu [Tue, 22 May 2018 21:56:04 +0000 (14:56 -0700)]
Merge "Autofill: fix ClassCastException in SaveUi" into pi-dev am: 11d8765624
am: 434df11eee

Change-Id: Ia76186deb74c91bc96a158875be9b965a7449dc4

6 years ago[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 89d0fc...
Bill Yi [Tue, 22 May 2018 21:51:36 +0000 (14:51 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 89d0fcc59c  -s ours
am: 8dad9187cd  -s ours

Change-Id: I047a0ed3022560f4d79a6729baeef786d81c739c

6 years agoMerge "Fixed a issue where notification icons don't align vertically while peeking...
shawnlin [Tue, 22 May 2018 21:48:07 +0000 (14:48 -0700)]
Merge "Fixed a issue where notification icons don't align vertically while peeking" into pi-dev
am: 118b1e3bb8

Change-Id: Idd4ce23e701f4bfbe9de69d8770d009194475381

6 years agoMerge "Autofill: fix ClassCastException in SaveUi" into pi-dev
Dake Gu [Tue, 22 May 2018 21:43:28 +0000 (14:43 -0700)]
Merge "Autofill: fix ClassCastException in SaveUi" into pi-dev
am: 11d8765624

Change-Id: Ib8baaa6194a659f075a1366f28ac74fc5bf9a475

6 years ago[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
Bill Yi [Tue, 22 May 2018 21:38:42 +0000 (14:38 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am: 89d0fcc59c  -s ours

Change-Id: If69acb4e197972cc1a878cfd7b221d161470e9e4

6 years ago[automerger skipped] Merge "Change directory where apns-conf.xml is stored" into...
Jordan Liu [Tue, 22 May 2018 21:35:11 +0000 (14:35 -0700)]
[automerger skipped] Merge "Change directory where apns-conf.xml is stored" into pi-dev am: c7de985481  -s ours
am: f9e9aa4f19  -s ours

Change-Id: I5abf5316e58b6730046ab2f5815b30d9ba3e8403

6 years agoAdd theme mode design let user can choose theme self
Tony Huang [Wed, 2 May 2018 02:53:52 +0000 (10:53 +0800)]
Add theme mode design let user can choose theme self

Add a ContentObserver on WallpaperManagerService to
listen THEME_MODE value change. When changed, call
notifyWallpaperColorsChanged and set WallpaperColors
color hint by the current mode.

Bug: 63903361
Test: manual
Change-Id: I4f7aa7b184565b1bb23c7f4f1f07fc310dac7546

6 years agoMerge "ResStringPool: Prevenet boot loop from se fix" into pi-dev am: 8dd9ef190b
Ryan Mitchell [Tue, 22 May 2018 21:27:58 +0000 (14:27 -0700)]
Merge "ResStringPool: Prevenet boot loop from se fix" into pi-dev am: 8dd9ef190b
am: 9964297b44

Change-Id: Ib041932219d47504743fe82dc4a7f77ac1d9f630

6 years agoMerge "Fixed a issue where notification icons don't align vertically while peeking...
TreeHugger Robot [Tue, 22 May 2018 21:26:30 +0000 (21:26 +0000)]
Merge "Fixed a issue where notification icons don't align vertically while peeking" into pi-dev

6 years agoMerge "Autofill: fix ClassCastException in SaveUi" into pi-dev
Dake Gu [Tue, 22 May 2018 21:25:49 +0000 (21:25 +0000)]
Merge "Autofill: fix ClassCastException in SaveUi" into pi-dev

6 years agoMerge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Tue, 22 May 2018 21:23:56 +0000 (21:23 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev

6 years ago[automerger skipped] Merge "Change directory where apns-conf.xml is stored" into...
Jordan Liu [Tue, 22 May 2018 21:21:46 +0000 (14:21 -0700)]
[automerger skipped] Merge "Change directory where apns-conf.xml is stored" into pi-dev
am: c7de985481  -s ours

Change-Id: I9ba0f0a1347be3bb9cddc771b37ac3cb5ec08082

6 years agoMerge "ResStringPool: Prevenet boot loop from se fix" into pi-dev
Ryan Mitchell [Tue, 22 May 2018 21:16:13 +0000 (14:16 -0700)]
Merge "ResStringPool: Prevenet boot loop from se fix" into pi-dev
am: 8dd9ef190b

Change-Id: I0000c4a3f06e002804aa7172505e07bb57c550c6

6 years agoMerge "Change directory where apns-conf.xml is stored" into pi-dev
Jordan Liu [Tue, 22 May 2018 21:12:31 +0000 (21:12 +0000)]
Merge "Change directory where apns-conf.xml is stored" into pi-dev

6 years agoMerge "Build browse intents based on target user." into pi-dev am: c49d44c3ef
Jeff Sharkey [Tue, 22 May 2018 21:07:49 +0000 (14:07 -0700)]
Merge "Build browse intents based on target user." into pi-dev am: c49d44c3ef
am: fab272e037

Change-Id: I040f23c8e2458b37721718a1be1f6546a9323cca

6 years agoMerge "Add Settings Slice Whitelist key"
TreeHugger Robot [Tue, 22 May 2018 21:02:45 +0000 (21:02 +0000)]
Merge "Add Settings Slice Whitelist key"

6 years agoMerge "ResStringPool: Prevenet boot loop from se fix" into pi-dev
TreeHugger Robot [Tue, 22 May 2018 21:00:45 +0000 (21:00 +0000)]
Merge "ResStringPool: Prevenet boot loop from se fix" into pi-dev

6 years agoMerge "[Notif] Don't show bouncer on dismiss" into pi-dev am: fe1b1f19fe
Rohan Shah [Tue, 22 May 2018 20:58:19 +0000 (13:58 -0700)]
Merge "[Notif] Don't show bouncer on dismiss" into pi-dev am: fe1b1f19fe
am: 8fa6942fb1

Change-Id: I374d9279ce77e7ac588d03e491c5de5714234288

6 years agoMerge "Build browse intents based on target user." into pi-dev
Jeff Sharkey [Tue, 22 May 2018 20:57:30 +0000 (13:57 -0700)]
Merge "Build browse intents based on target user." into pi-dev
am: c49d44c3ef

Change-Id: I3e7bd4bc41115c42687be3be7c5a03e0919dfaf1

6 years ago[automerger skipped] Merge "Remove unnecessary references to libunwind." am: 10e3fdd2...
Christopher Ferris [Tue, 22 May 2018 20:51:14 +0000 (13:51 -0700)]
[automerger skipped] Merge "Remove unnecessary references to libunwind." am: 10e3fdd263 am: 989d72cefc
am: 97ad6f5234  -s ours

Change-Id: I0ea53faa1c07d74a3684bb77db30471f80775c1b

6 years agoMerge "[Notif] Don't show bouncer on dismiss" into pi-dev
Rohan Shah [Tue, 22 May 2018 20:46:41 +0000 (13:46 -0700)]
Merge "[Notif] Don't show bouncer on dismiss" into pi-dev
am: fe1b1f19fe

Change-Id: I124ce0724620ea457a0c4d7834a0189946e03600

6 years agoMerge "Build browse intents based on target user." into pi-dev
Jeff Sharkey [Tue, 22 May 2018 20:43:27 +0000 (20:43 +0000)]
Merge "Build browse intents based on target user." into pi-dev

6 years agoMerge "Remove unnecessary references to libunwind." am: 10e3fdd263
Christopher Ferris [Tue, 22 May 2018 20:40:54 +0000 (13:40 -0700)]
Merge "Remove unnecessary references to libunwind." am: 10e3fdd263
am: 989d72cefc

Change-Id: I0e0d26f1e00a10a1ebe1390f67525965910a36e3

6 years agoDO NOT MERGE - Defer migration to CarUserManagerHelper, until CarSysUI
Ying Zheng [Tue, 22 May 2018 19:36:23 +0000 (12:36 -0700)]
DO NOT MERGE - Defer migration to CarUserManagerHelper, until CarSysUI

Bug: 80136426,80141620
Test: Manual
Change-Id: I589919b5ff238d6ac1bb94373b9eb0f215b1372f

6 years agoMerge "[Notif] Don't show bouncer on dismiss" into pi-dev
TreeHugger Robot [Tue, 22 May 2018 20:36:51 +0000 (20:36 +0000)]
Merge "[Notif] Don't show bouncer on dismiss" into pi-dev

6 years agoMerge "Remove unnecessary references to libunwind."
Christopher Ferris [Tue, 22 May 2018 20:28:14 +0000 (13:28 -0700)]
Merge "Remove unnecessary references to libunwind."
am: 10e3fdd263

Change-Id: I433ecf87053750d15dc75fb6af384acb7ba5988d

6 years agoMerge "Reorder the drawing of underline/stroke and text"
TreeHugger Robot [Tue, 22 May 2018 20:26:58 +0000 (20:26 +0000)]
Merge "Reorder the drawing of underline/stroke and text"

6 years agoMerge "Uncanonicalize URIs before comparing them."
Michael Wright [Tue, 22 May 2018 19:41:13 +0000 (19:41 +0000)]
Merge "Uncanonicalize URIs before comparing them."

6 years agoImport translations. DO NOT MERGE
Bill Yi [Tue, 22 May 2018 19:26:11 +0000 (12:26 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: Ia64d541d43542bffd17cb0cfba7e23419a84cfdc

6 years agoMerge "Optimize slice permission checks a bit" into pi-dev am: a828705fc9
Jason Monk [Tue, 22 May 2018 19:24:09 +0000 (12:24 -0700)]
Merge "Optimize slice permission checks a bit" into pi-dev am: a828705fc9
am: 54cfd42974

Change-Id: Ia8614482ec2e0609fb824c628a878fc04643c092

6 years agoMerge "Remove unnecessary references to libunwind."
Christopher Ferris [Tue, 22 May 2018 19:22:39 +0000 (19:22 +0000)]
Merge "Remove unnecessary references to libunwind."

6 years agoMerge "Allow restore of settings with nullable components" into pi-dev am: 2d6dbbac04
Annie Meng [Tue, 22 May 2018 19:17:45 +0000 (12:17 -0700)]
Merge "Allow restore of settings with nullable components" into pi-dev am: 2d6dbbac04
am: 89f02f871d

Change-Id: If9389caa9f5159bd7983eb785e092b24fd1b7cab

6 years agoMerge "Optimize slice permission checks a bit" into pi-dev
Jason Monk [Tue, 22 May 2018 19:07:18 +0000 (12:07 -0700)]
Merge "Optimize slice permission checks a bit" into pi-dev
am: a828705fc9

Change-Id: I190ce1596596946f45ead7c8f3b325c1d16eeb3c

6 years agoMerge "Allow restore of settings with nullable components" into pi-dev
Annie Meng [Tue, 22 May 2018 19:02:00 +0000 (12:02 -0700)]
Merge "Allow restore of settings with nullable components" into pi-dev
am: 2d6dbbac04

Change-Id: I28f02ff934aed4e51395c6c1692f655cf35bbbed

6 years agoMerge "Hide status bar icons if showing bouncer on keyguard activity" into pi-dev...
Evan Laird [Tue, 22 May 2018 18:58:53 +0000 (11:58 -0700)]
Merge "Hide status bar icons if showing bouncer on keyguard activity" into pi-dev am: 5cfe787dec
am: 7c526756b4

Change-Id: I763a7b9e06c54352b60d34daae13af5f5dafa524

6 years agoMerge "Optimize slice permission checks a bit" into pi-dev
TreeHugger Robot [Tue, 22 May 2018 18:50:24 +0000 (18:50 +0000)]
Merge "Optimize slice permission checks a bit" into pi-dev

6 years agoMerge "Hide status bar icons if showing bouncer on keyguard activity" into pi-dev
Evan Laird [Tue, 22 May 2018 18:48:26 +0000 (11:48 -0700)]
Merge "Hide status bar icons if showing bouncer on keyguard activity" into pi-dev
am: 5cfe787dec

Change-Id: I909b5989fa79f11e20bb7760bed003077344870e

6 years agoMerge "Disable direct share on low ram devices" into pi-dev am: 1f597da686
Zhi An Ng [Tue, 22 May 2018 18:39:39 +0000 (11:39 -0700)]
Merge "Disable direct share on low ram devices" into pi-dev am: 1f597da686
am: f5b7a6aef5

Change-Id: Ia6271766cbdea5bce4b92ebbe6f4e08a0a3d6b74

6 years agoMerge "Allow restore of settings with nullable components" into pi-dev
Annie Meng [Tue, 22 May 2018 18:38:19 +0000 (18:38 +0000)]
Merge "Allow restore of settings with nullable components" into pi-dev

6 years agoMerge "Hide status bar icons if showing bouncer on keyguard activity" into pi-dev
TreeHugger Robot [Tue, 22 May 2018 18:35:27 +0000 (18:35 +0000)]
Merge "Hide status bar icons if showing bouncer on keyguard activity" into pi-dev

6 years agoMerge "Fix DynamicsProcessing effect defaults and documentation typo" into pi-dev...
Ricardo Garcia [Tue, 22 May 2018 18:32:08 +0000 (11:32 -0700)]
Merge "Fix DynamicsProcessing effect defaults and documentation typo" into pi-dev am: 7d195a5a87
am: bbb7ab957c

Change-Id: I4403b485caaf5e918503ea99edf64e8c5930c55f

6 years agoMerge "Improve document for Location#setExtras(Bundle)."
TreeHugger Robot [Tue, 22 May 2018 18:29:37 +0000 (18:29 +0000)]
Merge "Improve document for Location#setExtras(Bundle)."

6 years agoMerge "Disable direct share on low ram devices" into pi-dev
Zhi An Ng [Tue, 22 May 2018 18:26:15 +0000 (11:26 -0700)]
Merge "Disable direct share on low ram devices" into pi-dev
am: 1f597da686

Change-Id: I235df9bf2495d8f133cf127f99e7175e34a74188

6 years agoMerge "Fix DynamicsProcessing effect defaults and documentation typo" into pi-dev
Ricardo Garcia [Tue, 22 May 2018 18:15:52 +0000 (11:15 -0700)]
Merge "Fix DynamicsProcessing effect defaults and documentation typo" into pi-dev
am: 7d195a5a87

Change-Id: I4d696d45f85e943c7fd738fa0f024a5a79e2b61c

6 years agoMerge "Disable direct share on low ram devices" into pi-dev
Zhi An Ng [Tue, 22 May 2018 18:08:22 +0000 (18:08 +0000)]
Merge "Disable direct share on low ram devices" into pi-dev

6 years agoMerge "Add more hidden API to light greylist" into pi-dev am: f4f5eb0802
David Brazdil [Tue, 22 May 2018 18:05:10 +0000 (11:05 -0700)]
Merge "Add more hidden API to light greylist" into pi-dev am: f4f5eb0802
am: 673a554b62

Change-Id: I12be05e87e4fb99aa7eda30d4bf8257b245cadd2

6 years agoBuild browse intents based on target user.
Jeff Sharkey [Tue, 22 May 2018 18:01:31 +0000 (12:01 -0600)]
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

6 years agoMerge "Fix DynamicsProcessing effect defaults and documentation typo" into pi-dev
Ricardo Garcia [Tue, 22 May 2018 18:00:06 +0000 (18:00 +0000)]
Merge "Fix DynamicsProcessing effect defaults and documentation typo" into pi-dev

6 years agoMerge "Marks deprecated StatsManager APIs." into pi-dev am: 4245b12ef9
David Chen [Tue, 22 May 2018 17:55:58 +0000 (10:55 -0700)]
Merge "Marks deprecated StatsManager APIs." into pi-dev am: 4245b12ef9
am: 09889edcfb

Change-Id: I571ec092ffb9f007be812294e9c7ec47f923c141

6 years agoMerge "Initialize mPendingAutoBrightnessAdjustment to NaN." into pi-dev am: a424c79c49
Michael Wright [Tue, 22 May 2018 17:50:37 +0000 (10:50 -0700)]
Merge "Initialize mPendingAutoBrightnessAdjustment to NaN." into pi-dev am: a424c79c49
am: d1f126193d

Change-Id: I80130d84fd4db1b3e9814f95eb1eb992704e9407

6 years agoMerge "Add more hidden API to light greylist" into pi-dev
David Brazdil [Tue, 22 May 2018 17:47:03 +0000 (10:47 -0700)]
Merge "Add more hidden API to light greylist" into pi-dev
am: f4f5eb0802

Change-Id: Ied4c12b23db41a7dd425bfaf690628e3bf7bfaba

6 years agoMerge "Marks deprecated StatsManager APIs." into pi-dev
David Chen [Tue, 22 May 2018 17:41:51 +0000 (10:41 -0700)]
Merge "Marks deprecated StatsManager APIs." into pi-dev
am: 4245b12ef9

Change-Id: I665660fa8ccf68d80c1ba315772b52d38d2bc87d

6 years agoMerge "Initialize mPendingAutoBrightnessAdjustment to NaN." into pi-dev
Michael Wright [Tue, 22 May 2018 17:37:34 +0000 (10:37 -0700)]
Merge "Initialize mPendingAutoBrightnessAdjustment to NaN." into pi-dev
am: a424c79c49

Change-Id: I18787bf2c769f98ca926aec3f065083f5816d95b

6 years agoMerge "wifi.proto score experiment id" into pi-dev am: 28aa545c57
Michael Plass [Tue, 22 May 2018 17:37:21 +0000 (10:37 -0700)]
Merge "wifi.proto score experiment id" into pi-dev am: 28aa545c57
am: 380372d086

Change-Id: I70be54b6cdbe014b4ca651e795a59c8c69a3c684

6 years ago[Notif] Don't show bouncer on dismiss
Rohan Shah [Tue, 22 May 2018 17:06:23 +0000 (10:06 -0700)]
[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

6 years agoMerge "Add more hidden API to light greylist" into pi-dev
TreeHugger Robot [Tue, 22 May 2018 17:28:38 +0000 (17:28 +0000)]
Merge "Add more hidden API to light greylist" into pi-dev

6 years agoMerge "wifi.proto score experiment id" into pi-dev
Michael Plass [Tue, 22 May 2018 17:26:16 +0000 (10:26 -0700)]
Merge "wifi.proto score experiment id" into pi-dev
am: 28aa545c57

Change-Id: I9544c6cc8a010a5ea10b6cbb5b65901db0eb929c

6 years agoUncanonicalize URIs before comparing them.
Michael Wright [Sat, 19 May 2018 01:07:09 +0000 (18:07 -0700)]
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

6 years agoMerge "Marks deprecated StatsManager APIs." into pi-dev
TreeHugger Robot [Tue, 22 May 2018 17:20:34 +0000 (17:20 +0000)]
Merge "Marks deprecated StatsManager APIs." into pi-dev

6 years agoMerge "Fix issue with home activity started with standard activity type" into pi...
Winson Chung [Tue, 22 May 2018 17:18:09 +0000 (10:18 -0700)]
Merge "Fix issue with home activity started with standard activity type" into pi-dev am: 25a1d9d898
am: e485fe13be

Change-Id: Icf66b31509133ce4d26f91751082c872bab4ec41

6 years agoMerge "Initialize mPendingAutoBrightnessAdjustment to NaN." into pi-dev
TreeHugger Robot [Tue, 22 May 2018 17:17:51 +0000 (17:17 +0000)]
Merge "Initialize mPendingAutoBrightnessAdjustment to NaN." into pi-dev

6 years agoMerge "wifi.proto score experiment id" into pi-dev
TreeHugger Robot [Tue, 22 May 2018 17:15:01 +0000 (17:15 +0000)]
Merge "wifi.proto score experiment id" into pi-dev

6 years agoHide status bar icons if showing bouncer on keyguard activity
Evan Laird [Tue, 22 May 2018 14:35:17 +0000 (10:35 -0400)]
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

6 years agoMerge "Fix issue with home activity started with standard activity type" into pi-dev
Winson Chung [Tue, 22 May 2018 17:07:47 +0000 (10:07 -0700)]
Merge "Fix issue with home activity started with standard activity type" into pi-dev
am: 25a1d9d898

Change-Id: If0ebf8ac3100dbef8b97c4c8eba50857f483d74e

6 years agoMerge "Fix issue with home activity started with standard activity type" into pi-dev
Winson Chung [Tue, 22 May 2018 16:50:00 +0000 (16:50 +0000)]
Merge "Fix issue with home activity started with standard activity type" into pi-dev

6 years agoAutofill: fix ClassCastException in SaveUi
Dake Gu [Tue, 22 May 2018 16:17:16 +0000 (09:17 -0700)]
Autofill: fix ClassCastException in SaveUi

Bug: 80127061
Test: atest CtsAutoFillServiceTestCases on tv
Change-Id: I4f031b6f2dcb7b261f0d514b87332d0539df0bbc

6 years agoAdd more hidden API to light greylist
David Brazdil [Tue, 22 May 2018 16:04:58 +0000 (17:04 +0100)]
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

6 years agoMerge "Do not throw IllegalArgumentException in slice manager." into pi-dev am: 1a315...
Steven Wu [Tue, 22 May 2018 15:38:08 +0000 (08:38 -0700)]
Merge "Do not throw IllegalArgumentException in slice manager." into pi-dev am: 1a31586918
am: b37470ff6d

Change-Id: I57791d3bb1ba5d22bde6d15adad54ba79b97552f

6 years agoMerge "Do not throw IllegalArgumentException in slice manager." into pi-dev
Steven Wu [Tue, 22 May 2018 15:27:58 +0000 (08:27 -0700)]
Merge "Do not throw IllegalArgumentException in slice manager." into pi-dev
am: 1a31586918

Change-Id: If200a6f4ca5556c367fb427b93e580d3bb2a39a6

6 years agoMerge "Do not throw IllegalArgumentException in slice manager." into pi-dev
TreeHugger Robot [Tue, 22 May 2018 15:16:26 +0000 (15:16 +0000)]
Merge "Do not throw IllegalArgumentException in slice manager." into pi-dev

6 years agoMerge "GM2 Icons (3 of (?3?))" into pi-dev am: 6433ac13bd
Evan Laird [Tue, 22 May 2018 15:12:24 +0000 (08:12 -0700)]
Merge "GM2 Icons (3 of (?3?))" into pi-dev am: 6433ac13bd
am: 147025feb6

Change-Id: Id936a2bfec1d92a7196a1c9f7392e2ee0d710c3a

6 years agoAdd Settings Slice Whitelist key
Matthew Fritze [Mon, 21 May 2018 21:42:36 +0000 (14:42 -0700)]
Add Settings Slice Whitelist key

Bug: 79779103
Test: None - only a flag.
Change-Id: I794159db4ff8aba7b6dcd91e13a984db40da47e7

6 years agoMerge "Override getDrawingRect for wifi and mobile views" into pi-dev am: f6837ffba0
Evan Laird [Tue, 22 May 2018 15:07:46 +0000 (08:07 -0700)]
Merge "Override getDrawingRect for wifi and mobile views" into pi-dev am: f6837ffba0
am: 221ff9454b

Change-Id: I288f6e66b2174be108946d71e10aac47a9570403

6 years agoMerge "Merge "PacProcessor: Include libpac as a JNI_SHARED_LIBRARY." am: 00c0a5bb23...
Narayan Kamath [Tue, 22 May 2018 15:00:12 +0000 (08:00 -0700)]
Merge "Merge "PacProcessor: Include libpac as a JNI_SHARED_LIBRARY." am: 00c0a5bb23 am: 1d33d10cda" into pi-dev-plus-aosp
am: 06867af8ab

Change-Id: I2c9ffe4f64771308522fb639903fe12a1b580711

6 years agoMerge "GM2 Icons (3 of (?3?))" into pi-dev
Evan Laird [Tue, 22 May 2018 14:54:58 +0000 (07:54 -0700)]
Merge "GM2 Icons (3 of (?3?))" into pi-dev
am: 6433ac13bd

Change-Id: I29d49b190afa0e5309b1af956216cee0fd22592b

6 years ago[automerger skipped] Merge "Update light greylist from bug scrape." into pi-dev am...
Mathew Inwood [Tue, 22 May 2018 14:47:13 +0000 (07:47 -0700)]
[automerger skipped] Merge "Update light greylist from bug scrape." into pi-dev am: 16a3af9370
am: 4e82c50e15  -s ours

Change-Id: Id3397c49e4ee0370b4f04cc697fa94dc07fc18cd

6 years agoMerge "Override getDrawingRect for wifi and mobile views" into pi-dev
Evan Laird [Tue, 22 May 2018 14:46:42 +0000 (07:46 -0700)]
Merge "Override getDrawingRect for wifi and mobile views" into pi-dev
am: f6837ffba0

Change-Id: Ifcfdff129a94d00b82ce9522d68dc92f0875ddf4

6 years agoInitialize mPendingAutoBrightnessAdjustment to NaN.
Michael Wright [Tue, 22 May 2018 14:35:05 +0000 (15:35 +0100)]
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

6 years agoMerge "GM2 Icons (3 of (?3?))" into pi-dev
TreeHugger Robot [Tue, 22 May 2018 14:42:17 +0000 (14:42 +0000)]
Merge "GM2 Icons (3 of (?3?))" into pi-dev

6 years agoMerge "Merge "PacProcessor: Include libpac as a JNI_SHARED_LIBRARY." am: 00c0a5bb23...
Android Build Merger (Role) [Tue, 22 May 2018 14:39:20 +0000 (14:39 +0000)]
Merge "Merge "PacProcessor: Include libpac as a JNI_SHARED_LIBRARY." am: 00c0a5bb23 am: 1d33d10cda" into pi-dev-plus-aosp

6 years agoMerge "PacProcessor: Include libpac as a JNI_SHARED_LIBRARY." am: 00c0a5bb23
Narayan Kamath [Tue, 22 May 2018 14:38:49 +0000 (07:38 -0700)]
Merge "PacProcessor: Include libpac as a JNI_SHARED_LIBRARY." am: 00c0a5bb23
am: 1d33d10cda

Change-Id: I45bbdc5504dd9bce8a99b085a0dda4e51af3d6e2

6 years agoMerge "Override getDrawingRect for wifi and mobile views" into pi-dev
TreeHugger Robot [Tue, 22 May 2018 14:38:27 +0000 (14:38 +0000)]
Merge "Override getDrawingRect for wifi and mobile views" into pi-dev

6 years agoMerge "Update light greylist from bug scrape." into pi-dev
Mathew Inwood [Tue, 22 May 2018 14:37:52 +0000 (07:37 -0700)]
Merge "Update light greylist from bug scrape." into pi-dev
am: 16a3af9370

Change-Id: I9498800ba8d3792536c046d4f6e693104e5442fc

6 years agoMerge "Cheaper crash check post smart selection animation"
TreeHugger Robot [Tue, 22 May 2018 14:33:28 +0000 (14:33 +0000)]
Merge "Cheaper crash check post smart selection animation"

6 years agoMerge "PacProcessor: Include libpac as a JNI_SHARED_LIBRARY."
Narayan Kamath [Tue, 22 May 2018 14:29:24 +0000 (07:29 -0700)]
Merge "PacProcessor: Include libpac as a JNI_SHARED_LIBRARY."
am: 00c0a5bb23

Change-Id: I976e0c64ee6000a053449b3e41a03f37fe79403c

6 years agoMerge "Update light greylist from bug scrape." into pi-dev
Mathew Inwood [Tue, 22 May 2018 14:25:36 +0000 (14:25 +0000)]
Merge "Update light greylist from bug scrape." into pi-dev

6 years agoMerge "End the TC session on terminal selection event actions" into pi-dev am: d0a4dddb9b
Abodunrinwa Toki [Tue, 22 May 2018 14:15:32 +0000 (07:15 -0700)]
Merge "End the TC session on terminal selection event actions" into pi-dev am: d0a4dddb9b
am: 6826a4ab53

Change-Id: Ifca422285ca1faa681e0b761efedc0a2bfb31561

6 years agoMerge "End the TC session on terminal selection event actions" into pi-dev
Abodunrinwa Toki [Tue, 22 May 2018 14:07:23 +0000 (07:07 -0700)]
Merge "End the TC session on terminal selection event actions" into pi-dev
am: d0a4dddb9b

Change-Id: I81e90afd13d03846e240fc1fe5bef49bc01a668c

6 years agoMerge "End the TC session on terminal selection event actions" into pi-dev
TreeHugger Robot [Tue, 22 May 2018 13:56:22 +0000 (13:56 +0000)]
Merge "End the TC session on terminal selection event actions" into pi-dev

6 years agoMerge "Update light greylist from bug scrape."
Mathew Inwood [Tue, 22 May 2018 13:25:58 +0000 (13:25 +0000)]
Merge "Update light greylist from bug scrape."

6 years agoDo not throw IllegalArgumentException in slice manager.
Steven Wu [Tue, 22 May 2018 13:08:22 +0000 (09:08 -0400)]
Do not throw IllegalArgumentException in slice manager.

Test: manual
Bug: 80087497
Change-Id: Ic05c812f41d0153c8745b08718513d4e095ab27b

6 years agoMerge "Merge "Fix slider interaction collection." into pi-dev am: 051664eb6d am:...
Android Build Merger (Role) [Tue, 22 May 2018 12:36:36 +0000 (12:36 +0000)]
Merge "Merge "Fix slider interaction collection." into pi-dev am: 051664eb6d am: af5463aea8"