OSDN Git Service

android-x86/frameworks-base.git
6 years agoMerge "Fixed autofill compat mode so it works on secondary user." into pi-dev am...
Felipe Leme [Tue, 15 May 2018 21:09:05 +0000 (14:09 -0700)]
Merge "Fixed autofill compat mode so it works on secondary user." into pi-dev am: 0b20fa45b8
am: 554fb5d4c6

Change-Id: Ic903d39ce61f83cca8f14dcad4d65077acbbd418

6 years agoMerge "[Notif] Safeguard animation start" into pi-dev am: 97d17a7774
Rohan Shah [Tue, 15 May 2018 21:03:50 +0000 (14:03 -0700)]
Merge "[Notif] Safeguard animation start" into pi-dev am: 97d17a7774
am: d4853c3206

Change-Id: Ie21a33df63c9cbcaa28545b98ff14ac1fe8075ab

6 years agoMerge "Prevent instant apps to host app widgets" into pi-dev am: dee2a78db6
Svet Ganov [Tue, 15 May 2018 20:30:05 +0000 (13:30 -0700)]
Merge "Prevent instant apps to host app widgets" into pi-dev am: dee2a78db6
am: 759237ccf8

Change-Id: Icf7892705dfe1925638129ed929bbbae0460511d

6 years agoMerge "Fixed an issue where the wrong notification would be heads upped" into pi...
Selim Cinek [Tue, 15 May 2018 20:09:13 +0000 (13:09 -0700)]
Merge "Fixed an issue where the wrong notification would be heads upped" into pi-dev am: fbdd1f7d09
am: 78e030e1f6

Change-Id: If22dc6f1957d2e8c8ca334b25e6523c32b5053ed

6 years agoMerge "Fixed autofill compat mode so it works on secondary user." into pi-dev
Felipe Leme [Tue, 15 May 2018 19:54:56 +0000 (12:54 -0700)]
Merge "Fixed autofill compat mode so it works on secondary user." into pi-dev
am: 0b20fa45b8

Change-Id: Ic76d6edfb1a943d26ef7310221e260853e347e4e

6 years agoMerge "Blacklist doze setting from tuner reset" into pi-dev am: 49cb81658d
Jason Monk [Tue, 15 May 2018 19:54:08 +0000 (12:54 -0700)]
Merge "Blacklist doze setting from tuner reset" into pi-dev am: 49cb81658d
am: 94dae6421d

Change-Id: I5913ca4b1f35e834723bbc771a8fdebe12b7a7a8

6 years agoMerge "When ringer changes to vibrate, phone vibrates" into pi-dev am: fd165bb5dd
Beverly [Tue, 15 May 2018 19:46:12 +0000 (12:46 -0700)]
Merge "When ringer changes to vibrate, phone vibrates" into pi-dev am: fd165bb5dd
am: d311991bb0

Change-Id: I52f11e391f2aaea56d2e7390c97a8181decb1925

6 years agoMerge "[Notif] Safeguard animation start" into pi-dev
Rohan Shah [Tue, 15 May 2018 19:46:04 +0000 (12:46 -0700)]
Merge "[Notif] Safeguard animation start" into pi-dev
am: 97d17a7774

Change-Id: I607bc98d37c1689fdb26d660777e21715d017b07

6 years agoMerge "Prevent instant apps to host app widgets" into pi-dev
Svet Ganov [Tue, 15 May 2018 19:33:20 +0000 (12:33 -0700)]
Merge "Prevent instant apps to host app widgets" into pi-dev
am: dee2a78db6

Change-Id: Icd3b350305e21d607dd95476f3871e3638a0d5ff

6 years agoMerge "Fixed an issue where the wrong notification would be heads upped" into pi-dev
Selim Cinek [Tue, 15 May 2018 19:28:06 +0000 (12:28 -0700)]
Merge "Fixed an issue where the wrong notification would be heads upped" into pi-dev
am: fbdd1f7d09

Change-Id: I007934cfb8bd971e77291a56958fb55e1bfc5c3e

6 years agoMerge "The argument type is bool, the current bug passes a "true" or "false" string...
Yi Jin [Tue, 15 May 2018 19:23:53 +0000 (12:23 -0700)]
Merge "The argument type is bool, the current bug passes a "true" or "false" string." into pi-dev am: 0a3815958a
am: 6ef148ce5c

Change-Id: Ie5ca5fe0df06c14b8c72108ef53313b41b4acac4

