OSDN Git Service

android-x86/frameworks-base.git
6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: 05238c7743 skipped...
Bill Yi [Tue, 12 Jun 2018 00:06:07 +0000 (17:06 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped: 05238c7743 skipped: 5e66cc00a4 am: dafe5854dd  -s ours am: 0c61c9baf6  -s ours am: 7567755399  -s ours
am: 287d484b23  -s ours

Change-Id: I1079b3a33c1d7a2634da82ad94d2a2358cf0d6dc

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: 05238c7743 skipped...
Bill Yi [Mon, 11 Jun 2018 21:44:34 +0000 (14:44 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped: 05238c7743 skipped: 5e66cc00a4 am: dafe5854dd  -s ours am: 0c61c9baf6  -s ours
am: 7567755399  -s ours

Change-Id: If1fa2cf8485670184771de6faf7042b7c7b227eb

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: 05238c7743 skipped...
Bill Yi [Mon, 11 Jun 2018 20:42:05 +0000 (13:42 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped: 05238c7743 skipped: 5e66cc00a4 am: dafe5854dd  -s ours
am: 0c61c9baf6  -s ours

Change-Id: Ie95321f3e530034575a32399abcb3d07f552c0e9

6 years agoMerge changes from topic "am-84e9fe64-a976-466c-a8d7-d25febc3ff42" into oc-dev am...
Bill Yi [Mon, 11 Jun 2018 20:33:41 +0000 (13:33 -0700)]
Merge changes from topic "am-84e9fe64-a976-466c-a8d7-d25febc3ff42" into oc-dev am: 5b882b9dd7 am: 9ce893db7d am: 053160d965
am: a5f49873c1

Change-Id: Id693b92fca0b24c3df442dfa196fa3f54b5e30c7

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: 1122b10e7d skipped...
Bill Yi [Mon, 11 Jun 2018 20:24:03 +0000 (13:24 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped: 1122b10e7d skipped: ab4ca0c33d am: d82564708f  -s ours am: 2e113959ff  -s ours am: 5caff8b3ac  -s ours
am: b63aa6d5bb  -s ours

Change-Id: I2221a29a450913ee217ce3c6e552fad33c2bf77e

6 years agoMerge changes from topic "am-f1c23412-1f54-4840-90d6-b3eb7b06fc83" into oc-dev am...
Bill Yi [Mon, 11 Jun 2018 20:17:18 +0000 (13:17 -0700)]
Merge changes from topic "am-f1c23412-1f54-4840-90d6-b3eb7b06fc83" into oc-dev am: 59f13cbb8a am: 34d73a6f77 am: 331b188275
am: a3a2117e5f

Change-Id: I59236b66f68d507b8e447d0bb595f099bcdd41db

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: ce28dfa9fa skipped...
Bill Yi [Mon, 11 Jun 2018 20:07:02 +0000 (13:07 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped: ce28dfa9fa skipped: 4f7095b464 am: 124cc34793  -s ours am: b5af202209  -s ours am: 6c409c2e99  -s ours
am: 4256a29fcc  -s ours

Change-Id: I1981ce718c800250fba896c4bdd864a5ec37a708

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: faed2889f4 skipped...
Bill Yi [Mon, 11 Jun 2018 20:05:00 +0000 (13:05 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped: faed2889f4 skipped: 091681e295 am: 4228af93a7  -s ours am: fcd7cc11c7  -s ours am: 927396047c  -s ours
am: 73eb5fee8d  -s ours

Change-Id: I703ad0c542986320b6c5678b4be64333ae2629cb

6 years agoMerge changes from topic "am-84e9fe64-a976-466c-a8d7-d25febc3ff42" into oc-dev am...
Bill Yi [Mon, 11 Jun 2018 19:52:45 +0000 (12:52 -0700)]
Merge changes from topic "am-84e9fe64-a976-466c-a8d7-d25febc3ff42" into oc-dev am: 5b882b9dd7 am: 9ce893db7d
am: 053160d965

Change-Id: I372e94fff2918832b307e6e7895636cfe0b218f3

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: 1122b10e7d skipped...
Bill Yi [Mon, 11 Jun 2018 19:44:22 +0000 (12:44 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped: 1122b10e7d skipped: ab4ca0c33d am: d82564708f  -s ours am: 2e113959ff  -s ours
am: 5caff8b3ac  -s ours

Change-Id: I23a3341bc16e52343d398489b7e74a7903421cac

6 years agoMerge changes from topic "am-84e9fe64-a976-466c-a8d7-d25febc3ff42" into oc-dev am...
Bill Yi [Mon, 11 Jun 2018 19:34:18 +0000 (12:34 -0700)]
Merge changes from topic "am-84e9fe64-a976-466c-a8d7-d25febc3ff42" into oc-dev am: 5b882b9dd7
am: 9ce893db7d

Change-Id: Ib2119bdd41d9266be01a34281f2b414a9d4d6d32

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: 1122b10e7d skipped...
Bill Yi [Mon, 11 Jun 2018 19:27:12 +0000 (12:27 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped: 1122b10e7d skipped: ab4ca0c33d am: d82564708f  -s ours
am: 2e113959ff  -s ours

Change-Id: I4e9f42dca080b08b61f706bb474c31c1ee1db4e5

6 years agoMerge changes from topic "am-f1c23412-1f54-4840-90d6-b3eb7b06fc83" into oc-dev am...
Bill Yi [Mon, 11 Jun 2018 19:10:01 +0000 (12:10 -0700)]
Merge changes from topic "am-f1c23412-1f54-4840-90d6-b3eb7b06fc83" into oc-dev am: 59f13cbb8a am: 34d73a6f77
am: 331b188275

Change-Id: Ie7c5f82c79e8844493bd6dc203f294bc0d645150

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: ce28dfa9fa skipped...
Bill Yi [Mon, 11 Jun 2018 19:01:59 +0000 (12:01 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped: ce28dfa9fa skipped: 4f7095b464 am: 124cc34793  -s ours am: b5af202209  -s ours
am: 6c409c2e99  -s ours

Change-Id: I1c2d8f7e5ccffd726c7111bb46e87e74616a28a4

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: faed2889f4 skipped...
Bill Yi [Mon, 11 Jun 2018 19:00:13 +0000 (12:00 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped: faed2889f4 skipped: 091681e295 am: 4228af93a7  -s ours am: fcd7cc11c7  -s ours
am: 927396047c  -s ours

Change-Id: Id8ad34a3a125dbe8fc7b19399ace436250ecc3a2

6 years agoMerge changes from topic "am-f1c23412-1f54-4840-90d6-b3eb7b06fc83" into oc-dev am...
Bill Yi [Mon, 11 Jun 2018 18:52:05 +0000 (11:52 -0700)]
Merge changes from topic "am-f1c23412-1f54-4840-90d6-b3eb7b06fc83" into oc-dev am: 59f13cbb8a
am: 34d73a6f77

Change-Id: I92656bba49935224c4b97c8c36aaddeaf7360950

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: 05238c7743 skipped...
Bill Yi [Mon, 11 Jun 2018 18:48:00 +0000 (11:48 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped: 05238c7743 skipped: 5e66cc00a4
am: dafe5854dd  -s ours

Change-Id: I7f9086ba7bf5a1754e8dd5e46ccf080b0659b3b0

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: ce28dfa9fa skipped...
Bill Yi [Mon, 11 Jun 2018 18:45:09 +0000 (11:45 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped: ce28dfa9fa skipped: 4f7095b464 am: 124cc34793  -s ours
am: b5af202209  -s ours

Change-Id: I1a8c18e58b587716dccc478fa188931df79d68c4

6 years agoMerge changes from topic "am-84e9fe64-a976-466c-a8d7-d25febc3ff42" into oc-dev
Bill Yi [Mon, 11 Jun 2018 18:43:54 +0000 (11:43 -0700)]
Merge changes from topic "am-84e9fe64-a976-466c-a8d7-d25febc3ff42" into oc-dev
am: 5b882b9dd7

Change-Id: Ieda6e812da1fb9f3ec55201f606dd4a843f63fd4

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: 1122b10e7d skipped...
Bill Yi [Mon, 11 Jun 2018 18:41:53 +0000 (11:41 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped: 1122b10e7d skipped: ab4ca0c33d
am: d82564708f  -s ours

Change-Id: Ib7d487392cec9a11e587b50a5b91899a215599a8

6 years agoMerge changes from topic "am-f1c23412-1f54-4840-90d6-b3eb7b06fc83" into oc-dev
Bill Yi [Mon, 11 Jun 2018 18:37:03 +0000 (11:37 -0700)]
Merge changes from topic "am-f1c23412-1f54-4840-90d6-b3eb7b06fc83" into oc-dev
am: 59f13cbb8a

Change-Id: I47a507e5c0142357a69e7520973e4f79d3d158a8

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: ce28dfa9fa skipped...
Bill Yi [Mon, 11 Jun 2018 18:35:00 +0000 (11:35 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped: ce28dfa9fa skipped: 4f7095b464
am: 124cc34793  -s ours

Change-Id: If5c49902987b4bd076509abf86aafe7407c2525b

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: faed2889f4 skipped...
Bill Yi [Mon, 11 Jun 2018 18:33:02 +0000 (11:33 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped: faed2889f4 skipped: 091681e295 am: 4228af93a7  -s ours
am: fcd7cc11c7  -s ours

Change-Id: I795a9504ea8873999aff1aed5ffb508787a903a1

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: faed2889f4 skipped...
Bill Yi [Mon, 11 Jun 2018 18:21:05 +0000 (11:21 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped: faed2889f4 skipped: 091681e295
am: 4228af93a7  -s ours

Change-Id: I50958128b0b470ee8d2a3ba83660172f210069c0

6 years agoStart the WearPowerService with the other Wear system services
Damien Bargiacchi [Wed, 30 May 2018 20:28:15 +0000 (13:28 -0700)]
Start the WearPowerService with the other Wear system services

The WearPowerService is in charge of coordinating and keeping track of devices and state concerned
with power.

Bug: 77293569
Change-Id: Ia40ad44a53ef6872dd7ebefd58e17179126dde92

6 years agoAdd a setting for the User Absent, Touch Off feature in Wear
Damien Bargiacchi [Wed, 30 May 2018 20:19:41 +0000 (13:19 -0700)]
Add a setting for the User Absent, Touch Off feature in Wear

This is an extension of the User Absent power feature on Wear aka "for small batteries". Turning the
sensor off is one of the aspects of power saving we want to take advantage of when the user is
absent.

Bug: 77293569
Test: make -j80
Test: Device boots
Change-Id: I25a3577d8eb2d157c20ed344056138bc32e8d158

6 years agoMerge changes from topic "am-84e9fe64-a976-466c-a8d7-d25febc3ff42" into oc-dev
TreeHugger Robot [Mon, 11 Jun 2018 18:03:31 +0000 (18:03 +0000)]
Merge changes from topic "am-84e9fe64-a976-466c-a8d7-d25febc3ff42" into oc-dev

* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: 1122b10e7d skipped: ab4ca0c33d
  [automerger skipped] Import translations. DO NOT MERGE skipped: 1122b10e7d
  Import translations. DO NOT MERGE

6 years agoMerge changes from topic "am-f1c23412-1f54-4840-90d6-b3eb7b06fc83" into oc-dev
TreeHugger Robot [Mon, 11 Jun 2018 18:03:15 +0000 (18:03 +0000)]
Merge changes from topic "am-f1c23412-1f54-4840-90d6-b3eb7b06fc83" into oc-dev

* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: ce28dfa9fa skipped: 4f7095b464
  [automerger skipped] Import translations. DO NOT MERGE skipped: ce28dfa9fa
  Import translations. DO NOT MERGE

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: faed2889f4 skipped...
Android Build Merger (Role) [Sun, 10 Jun 2018 06:30:57 +0000 (06:30 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped: faed2889f4 skipped: 091681e295

Change-Id: Idb34650f4e4ffa9086addb3fc25cf528c9b60aa8

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: faed2889f4
Android Build Merger (Role) [Sun, 10 Jun 2018 06:30:51 +0000 (06:30 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped: faed2889f4

Change-Id: Ic0e6aac64c5724221ca6fa3d75d0d0d463cfe9ab

6 years agoImport translations. DO NOT MERGE
Bill Yi [Sun, 10 Jun 2018 06:30:29 +0000 (23:30 -0700)]
Import translations. DO NOT MERGE

Change-Id: I9dcb973ffe7bab8894c863087532615f8c360806
Auto-generated-cl: translation import

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: ce28dfa9fa skipped...
Android Build Merger (Role) [Sun, 10 Jun 2018 06:24:19 +0000 (06:24 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped: ce28dfa9fa skipped: 4f7095b464

Change-Id: I7b5711eabd8f101cc5c268c2469a7f94582e4144

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: ce28dfa9fa
Android Build Merger (Role) [Sun, 10 Jun 2018 06:24:12 +0000 (06:24 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped: ce28dfa9fa

Change-Id: I6e31b858c5da4119d4c331c2d568cb80e77711b5

6 years agoImport translations. DO NOT MERGE
Bill Yi [Sun, 10 Jun 2018 06:23:50 +0000 (23:23 -0700)]
Import translations. DO NOT MERGE

Change-Id: Icccc1ebb6e107e09ed59b9b1b6a235e6d2f4f6fe
Auto-generated-cl: translation import

6 years agoMerge "Include "emergency calls only" in disabled SIM strings." into pi-dev
bsears [Sun, 10 Jun 2018 06:03:27 +0000 (23:03 -0700)]
Merge "Include "emergency calls only" in disabled SIM strings." into pi-dev
am: 9b1f560ee5

Change-Id: I844a396bc714f19b7d572ac7964bfc75b43d630e

6 years agoMerge "Include "emergency calls only" in disabled SIM strings." into pi-dev
bsears [Sun, 10 Jun 2018 05:50:30 +0000 (05:50 +0000)]
Merge "Include "emergency calls only" in disabled SIM strings." into pi-dev

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: 1122b10e7d skipped...
Android Build Merger (Role) [Sun, 10 Jun 2018 05:32:27 +0000 (05:32 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped: 1122b10e7d skipped: ab4ca0c33d

Change-Id: I86175e2cc228f4675e51e31597dbb8df7139a84d

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: 1122b10e7d
Android Build Merger (Role) [Sun, 10 Jun 2018 05:32:22 +0000 (05:32 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped: 1122b10e7d

Change-Id: Iff4d2ee449e66e45d078e3ed7b756de703099f9c

6 years agoImport translations. DO NOT MERGE
Bill Yi [Sun, 10 Jun 2018 05:32:06 +0000 (22:32 -0700)]
Import translations. DO NOT MERGE

Change-Id: I78cebcdc6b07666675b4ef17fc9052e02b0ad087
Auto-generated-cl: translation import

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: 05238c7743 skipped...
Android Build Merger (Role) [Sun, 10 Jun 2018 05:14:01 +0000 (05:14 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped: 05238c7743 skipped: 5e66cc00a4

Change-Id: I8b7d9d4aea3f4f8c049c7dc16bdb8294396c1606

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: 05238c7743
Android Build Merger (Role) [Sun, 10 Jun 2018 05:13:55 +0000 (05:13 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped: 05238c7743

Change-Id: Iedcf37b86d6a03f8a8f47f1f9be1ffec5b25d107

6 years agoImport translations. DO NOT MERGE
Bill Yi [Sun, 10 Jun 2018 05:13:39 +0000 (22:13 -0700)]
Import translations. DO NOT MERGE

Change-Id: I1a91a7546288d359f218d7464c56941a60d67715
Auto-generated-cl: translation import

6 years agoMerge "Revert "Fix DefaultPermissionGrantPolicyTest"" into pi-dev
Eugene Susla [Fri, 8 Jun 2018 23:54:44 +0000 (16:54 -0700)]
Merge "Revert "Fix DefaultPermissionGrantPolicyTest"" into pi-dev
am: e0f55c35a5

Change-Id: I1b52ebbf4d08169d4eff1923ffa0c50b46f54ed7

6 years agoMerge "Revert "Fix DefaultPermissionGrantPolicyTest"" into pi-dev
TreeHugger Robot [Fri, 8 Jun 2018 23:45:29 +0000 (23:45 +0000)]
Merge "Revert "Fix DefaultPermissionGrantPolicyTest"" into pi-dev

6 years agoMerge "Revert "Added online-sdk & off-sdk for Metalava"" into pi-dev
Nan Zhang [Fri, 8 Jun 2018 23:38:33 +0000 (16:38 -0700)]
Merge "Revert "Added online-sdk & off-sdk for Metalava"" into pi-dev
am: a13de3dac2

Change-Id: If73cf9053925322b26c8b5ecebfba9a2b8307317

6 years agoMerge "Revert "Added online-sdk & off-sdk for Metalava"" into pi-dev
Nan Zhang [Fri, 8 Jun 2018 23:26:16 +0000 (23:26 +0000)]
Merge "Revert "Added online-sdk & off-sdk for Metalava"" into pi-dev

6 years agoRevert "Added online-sdk & off-sdk for Metalava"
Nan Zhang [Fri, 8 Jun 2018 23:11:18 +0000 (23:11 +0000)]
Revert "Added online-sdk & off-sdk for Metalava"

This reverts commit 726df7efc9e8faad94ee8133fcb4fd976b66ebda.

Reason for revert: <Didn't add Merged-in which flows this change down to pi-dev-plus-aosp>
Bug: b/78245848

Change-Id: Ie15181bcb91314718ee9902402179cd010f17553

6 years agoMerge "Revert "Consider icon scale when calculating icon offset in shelf"" into pi-dev
Selim Cinek [Fri, 8 Jun 2018 23:06:40 +0000 (16:06 -0700)]
Merge "Revert "Consider icon scale when calculating icon offset in shelf"" into pi-dev
am: 70a9cd292b

Change-Id: Icec4694f122ae024ee329f0fad5bf8989016ff7e

6 years agoMerge "Fixed a flickering of the icon when it goes into the shelf" into pi-dev
Selim Cinek [Fri, 8 Jun 2018 23:00:48 +0000 (16:00 -0700)]
Merge "Fixed a flickering of the icon when it goes into the shelf" into pi-dev
am: 40e41a6299

Change-Id: I263d20392c4d899b0b649aeac952f312bda03ed9

6 years agoMerge "Revert "Consider icon scale when calculating icon offset in shelf"" into pi-dev
Selim Cinek [Fri, 8 Jun 2018 22:51:07 +0000 (22:51 +0000)]
Merge "Revert "Consider icon scale when calculating icon offset in shelf"" into pi-dev

6 years agoMerge "Fixed a flickering of the icon when it goes into the shelf" into pi-dev
Selim Cinek [Fri, 8 Jun 2018 22:50:12 +0000 (22:50 +0000)]
Merge "Fixed a flickering of the icon when it goes into the shelf" into pi-dev

6 years agoRevert "Fix DefaultPermissionGrantPolicyTest"
Eugene Susla [Fri, 8 Jun 2018 21:39:58 +0000 (21:39 +0000)]
Revert "Fix DefaultPermissionGrantPolicyTest"

This ended up being not the right fix for the bug, and
had a consequence of AiAi permissions becoming fixed.
Per recent email thread, reverting this back to how it was

This reverts commit 0988f24dfff1529552c857fb1c28592070ecc1b8.

Fixes: 109665265
Change-Id: Ibf39c3b788c09f189d941f830ebbe8f371fc6f6a

6 years agoMerge "More light grey APIs." into pi-dev
Nicolas Geoffray [Fri, 8 Jun 2018 21:53:53 +0000 (14:53 -0700)]
Merge "More light grey APIs." into pi-dev
am: ce30fd3904

Change-Id: Ia06fde619a9d84e1632766b3a49e98abd04c51ef

6 years agoMerge "More light grey APIs." into pi-dev
TreeHugger Robot [Fri, 8 Jun 2018 21:21:29 +0000 (21:21 +0000)]
Merge "More light grey APIs." into pi-dev

6 years agoAdded online-sdk & off-sdk for Metalava
Nan Zhang [Fri, 8 Jun 2018 21:15:17 +0000 (14:15 -0700)]
Added online-sdk & off-sdk for Metalava
am: 726df7efc9

Change-Id: I9342a3fa7d845bc7c3b45b4c6ed6a1f888ccb79d

6 years agoMerge "DO NOT MERGE Update battery stats buffer on wear branch." into pi-wear-dev
TreeHugger Robot [Fri, 8 Jun 2018 20:24:07 +0000 (20:24 +0000)]
Merge "DO NOT MERGE Update battery stats buffer on wear branch." into pi-wear-dev

6 years agoInclude "emergency calls only" in disabled SIM strings.
Dan Sandler [Fri, 8 Jun 2018 19:34:52 +0000 (15:34 -0400)]
Include "emergency calls only" in disabled SIM strings.

This message appears in the QS footer when the SIM has been
disabled permanently (IccCardConstants.State.PERM_DISABLED).

Required in Australia, harmless elsewhere.

Test: runtest systemui
Bug: 109874640
Change-Id: Ib2b3fcf2bd84c54b61f0bd45fe0b83209d9c9bd0

6 years agoAdded online-sdk & off-sdk for Metalava
Nan Zhang [Fri, 8 Jun 2018 18:50:42 +0000 (11:50 -0700)]
Added online-sdk & off-sdk for Metalava

Test: m -j metalava online-sdk-docs
Bug: b/78245848
Change-Id: I2cf92b14d20ecb2898e90c5e5956612f49acd33c

6 years agoMerge "Enabled annotations for api-stubs, system-api-stubs, and test-api-stubs" into...
Nan Zhang [Fri, 8 Jun 2018 17:50:51 +0000 (10:50 -0700)]
Merge "Enabled annotations for api-stubs, system-api-stubs, and test-api-stubs" into pi-dev
am: cb3dd2889c

Change-Id: I808d49cf2b00234aa486726d3b7d8db85cd9d63f

6 years agoMerge "Fixed typo on TextValueSanitizer sample." into pi-dev
Felipe Leme [Fri, 8 Jun 2018 17:32:10 +0000 (10:32 -0700)]
Merge "Fixed typo on TextValueSanitizer sample." into pi-dev
am: c5b828df68

Change-Id: I09341c589ad8821e5d9fee8823004488cdd8a50f

6 years agoMerge "Enabled annotations for api-stubs, system-api-stubs, and test-api-stubs" into...
Nan Zhang [Fri, 8 Jun 2018 17:28:37 +0000 (17:28 +0000)]
Merge "Enabled annotations for api-stubs, system-api-stubs, and test-api-stubs" into pi-dev

6 years agoMerge "Fixed typo on TextValueSanitizer sample." into pi-dev
TreeHugger Robot [Fri, 8 Jun 2018 17:20:27 +0000 (17:20 +0000)]
Merge "Fixed typo on TextValueSanitizer sample." into pi-dev

6 years agoFixed a flickering of the icon when it goes into the shelf
Selim Cinek [Fri, 8 Jun 2018 07:26:48 +0000 (00:26 -0700)]
Fixed a flickering of the icon when it goes into the shelf

We can adjust the Pivot such that the scaling doesn't happen
irregularly and that the animation is smooth.

Change-Id: Ib2e42a20430e1c10950a197a4c04e7c64c7dec67
Test: add notification, no flicker
Fixes: 80270979

6 years agoMore light grey APIs.
Nicolas Geoffray [Fri, 8 Jun 2018 12:09:18 +0000 (13:09 +0100)]
More light grey APIs.

bug: 109894533
bug: 109889637

Test: m
Change-Id: I3bf3f5b846a48fe189131fb0f6a3be217c274554

6 years agoRevert "Consider icon scale when calculating icon offset in shelf"
Bill Lin [Fri, 8 Jun 2018 09:07:13 +0000 (17:07 +0800)]
Revert "Consider icon scale when calculating icon offset in shelf"

This reverts commit 5dad60e6928f29d5a959cb4e2fb45e17253ca88c.
The patch may cause latest Notification do not align center
Bug: 109868942
Test: atest & manual use notify observe only last 1 notification visual

Change-Id: I81e5de4d0a2822c96ce9a815519bb0413f26f27c

6 years agoMerge "pm: Exposing Vulkan 1.1 does not guarantee AHB extension support" into pi-dev
Chris Forbes [Fri, 8 Jun 2018 05:23:26 +0000 (22:23 -0700)]
Merge "pm: Exposing Vulkan 1.1 does not guarantee AHB extension support" into pi-dev
am: 551328eaaa

Change-Id: I4f52821b8eb27f5c63b49bdd52217e399293987e

6 years agoMerge "pm: Exposing Vulkan 1.1 does not guarantee AHB extension support" into pi-dev
Chris Forbes [Fri, 8 Jun 2018 05:14:12 +0000 (05:14 +0000)]
Merge "pm: Exposing Vulkan 1.1 does not guarantee AHB extension support" into pi-dev

6 years agoMerge "Don't access keyguard from instant apps." into pi-dev
Svet Ganov [Fri, 8 Jun 2018 05:13:12 +0000 (22:13 -0700)]
Merge "Don't access keyguard from instant apps." into pi-dev
am: e7bd4e7e8f

Change-Id: I8e26a8d4333aca94fd53297d7322e7743e5728fa

6 years agoMerge "Don't access keyguard from instant apps." into pi-dev
TreeHugger Robot [Fri, 8 Jun 2018 04:49:39 +0000 (04:49 +0000)]
Merge "Don't access keyguard from instant apps." into pi-dev

6 years agoMerge "Revert "Let sendShowMessage called from hide to show"" into pi-dev
Adam Powell [Fri, 8 Jun 2018 04:16:12 +0000 (21:16 -0700)]
Merge "Revert "Let sendShowMessage called from hide to show"" into pi-dev
am: eaf3590eda

Change-Id: If235aaf384df0ff81902eabe258e0ad7bf72fa8d

6 years agoMerge "Animate owner info during wake-up transition" into pi-dev
Lucas Dupin [Fri, 8 Jun 2018 04:09:46 +0000 (21:09 -0700)]
Merge "Animate owner info during wake-up transition" into pi-dev
am: c28e772042

Change-Id: Ic1947d435d745307ac7ae844052d8f99774a3632

6 years agoMerge "Revert "Let sendShowMessage called from hide to show"" into pi-dev
TreeHugger Robot [Fri, 8 Jun 2018 03:48:21 +0000 (03:48 +0000)]
Merge "Revert "Let sendShowMessage called from hide to show"" into pi-dev

6 years agoMerge "Animate owner info during wake-up transition" into pi-dev
TreeHugger Robot [Fri, 8 Jun 2018 03:38:01 +0000 (03:38 +0000)]
Merge "Animate owner info during wake-up transition" into pi-dev

6 years agoDon't access keyguard from instant apps.
Svet Ganov [Fri, 8 Jun 2018 03:20:34 +0000 (20:20 -0700)]
Don't access keyguard from instant apps.

Test: cts-instant-tradefed run cts-instant -m CtsViewTestCases

bug:109652548

Change-Id: I6f8bb714bd98fd53068b2662633a9155d64b274c

6 years agoMerge "Revert "Allow instant apps to send broadcasts to themselves"" into pi-dev
Svetoslav Ganov [Fri, 8 Jun 2018 03:15:19 +0000 (20:15 -0700)]
Merge "Revert "Allow instant apps to send broadcasts to themselves"" into pi-dev
am: 97995da6e1

Change-Id: I745ba50732f695fca3c54658d1ba53d015b09907

6 years agoMerge "Revert "Allow instant apps to send broadcasts to themselves"" into pi-dev
TreeHugger Robot [Fri, 8 Jun 2018 03:00:26 +0000 (03:00 +0000)]
Merge "Revert "Allow instant apps to send broadcasts to themselves"" into pi-dev

6 years agoMerge "Docs: noted that setting proxy hostnames on an ApnSetting requires an internet...
Benjamin Miller [Fri, 8 Jun 2018 02:44:06 +0000 (19:44 -0700)]
Merge "Docs: noted that setting proxy hostnames on an ApnSetting requires an internet connection for DNS." into pi-dev
am: 0f5f09844d

Change-Id: Iaf4e49124f0e30d491d24b0a831576d1d35a5d22

6 years agoMerge "Docs: noted that setting proxy hostnames on an ApnSetting requires an internet...
TreeHugger Robot [Fri, 8 Jun 2018 02:24:22 +0000 (02:24 +0000)]
Merge "Docs: noted that setting proxy hostnames on an ApnSetting requires an internet connection for DNS." into pi-dev

6 years agoMerge changes from topic "volume-change-flags" into pi-dev
Lin Guo [Fri, 8 Jun 2018 02:21:38 +0000 (19:21 -0700)]
Merge changes from topic "volume-change-flags" into pi-dev
am: a88cf78009

Change-Id: I8ef3832e31f83ced6ef975afa31d100da948c5ad

6 years agoMerge changes from topic "volume-change-flags" into pi-dev
TreeHugger Robot [Fri, 8 Jun 2018 01:58:10 +0000 (01:58 +0000)]
Merge changes from topic "volume-change-flags" into pi-dev

* changes:
  Only show the volume dialog if the AudioManager.FLAG_SHOW_UI bit is set
  Comply with the volume callback change

6 years agoChange Quick Settings to account for branded VPNs.
Anarghya Mitra [Fri, 8 Jun 2018 01:01:04 +0000 (18:01 -0700)]
Change Quick Settings to account for branded VPNs.
am: 10422896ed

Change-Id: Ife96e59657005b2627aa82c4f65df3722c57e9f7

6 years agoMerge "Disable REQUEST_LOCATION from GNSS HAL by default" into pi-dev
Yu-Han Yang [Fri, 8 Jun 2018 00:26:27 +0000 (17:26 -0700)]
Merge "Disable REQUEST_LOCATION from GNSS HAL by default" into pi-dev
am: a364b3111a

Change-Id: I16ce962a1e86f8ceb2ba9ae26cb9285113f650ca

6 years agoOnly show the volume dialog if the AudioManager.FLAG_SHOW_UI bit is set
Lin Guo [Fri, 8 Jun 2018 00:08:30 +0000 (17:08 -0700)]
Only show the volume dialog if the AudioManager.FLAG_SHOW_UI bit is set

Bug: 109841417
Test: manual

Change-Id: Icc803a4b22ceccff7d3e788b9164975a8e395a3b

6 years agoChange Quick Settings to account for branded VPNs.
Anarghya Mitra [Thu, 7 Jun 2018 20:26:14 +0000 (13:26 -0700)]
Change Quick Settings to account for branded VPNs.

Screenshots: https://photos.app.goo.gl/FrnK69TXR86npFmY2
Test: runtest --path frameworks/base/packages/SystemUI/tests/src/com/android/systemui/qs
Bug: 109837832
Change-Id: Ie447e6598ff593ff5d14ec8787db82ba39c9ea54

6 years agoMerge "Remove usage of deprecated DayNightStyle values." into pi-dev
Anthony Chen [Thu, 7 Jun 2018 23:50:20 +0000 (16:50 -0700)]
Merge "Remove usage of deprecated DayNightStyle values." into pi-dev
am: a0d475a43f

Change-Id: I3d8664f74250bda3737d7851d37af857cb2f7214

6 years agoMerge "Disable REQUEST_LOCATION from GNSS HAL by default" into pi-dev
Yu-Han Yang [Thu, 7 Jun 2018 23:50:08 +0000 (23:50 +0000)]
Merge "Disable REQUEST_LOCATION from GNSS HAL by default" into pi-dev

6 years agopm: Exposing Vulkan 1.1 does not guarantee AHB extension support
Chris Forbes [Thu, 7 Jun 2018 23:41:19 +0000 (16:41 -0700)]
pm: Exposing Vulkan 1.1 does not guarantee AHB extension support

Bug: b/109875843
Change-Id: Ib53fb1a4f7a5a6c055b575b4d8775f8bd62db7a8

6 years agoMerge "Move nulling of nextFrameCallback" into pi-dev
Jorim Jaggi [Thu, 7 Jun 2018 23:40:44 +0000 (16:40 -0700)]
Merge "Move nulling of nextFrameCallback" into pi-dev
am: e4e9ee7951

Change-Id: Ifa5b678dcea9ffb41290cd1152d6c86a8ab14a90

6 years agoMerge "Increase Binder Proxy Limit to 6000 for SYSTEM" into pi-dev
Michael Wachenschwanz [Thu, 7 Jun 2018 23:31:19 +0000 (16:31 -0700)]
Merge "Increase Binder Proxy Limit to 6000 for SYSTEM" into pi-dev
am: f55cce3008

Change-Id: I8638fa9a7d660a86209344cba2eaea674e465312

6 years agoRevert "Allow instant apps to send broadcasts to themselves"
Svetoslav Ganov [Thu, 7 Jun 2018 23:23:39 +0000 (23:23 +0000)]
Revert "Allow instant apps to send broadcasts to themselves"

This reverts commit 7b40358fa316038ce6a3243b8706c6f5b7a49536.

Reason for revert: False positive - this works and patch not needed.

bug:109583877

Change-Id: If708350b03292cfa3bf9841199739e06c82f6c4f

6 years agoMerge "Show the bouncer at start up if the headless user flag is set" into pi-dev
Aarthi Balachander [Thu, 7 Jun 2018 23:04:44 +0000 (16:04 -0700)]
Merge "Show the bouncer at start up if the headless user flag is set" into pi-dev
am: 36fc3b1a53

Change-Id: Ic6ee382d2619e3004a1ea4b9bee89d10c7bf7569

6 years agoMerge "Camera: update tonemap image in html doc" into pi-dev
Yin-Chia Yeh [Thu, 7 Jun 2018 22:55:12 +0000 (15:55 -0700)]
Merge "Camera: update tonemap image in html doc" into pi-dev
am: beb11a582a

Change-Id: Ied75d2e19cd9f0b3a5e8cfb8529625e3b9573a5d

6 years agoMerge "MediaSessionService: Fix NPE" into pi-dev
Jaewan Kim [Thu, 7 Jun 2018 22:48:55 +0000 (15:48 -0700)]
Merge "MediaSessionService: Fix NPE" into pi-dev
am: 2aac6195e6

Change-Id: Ife9de2cf1eec7537081be01d4903927589bc6919

6 years agoMerge "Disable statsd and make StatsLog no-op if ro.statsd.enable=false" into pi-dev
Yao Chen [Thu, 7 Jun 2018 22:37:53 +0000 (15:37 -0700)]
Merge "Disable statsd and make StatsLog no-op if ro.statsd.enable=false" into pi-dev
am: 38b92986df

Change-Id: Ied96dcde94aadfcf5aeda32ce8dd6707f5e2b91f

6 years agoComply with the volume callback change
Hongwei Wang [Thu, 7 Jun 2018 19:35:08 +0000 (12:35 -0700)]
Comply with the volume callback change

Bug: 109841417
Test: m -j
Change-Id: I43a139b97f89a666088db39579b068dc76babd56

6 years agoMerge "Remove usage of deprecated DayNightStyle values." into pi-dev
TreeHugger Robot [Thu, 7 Jun 2018 22:23:12 +0000 (22:23 +0000)]
Merge "Remove usage of deprecated DayNightStyle values." into pi-dev

6 years agoMerge "Move nulling of nextFrameCallback" into pi-dev
TreeHugger Robot [Thu, 7 Jun 2018 22:14:51 +0000 (22:14 +0000)]
Merge "Move nulling of nextFrameCallback" into pi-dev

6 years agoMerge "Increase Binder Proxy Limit to 6000 for SYSTEM" into pi-dev
TreeHugger Robot [Thu, 7 Jun 2018 21:43:50 +0000 (21:43 +0000)]
Merge "Increase Binder Proxy Limit to 6000 for SYSTEM" into pi-dev

6 years agoMerge "Show the bouncer at start up if the headless user flag is set" into pi-dev
TreeHugger Robot [Thu, 7 Jun 2018 21:42:59 +0000 (21:42 +0000)]
Merge "Show the bouncer at start up if the headless user flag is set" into pi-dev

6 years agoMerge "Camera: update tonemap image in html doc" into pi-dev
TreeHugger Robot [Thu, 7 Jun 2018 21:33:59 +0000 (21:33 +0000)]
Merge "Camera: update tonemap image in html doc" into pi-dev