6 years agoMerge "Fixed autofill compat mode so it works on secondary user." into pi-dev
TreeHugger Robot [Tue, 15 May 2018 19:20:19 +0000 (19:20 +0000)]
Merge "Fixed autofill compat mode so it works on secondary user." into pi-dev

6 years agoMerge "[Notif] Safeguard animation start" into pi-dev
TreeHugger Robot [Tue, 15 May 2018 19:12:38 +0000 (19:12 +0000)]
Merge "[Notif] Safeguard animation start" into pi-dev

6 years agoMerge "Prevent instant apps to host app widgets" into pi-dev
TreeHugger Robot [Tue, 15 May 2018 19:05:08 +0000 (19:05 +0000)]
Merge "Prevent instant apps to host app widgets" into pi-dev

6 years agoMerge "Fixed an issue where the wrong notification would be heads upped" into pi-dev
Selim Cinek [Tue, 15 May 2018 19:04:01 +0000 (19:04 +0000)]
Merge "Fixed an issue where the wrong notification would be heads upped" into pi-dev

6 years agoMerge "Update Android.bp for api-stubs in order to do api-check." into pi-dev-plus...
Nan Zhang [Tue, 15 May 2018 19:02:21 +0000 (12:02 -0700)]
Merge "Update Android.bp for api-stubs in order to do api-check." into pi-dev-plus-aosp
am: a2232e2803

Change-Id: Ibc453f8017ca35c69c1274b16e26a561caba8655

6 years agoMerge "Rethrow SecurityExceptions in UsageStatsManager" into pi-dev am: c1eddaed6e
Amith Yamasani [Tue, 15 May 2018 18:53:02 +0000 (11:53 -0700)]
Merge "Rethrow SecurityExceptions in UsageStatsManager" into pi-dev am: c1eddaed6e
am: 92e2dadc0d

Change-Id: I61d7a43cc80a41ef2681f4c51ceedef538933a4b

6 years agoMerge "Blacklist doze setting from tuner reset" into pi-dev
Jason Monk [Tue, 15 May 2018 18:49:28 +0000 (11:49 -0700)]
Merge "Blacklist doze setting from tuner reset" into pi-dev
am: 49cb81658d

Change-Id: I52290b149ecee7c6dc81f98b7ef0cafad2846010

6 years agoMerge "When ringer changes to vibrate, phone vibrates" into pi-dev
Beverly [Tue, 15 May 2018 18:40:32 +0000 (11:40 -0700)]
Merge "When ringer changes to vibrate, phone vibrates" into pi-dev
am: fd165bb5dd

Change-Id: I14c1de8465663f379c6c031874cf12c0bb4f5317

6 years agoMerge "Blacklist doze setting from tuner reset" into pi-dev
TreeHugger Robot [Tue, 15 May 2018 18:38:36 +0000 (18:38 +0000)]
Merge "Blacklist doze setting from tuner reset" into pi-dev

6 years agoMerge "The argument type is bool, the current bug passes a "true" or "false" string...
Yi Jin [Tue, 15 May 2018 18:27:13 +0000 (11:27 -0700)]
Merge "The argument type is bool, the current bug passes a "true" or "false" string." into pi-dev
am: 0a3815958a

Change-Id: Iadf8a52e65ba7930f419eacbaac9816992715506

6 years agoMerge "Hiding all views when the notification shade is collapsed" into pi-dev am...
Selim Cinek [Tue, 15 May 2018 18:18:28 +0000 (11:18 -0700)]
Merge "Hiding all views when the notification shade is collapsed" into pi-dev am: a1f417caf0
am: b24bf549a0

Change-Id: If6c76f83ecf69c95bcdfd62f2f10334bff1d77af

6 years agoFixed autofill compat mode so it works on secondary user.
Felipe Leme [Tue, 15 May 2018 17:38:13 +0000 (10:38 -0700)]
Fixed autofill compat mode so it works on secondary user.

Test: manual verification using Chrome and sample service
Test: atest CtsAutoFillServiceTestCases

Fixes: 79747293

Change-Id: I83b6fa23e9e7307e9eb44720942f55dc58820ed7

6 years agoMerge "Update Android.bp for api-stubs in order to do api-check." into pi-dev-plus...
TreeHugger Robot [Tue, 15 May 2018 18:15:08 +0000 (18:15 +0000)]
Merge "Update Android.bp for api-stubs in order to do api-check." into pi-dev-plus-aosp

6 years agoMerge "Fixed notification shelf not fully visible on lockscreen" into pi-dev am:...
Selim Cinek [Tue, 15 May 2018 18:01:12 +0000 (11:01 -0700)]
Merge "Fixed notification shelf not fully visible on lockscreen" into pi-dev am: bb24c6b501
am: 438a66d7ce

Change-Id: Iaef4a6566cbccf0e9b29cf57093ad2682ea598a4

6 years agoMerge "Rethrow SecurityExceptions in UsageStatsManager" into pi-dev
Amith Yamasani [Tue, 15 May 2018 18:00:25 +0000 (11:00 -0700)]
Merge "Rethrow SecurityExceptions in UsageStatsManager" into pi-dev
am: c1eddaed6e

Change-Id: I3a8bdfe2858c88854ab15aba6a619aac1fd66945

6 years agoMerge "When ringer changes to vibrate, phone vibrates" into pi-dev
TreeHugger Robot [Tue, 15 May 2018 18:00:11 +0000 (18:00 +0000)]
Merge "When ringer changes to vibrate, phone vibrates" into pi-dev

6 years agoMerge "Hiding all views when the notification shade is collapsed" into pi-dev
Selim Cinek [Tue, 15 May 2018 17:53:56 +0000 (10:53 -0700)]
Merge "Hiding all views when the notification shade is collapsed" into pi-dev
am: a1f417caf0

Change-Id: I07bb66bde7633bcd52c7f875a85340fbf6b847ff

6 years agoMerge "The argument type is bool, the current bug passes a "true" or "false" string...
TreeHugger Robot [Tue, 15 May 2018 17:47:16 +0000 (17:47 +0000)]
Merge "The argument type is bool, the current bug passes a "true" or "false" string." into pi-dev

6 years agoMerge "Rethrow SecurityExceptions in UsageStatsManager" into pi-dev
TreeHugger Robot [Tue, 15 May 2018 17:40:32 +0000 (17:40 +0000)]
Merge "Rethrow SecurityExceptions in UsageStatsManager" into pi-dev

6 years agoMerge "Hiding all views when the notification shade is collapsed" into pi-dev
Selim Cinek [Tue, 15 May 2018 17:38:31 +0000 (17:38 +0000)]
Merge "Hiding all views when the notification shade is collapsed" into pi-dev

6 years agoMerge "Fixed notification shelf not fully visible on lockscreen" into pi-dev
Selim Cinek [Tue, 15 May 2018 17:29:54 +0000 (10:29 -0700)]
Merge "Fixed notification shelf not fully visible on lockscreen" into pi-dev
am: bb24c6b501

Change-Id: I4a13c7e18dbfc1a136d2a7b766d4b1259f18ff0e

6 years agoMerge "Keeping the header hidden while the hun is going away" into pi-dev am: 2cfd9fb99c
Selim Cinek [Tue, 15 May 2018 17:28:16 +0000 (10:28 -0700)]
Merge "Keeping the header hidden while the hun is going away" into pi-dev am: 2cfd9fb99c
am: cb4e490d99

Change-Id: I0c2780d928c6bbe52a664655f5cc1f3750f19b2c

6 years agoMerge "Fixed that views could be stuck transiently at times" into pi-dev am: f81ad4b94c
Selim Cinek [Tue, 15 May 2018 17:20:46 +0000 (10:20 -0700)]
Merge "Fixed that views could be stuck transiently at times" into pi-dev am: f81ad4b94c
am: 19455f091d

Change-Id: I476c6bce6daf352dfa1a6741345f642b3472fed1

6 years agoMerge "Keeping the header hidden while the hun is going away" into pi-dev
Selim Cinek [Tue, 15 May 2018 17:20:19 +0000 (10:20 -0700)]
Merge "Keeping the header hidden while the hun is going away" into pi-dev
am: 2cfd9fb99c

Change-Id: I3046b09b85a995491e616736cb9519c7ced3a944

6 years agoMerge "Fixed that views could be stuck transiently at times" into pi-dev
Selim Cinek [Tue, 15 May 2018 17:10:18 +0000 (10:10 -0700)]
Merge "Fixed that views could be stuck transiently at times" into pi-dev
am: f81ad4b94c

Change-Id: I066038b167f71f4f649b609b68aec66891c97a24

6 years agoMerge "Fixed notification shelf not fully visible on lockscreen" into pi-dev
Selim Cinek [Tue, 15 May 2018 17:07:56 +0000 (17:07 +0000)]
Merge "Fixed notification shelf not fully visible on lockscreen" into pi-dev

6 years agoMerge "Fix crash when loading resources without code" into pi-dev am: c46279aa98
Jason Monk [Tue, 15 May 2018 17:00:29 +0000 (10:00 -0700)]
Merge "Fix crash when loading resources without code" into pi-dev am: c46279aa98
am: 2af66fb30f

Change-Id: Ib5d396772eef78971a1c4750bebe72ba49fdaef2

6 years agoMerge "Fix crash when loading resources without code" into pi-dev
Jason Monk [Tue, 15 May 2018 16:52:15 +0000 (09:52 -0700)]
Merge "Fix crash when loading resources without code" into pi-dev
am: c46279aa98

Change-Id: I3af4a66f050380c507ec59b9136f2ef6a4f41848

6 years agoBlacklist doze setting from tuner reset
Jason Monk [Tue, 15 May 2018 16:50:57 +0000 (12:50 -0400)]
Blacklist doze setting from tuner reset

Test: manual
Change-Id: I934cfcd65552c9998eb95ecfed65670ec73dde8d
Fixes: 78512759

6 years agoMerge "Keeping the header hidden while the hun is going away" into pi-dev
Selim Cinek [Tue, 15 May 2018 16:47:44 +0000 (16:47 +0000)]
Merge "Keeping the header hidden while the hun is going away" into pi-dev

6 years agoMerge "Fixed that views could be stuck transiently at times" into pi-dev
Selim Cinek [Tue, 15 May 2018 16:47:17 +0000 (16:47 +0000)]
Merge "Fixed that views could be stuck transiently at times" into pi-dev

6 years agoMerge "Fix crash when loading resources without code" into pi-dev
TreeHugger Robot [Tue, 15 May 2018 16:33:20 +0000 (16:33 +0000)]
Merge "Fix crash when loading resources without code" into pi-dev

6 years agoHiding all views when the notification shade is collapsed
Selim Cinek [Tue, 15 May 2018 02:17:06 +0000 (19:17 -0700)]
Hiding all views when the notification shade is collapsed

Non-heads up views could still be visible when the shade
was collapsed. Therefore they would briefly peak out
after heads up views would be swiped away leading
to ugly flickering.

Test: add hun (with notch enabled) and swipe away hun with other views present
Change-Id: I794693d7d5af5591490df7c2f4b95c01043897d2
Fixes:  76150837

6 years agoMerge "Let tests enumerate all transports/capabilities." into pi-dev am: 8e6445a1a5
Jeff Sharkey [Tue, 15 May 2018 15:37:39 +0000 (08:37 -0700)]
Merge "Let tests enumerate all transports/capabilities." into pi-dev am: 8e6445a1a5
am: 75299cffec

Change-Id: If07e77c92046807235229a4f67ee087bdd7bccf1

6 years agoFix crash when loading resources without code
Jason Monk [Tue, 15 May 2018 15:30:09 +0000 (11:30 -0400)]
Fix crash when loading resources without code

Should use default appComponentFactory, not the actual one from the
app because we have no code.

Test: manual
Change-Id: I982967543c4cf5c28b19b36b6d183a30052bf602
Fixes: 78883500

6 years agoMerge "Let tests enumerate all transports/capabilities." into pi-dev
Jeff Sharkey [Tue, 15 May 2018 15:27:40 +0000 (08:27 -0700)]
Merge "Let tests enumerate all transports/capabilities." into pi-dev
am: 8e6445a1a5

Change-Id: Ie5cd22cfa2b6a60510fd1e31d7ebcd8f6cc890a0

6 years agoMerge "Let tests enumerate all transports/capabilities." into pi-dev
Jeff Sharkey [Tue, 15 May 2018 15:17:30 +0000 (15:17 +0000)]
Merge "Let tests enumerate all transports/capabilities." into pi-dev

6 years agoMerge "Add RemoteViews.setIsWidgetCollectionChild to light grey." into pi-dev am...
Nicolas Geoffray [Tue, 15 May 2018 15:15:19 +0000 (08:15 -0700)]
Merge "Add RemoteViews.setIsWidgetCollectionChild to light grey." into pi-dev am: a66cc0da75
am: 060d3525e6

Change-Id: Ib843668663d55d40007e1bfdf4979e8d3b5d1988

6 years agoMerge "Add RemoteViews.setIsWidgetCollectionChild to light grey." into pi-dev
Nicolas Geoffray [Tue, 15 May 2018 15:07:29 +0000 (08:07 -0700)]
Merge "Add RemoteViews.setIsWidgetCollectionChild to light grey." into pi-dev
am: a66cc0da75

Change-Id: Ia79917a4f798ad46cc98a187e1bca4bab10d098a

6 years agoMerge "Add RemoteViews.setIsWidgetCollectionChild to light grey." into pi-dev
Nicolas Geoffray [Tue, 15 May 2018 14:59:04 +0000 (14:59 +0000)]
Merge "Add RemoteViews.setIsWidgetCollectionChild to light grey." into pi-dev

6 years agoMerge "clean up comments" into pi-dev am: b8dcc91eb9
Chris Wren [Tue, 15 May 2018 14:32:39 +0000 (07:32 -0700)]
Merge "clean up comments" into pi-dev am: b8dcc91eb9
am: 66f4f3e2f2

Change-Id: I95c718361fcb64fb67c84441abd0309aeb1d6a78

6 years agoMerge "clean up comments" into pi-dev
Chris Wren [Tue, 15 May 2018 14:24:55 +0000 (07:24 -0700)]
Merge "clean up comments" into pi-dev
am: b8dcc91eb9

Change-Id: I9a29d924b1f00491d963e6bf93172b1b622a73a9

6 years agoMerge "clean up comments" into pi-dev
Chris Wren [Tue, 15 May 2018 14:15:09 +0000 (14:15 +0000)]
Merge "clean up comments" into pi-dev

6 years agoclean up comments
Chris Wren [Mon, 14 May 2018 21:16:31 +0000 (17:16 -0400)]
clean up comments

Bug: 79698458
Test: make framework-protos
Change-Id: Ifaac050f2e00912188e3fb999b308101e3b07bf0

6 years agoFixed notification shelf not fully visible on lockscreen
shawnlin [Tue, 15 May 2018 08:39:56 +0000 (16:39 +0800)]
Fixed notification shelf not fully visible on lockscreen

Remove the height limitation of mBackgroundBounds.bottom, and allow min
height of NSSL to be shelf size in keyguard when qs panel fully
expanded.

Test: runtest systemui
Change-Id: I74755f8eefa70beec32db2a66a7a425b7fff0276
Fixes: 79202907

6 years agoMerge "Add api txt files for nfc-extras" am: be7959bb10 am: 06bbf7e675
Jiyong Park [Tue, 15 May 2018 07:18:23 +0000 (00:18 -0700)]
Merge "Add api txt files for nfc-extras" am: be7959bb10 am: 06bbf7e675
am: afb9dbba38

Change-Id: I1a804772d5443c6b2962c72d4cfd048ce21b5096

6 years agoMerge "Add api txt files for nfc-extras" am: be7959bb10
Jiyong Park [Tue, 15 May 2018 07:09:36 +0000 (00:09 -0700)]
Merge "Add api txt files for nfc-extras" am: be7959bb10
am: 06bbf7e675

Change-Id: I7f883efb4343be29a4a6c300c59c32505199535c

6 years agoMerge "Add api txt files for nfc-extras"
Jiyong Park [Tue, 15 May 2018 06:57:56 +0000 (23:57 -0700)]
Merge "Add api txt files for nfc-extras"
am: be7959bb10

Change-Id: Iea39dee06752e13bb659f5f31f555b089ca4b90d

6 years agoMerge "Use INetd Constant for IpSec Interface Prefix"
Nathan Harold [Tue, 15 May 2018 06:14:14 +0000 (06:14 +0000)]
Merge "Use INetd Constant for IpSec Interface Prefix"

6 years agoMerge "Don't call setAutofillClient() on base Context if it's null." into pi-dev...
Felipe Leme [Tue, 15 May 2018 06:09:16 +0000 (23:09 -0700)]
Merge "Don't call setAutofillClient() on base Context if it's null." into pi-dev am: 6d0842154b
am: aae288a6a5

Change-Id: I8f543b2e8066d8f54baf3bf846de585f8a7631da

6 years agoMerge "Don't call setAutofillClient() on base Context if it's null." into pi-dev
Felipe Leme [Tue, 15 May 2018 06:01:10 +0000 (23:01 -0700)]
Merge "Don't call setAutofillClient() on base Context if it's null." into pi-dev
am: 6d0842154b

Change-Id: Ifc971e81483b5bcf08c6f0af9789b88905dc17ad

6 years agoMerge "Don't call setAutofillClient() on base Context if it's null." into pi-dev
TreeHugger Robot [Tue, 15 May 2018 05:47:51 +0000 (05:47 +0000)]
Merge "Don't call setAutofillClient() on base Context if it's null." into pi-dev

6 years agoUse INetd Constant for IpSec Interface Prefix
Nathan Harold [Thu, 26 Apr 2018 18:47:14 +0000 (11:47 -0700)]
Use INetd Constant for IpSec Interface Prefix

Convert to using a constant in INetd to ensure
that there is a consistent tunnel prefix  between
Java and native code.

Bug: 74560705
Test: atest FramworksNetTest; atest CtsNetTestCases
Change-Id: Ida233aac2e6c6b26567463964e0ebac9d52eff1e
(cherry picked from commit 649df5e07a968ac98b41a1da60a04d59149d2385)

6 years agoMerge "Allow Print subsystem to work with services provided by instant app" into...
Philip P. Moltmann [Tue, 15 May 2018 05:32:33 +0000 (22:32 -0700)]
Merge "Allow Print subsystem to work with services provided by instant app" into pi-dev am: cc64fb9c8f
am: b098a03e84

Change-Id: Id4820d0df901304b1e10f19c62ee5d049f6cb103

6 years agoMerge "Add api txt files for nfc-extras"
Jiyong Park [Tue, 15 May 2018 05:30:41 +0000 (05:30 +0000)]
Merge "Add api txt files for nfc-extras"

6 years agoMerge "Add index for Hotspot settings page into search"
Chilun Huang [Tue, 15 May 2018 05:20:02 +0000 (05:20 +0000)]
Merge "Add index for Hotspot settings page into search"

6 years agoMerge "Allow Print subsystem to work with services provided by instant app" into...
Philip P. Moltmann [Tue, 15 May 2018 05:10:25 +0000 (22:10 -0700)]
Merge "Allow Print subsystem to work with services provided by instant app" into pi-dev
am: cc64fb9c8f

Change-Id: I462d3a5cdde32dc193b7ee0611ea79a7f8143df6

6 years agoMerge "Use INetd Constant for IpSec Interface Prefix" am: 05a16e8a04 am: e651d67bcb
nharold [Tue, 15 May 2018 05:08:19 +0000 (22:08 -0700)]
Merge "Use INetd Constant for IpSec Interface Prefix" am: 05a16e8a04 am: e651d67bcb
am: f9b0abb6c8

Change-Id: I62832e817becf6a5c532a51344ff158c2138fc43

6 years agoMerge "Use INetd Constant for IpSec Interface Prefix" am: 05a16e8a04
nharold [Tue, 15 May 2018 04:59:55 +0000 (21:59 -0700)]
Merge "Use INetd Constant for IpSec Interface Prefix" am: 05a16e8a04
am: e651d67bcb

Change-Id: I142689ec7f7b43e745580eea393130d84fe4e99b

6 years agoMerge "Allow Print subsystem to work with services provided by instant app" into...
Philip P. Moltmann [Tue, 15 May 2018 04:58:00 +0000 (04:58 +0000)]
Merge "Allow Print subsystem to work with services provided by instant app" into pi-dev

6 years agoMerge "Do not immediately perform traversals when executing transition" into pi-dev...
Jorim Jaggi [Tue, 15 May 2018 04:31:27 +0000 (21:31 -0700)]
Merge "Do not immediately perform traversals when executing transition" into pi-dev am: 09a0c2d53c
am: f8ac1fd83c

Change-Id: I3009c9eae0692c45abd22da5bc2ba9ef855bb96f

6 years agoMerge "Do not immediately perform traversals when executing transition" into pi-dev
Jorim Jaggi [Tue, 15 May 2018 04:23:50 +0000 (21:23 -0700)]
Merge "Do not immediately perform traversals when executing transition" into pi-dev
am: 09a0c2d53c

Change-Id: I65f45f8f979765def9ba1c7f56d1a3dee3292b0f

6 years agoMerge "Do not immediately perform traversals when executing transition" into pi-dev
Jorim Jaggi [Tue, 15 May 2018 04:13:38 +0000 (04:13 +0000)]
Merge "Do not immediately perform traversals when executing transition" into pi-dev

6 years agoMerge "Use INetd Constant for IpSec Interface Prefix"
nharold [Tue, 15 May 2018 03:55:41 +0000 (20:55 -0700)]
Merge "Use INetd Constant for IpSec Interface Prefix"
am: 05a16e8a04

Change-Id: If5a0507e6aa2dfa2af7c69d1ec26ff9b48f3baf7

6 years agoMerge "Use INetd Constant for IpSec Interface Prefix"
nharold [Tue, 15 May 2018 02:46:05 +0000 (02:46 +0000)]
Merge "Use INetd Constant for IpSec Interface Prefix"

6 years agoMerge "Change quickstep onboarding tip window type to TYPE_NAVIGATION_BAR_PANEL....
Tracy Zhou [Tue, 15 May 2018 02:40:04 +0000 (19:40 -0700)]
Merge "Change quickstep onboarding tip window type to TYPE_NAVIGATION_BAR_PANEL." into pi-dev am: 02e086eaf3
am: 5282a99fd9

Change-Id: I478342723e49bffe615a16c4c62c0bda86695455

6 years agoMerge "Change quickstep onboarding tip window type to TYPE_NAVIGATION_BAR_PANEL....
Tracy Zhou [Tue, 15 May 2018 02:29:50 +0000 (19:29 -0700)]
Merge "Change quickstep onboarding tip window type to TYPE_NAVIGATION_BAR_PANEL." into pi-dev
am: 02e086eaf3

Change-Id: Ida73e81d2bf60113d3137e78fdbddfe39fd58381

6 years agoMerge "Change quickstep onboarding tip window type to TYPE_NAVIGATION_BAR_PANEL....
TreeHugger Robot [Tue, 15 May 2018 02:18:14 +0000 (02:18 +0000)]
Merge "Change quickstep onboarding tip window type to TYPE_NAVIGATION_BAR_PANEL." into pi-dev

6 years agoMerge "Metrics for hardware reliability reporting" into pi-dev am: 22c738d842
Andrew Chant [Tue, 15 May 2018 01:51:26 +0000 (18:51 -0700)]
Merge "Metrics for hardware reliability reporting" into pi-dev am: 22c738d842
am: 67c3ee3d03

Change-Id: Ic186931c0a69583edf83148e8a361c00e072840e

6 years agoMerge "Autofill: allow switch IME when autofill is showing" into pi-dev am: 7b6ecb7668
Dake Gu [Tue, 15 May 2018 01:46:16 +0000 (18:46 -0700)]
Merge "Autofill: allow switch IME when autofill is showing" into pi-dev am: 7b6ecb7668
am: 0c268a1a89

Change-Id: Ia0ec98c603ecd69f4b54793df1228468596c6df6

6 years agoMerge "Simplify Javadoc for easier parsing." into pi-dev am: f707c55725
Wyatt Riley [Tue, 15 May 2018 01:40:49 +0000 (18:40 -0700)]
Merge "Simplify Javadoc for easier parsing." into pi-dev am: f707c55725
am: 0e34c367a1

Change-Id: I5ed07e3aff0f363190985633e1c0310abd7a848f

6 years agoMerge "Metrics for hardware reliability reporting" into pi-dev
Andrew Chant [Tue, 15 May 2018 01:36:02 +0000 (18:36 -0700)]
Merge "Metrics for hardware reliability reporting" into pi-dev
am: 22c738d842

Change-Id: I64b0b4b516b3328494059c3f320aa98ce36f264a

6 years ago[automerger skipped] Merge "Fix errors caught by aapt2" am: 5d58a302e3 am: 2743c5bb09
Colin Cross [Tue, 15 May 2018 01:35:46 +0000 (18:35 -0700)]
[automerger skipped] Merge "Fix errors caught by aapt2" am: 5d58a302e3 am: 2743c5bb09
am: d6a3bafd12  -s ours

Change-Id: I7a9419213d418d64ca8eec262a9db46cdfa73ab4

6 years agoMerge "Decrease the inferred auto-brightness adjustment at the extremes." into pi...
Michael Wright [Tue, 15 May 2018 01:28:32 +0000 (18:28 -0700)]
Merge "Decrease the inferred auto-brightness adjustment at the extremes." into pi-dev am: b718563329
am: f68e5665bf

Change-Id: Ib3610c0c93e5c55f8d826c5f8cb60e1deb43d29e

6 years agoFixed that views could be stuck transiently at times
Selim Cinek [Tue, 15 May 2018 01:12:42 +0000 (18:12 -0700)]
Fixed that views could be stuck transiently at times

Removed all references to overlay from the stackscroller
and always using transient views now. We were using
the overlay in places where we shouldn't have been and
therefore views could become stuck.

Change-Id: I8bf455e2d1c4d065d0b3c441606d51b3b96eab9f
Fixes: 78493499
Test: add hun, click on it, observe no transient view stuck behind

6 years agoMerge "Metrics for hardware reliability reporting" into pi-dev
TreeHugger Robot [Tue, 15 May 2018 01:16:33 +0000 (01:16 +0000)]
Merge "Metrics for hardware reliability reporting" into pi-dev

6 years agoMerge "Autofill: allow switch IME when autofill is showing" into pi-dev
Dake Gu [Tue, 15 May 2018 01:12:53 +0000 (18:12 -0700)]
Merge "Autofill: allow switch IME when autofill is showing" into pi-dev
am: 7b6ecb7668

Change-Id: I4adefc4466dd9dc6168e36526b49b03a5d384f1d

6 years agoMerge "Simplify Javadoc for easier parsing." into pi-dev
Wyatt Riley [Tue, 15 May 2018 01:08:00 +0000 (18:08 -0700)]
Merge "Simplify Javadoc for easier parsing." into pi-dev
am: f707c55725

Change-Id: Ica75bc5d4ba41041e2cbd585e953320bddbca956

6 years agoChange quickstep onboarding tip window type to
Tracy Zhou [Mon, 14 May 2018 23:58:54 +0000 (16:58 -0700)]
Change quickstep onboarding tip window type to
TYPE_NAVIGATION_BAR_PANEL.

Fixes: 73990691
Test: Go through the talkback flow, "settings cannot verify your
response" toast does not show.

Change-Id: I6f4819eb6ace1260a30589dbcc6c01fa4c8e5c35

6 years agoThe argument type is bool, the current bug passes a "true" or "false"
Yi Jin [Tue, 15 May 2018 01:04:29 +0000 (18:04 -0700)]
The argument type is bool, the current bug passes a "true" or "false"
string.

Bug: 79710844
Test: atest incidentd_test
Change-Id: I66fc086e4a194e68638311ccdc305a495ecf8da4

6 years agoMerge "Fix errors caught by aapt2" am: 5d58a302e3
Colin Cross [Tue, 15 May 2018 01:03:55 +0000 (18:03 -0700)]
Merge "Fix errors caught by aapt2" am: 5d58a302e3
am: 2743c5bb09

Change-Id: I84dbf6e0fbfe8e2730ffa3fa79c3ef732702e192

6 years agoDon't call setAutofillClient() on base Context if it's null.
Felipe Leme [Tue, 15 May 2018 00:51:58 +0000 (17:51 -0700)]
Don't call setAutofillClient() on base Context if it's null.

Test: atest CtsAutoFillServiceTestCases
Test: changed activity on autofill sample to override attachBaseContext() by
      calling super.attachBaseContext(null) - the activity still crashes, but
      not on attachBaseContext().

Fixes: 79707861

Change-Id: Idfaa9c596cc338ab815441138ce06ba64cd3b4d2

6 years agoMerge "Autofill: allow switch IME when autofill is showing" into pi-dev
Dake Gu [Tue, 15 May 2018 01:02:41 +0000 (01:02 +0000)]
Merge "Autofill: allow switch IME when autofill is showing" into pi-dev

6 years agoMerge "Fix errors caught by aapt2"
Colin Cross [Tue, 15 May 2018 00:55:51 +0000 (17:55 -0700)]
Merge "Fix errors caught by aapt2"
am: 5d58a302e3

Change-Id: Icf8a601da34c92af6f82afbbdf87468db6387049

6 years agoMerge "Decrease the inferred auto-brightness adjustment at the extremes." into pi-dev
Michael Wright [Tue, 15 May 2018 00:53:00 +0000 (17:53 -0700)]
Merge "Decrease the inferred auto-brightness adjustment at the extremes." into pi-dev
am: b718563329

Change-Id: I76e456b7f000cedb183115f0abd306957e983ffa

6 years agoMerge "Simplify Javadoc for easier parsing." into pi-dev
TreeHugger Robot [Tue, 15 May 2018 00:48:52 +0000 (00:48 +0000)]
Merge "Simplify Javadoc for easier parsing." into pi-dev

6 years agoMerge "Decrease the inferred auto-brightness adjustment at the extremes." into pi-dev
TreeHugger Robot [Tue, 15 May 2018 00:37:10 +0000 (00:37 +0000)]
Merge "Decrease the inferred auto-brightness adjustment at the extremes." into pi-dev

6 years agoMerge "Fix errors caught by aapt2" am: ed90a673d4 am: 592590c3d2
Colin Cross [Tue, 15 May 2018 00:36:20 +0000 (17:36 -0700)]
Merge "Fix errors caught by aapt2" am: ed90a673d4 am: 592590c3d2
am: ceaf60dc18

Change-Id: I91978ad442e7b79a3c19819cffa322c30cc274c4

6 years agoMerge "Fix errors caught by aapt2" am: ed90a673d4
Colin Cross [Tue, 15 May 2018 00:23:55 +0000 (17:23 -0700)]
Merge "Fix errors caught by aapt2" am: ed90a673d4
am: 592590c3d2

Change-Id: I47bac881f38d638192418c4e664722cc71941f0d