git.osdn.net Git - android-x86/frameworks-base.git/log

Bill Yi [Tue, 12 Jun 2018 00:39:28 +0000 (17:39 -0700)]

[automerger skipped] Import translations. DO NOT MERGE skipped: 5e25fd88a8 skipped: c6a1d32ebe am: 6d30123999 -s ours am: f9efc3043a -s ours am: 9e7657c13d -s ours
am: 7609e23612 -s ours

Change-Id: I595c862f3752852f76fdafc8651ba740ef01b6e9

commit | commitdiff | tree

Bill Yi [Tue, 12 Jun 2018 00:32:10 +0000 (17:32 -0700)]

Merge changes from topic "am-63639373-f180-4cce-87e9-95ef192ab9ec" into oc-dev am: 3bbe3c7c93 am: 24701167ba am: 689cf0f8a2
am: 995c542d0c

Change-Id: I83821002d9bddb74f9ec961313878c2be94558e7

commit | commitdiff | tree

Bill Yi [Tue, 12 Jun 2018 00:22:31 +0000 (17:22 -0700)]

[automerger skipped] Import translations. DO NOT MERGE skipped: 0be149db42 skipped: 3c2edd55ce am: 71f5cfa650 -s ours am: f2ce740a1e -s ours am: b10ebef583 -s ours
am: 7cea26fc9e -s ours

Change-Id: I1629396b23c0c087402a531095d4c5e5d128c3c0

commit | commitdiff | tree

Bill Yi [Tue, 12 Jun 2018 00:15:08 +0000 (17:15 -0700)]

Merge changes from topic "am-da3e9584-98c5-4975-8207-a77d2301579a" into oc-dev am: bd9caf4c6f am: 2b605d89b9 am: 64c1873c30
am: 6dbef2a740

Change-Id: Idcb33a3c4b655c5187c0d76d34ca1609044e1d45

commit | commitdiff | tree

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

commit | commitdiff | tree

Bill Yi [Mon, 11 Jun 2018 22:09:52 +0000 (15:09 -0700)]

[automerger skipped] Import translations. DO NOT MERGE skipped: 5e25fd88a8 skipped: c6a1d32ebe am: 6d30123999 -s ours am: f9efc3043a -s ours
am: 9e7657c13d -s ours

Change-Id: Ie100fd774ad3262f3edf1b5b2baaa3786200dccc

commit | commitdiff | tree

Bill Yi [Mon, 11 Jun 2018 22:04:23 +0000 (15:04 -0700)]

Merge changes from topic "am-63639373-f180-4cce-87e9-95ef192ab9ec" into oc-dev am: 3bbe3c7c93 am: 24701167ba
am: 689cf0f8a2

Change-Id: I211002b40f5acf9f7ad0a44e4530019df72c3b7c

commit | commitdiff | tree

Bill Yi [Mon, 11 Jun 2018 21:57:09 +0000 (14:57 -0700)]

[automerger skipped] Import translations. DO NOT MERGE skipped: 0be149db42 skipped: 3c2edd55ce am: 71f5cfa650 -s ours am: f2ce740a1e -s ours
am: b10ebef583 -s ours

Change-Id: Ieb35e183766df1fae623f85ccb2c3a3291b35085

commit | commitdiff | tree

Bill Yi [Mon, 11 Jun 2018 21:51:44 +0000 (14:51 -0700)]

Merge changes from topic "am-da3e9584-98c5-4975-8207-a77d2301579a" into oc-dev am: bd9caf4c6f am: 2b605d89b9
am: 64c1873c30

Change-Id: Ie4a67f372f3a7d187a7c7fe9c5d364c460535376

commit | commitdiff | tree

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

commit | commitdiff | tree

Bill Yi [Mon, 11 Jun 2018 21:25:28 +0000 (14:25 -0700)]

[automerger skipped] Import translations. DO NOT MERGE skipped: 5e25fd88a8 skipped: c6a1d32ebe am: 6d30123999 -s ours
am: f9efc3043a -s ours

Change-Id: Ia4ef7b14406c4f0f15b9d17d107308f93282684b

commit | commitdiff | tree

Bill Yi [Mon, 11 Jun 2018 21:01:09 +0000 (14:01 -0700)]

Merge changes from topic "am-63639373-f180-4cce-87e9-95ef192ab9ec" into oc-dev am: 3bbe3c7c93
am: 24701167ba

Change-Id: I2cc8202e1abaf739a71126665599c3b262f5e7d7

commit | commitdiff | tree

Bill Yi [Mon, 11 Jun 2018 20:54:34 +0000 (13:54 -0700)]

[automerger skipped] Import translations. DO NOT MERGE skipped: 0be149db42 skipped: 3c2edd55ce am: 71f5cfa650 -s ours
am: f2ce740a1e -s ours

Change-Id: Ibcaa1f68b57714de2a7295d93d1875274b750071

commit | commitdiff | tree

Bill Yi [Mon, 11 Jun 2018 20:49:02 +0000 (13:49 -0700)]

Merge changes from topic "am-da3e9584-98c5-4975-8207-a77d2301579a" into oc-dev am: bd9caf4c6f
am: 2b605d89b9

Change-Id: I1686e2207e5764167e1e75fcbf4d0be08bf4590d

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Bill Yi [Mon, 11 Jun 2018 19:17:38 +0000 (12:17 -0700)]

[automerger skipped] Import translations. DO NOT MERGE skipped: 5e25fd88a8 skipped: c6a1d32ebe
am: 6d30123999 -s ours

Change-Id: I1f2ad23fa8c9975b1be5e089a4001e5871958aee

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Bill Yi [Mon, 11 Jun 2018 18:56:42 +0000 (11:56 -0700)]

Merge changes from topic "am-63639373-f180-4cce-87e9-95ef192ab9ec" into oc-dev
am: 3bbe3c7c93

Change-Id: I15050b23d75c15ca69d1aeadddef4f8f955276ef

commit | commitdiff | tree

Bill Yi [Mon, 11 Jun 2018 18:54:34 +0000 (11:54 -0700)]

[automerger skipped] Import translations. DO NOT MERGE skipped: 0be149db42 skipped: 3c2edd55ce
am: 71f5cfa650 -s ours

Change-Id: Ia5633210e4fced8acfffa5cde6588b3159f1036f

commit | commitdiff | tree

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

commit | commitdiff | tree

Bill Yi [Mon, 11 Jun 2018 18:50:24 +0000 (11:50 -0700)]

Merge changes from topic "am-da3e9584-98c5-4975-8207-a77d2301579a" into oc-dev
am: bd9caf4c6f

Change-Id: I04decd84fba3ec690b6d77d2880b14245810b4fd

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

TreeHugger Robot [Mon, 11 Jun 2018 18:06:41 +0000 (18:06 +0000)]

Merge changes from topic "am-63639373-f180-4cce-87e9-95ef192ab9ec" into oc-dev

* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: 0be149db42 skipped: 3c2edd55ce
  [automerger skipped] Import translations. DO NOT MERGE skipped: 0be149db42
  Import translations. DO NOT MERGE

commit | commitdiff | tree

TreeHugger Robot [Mon, 11 Jun 2018 18:05:42 +0000 (18:05 +0000)]

Merge changes from topic "am-da3e9584-98c5-4975-8207-a77d2301579a" into oc-dev

* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: 05238c7743 skipped: 5e66cc00a4
  [automerger skipped] Import translations. DO NOT MERGE skipped: 05238c7743
  Import translations. DO NOT MERGE

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

bsears [Sun, 10 Jun 2018 05:50:30 +0000 (05:50 +0000)]

Merge "Include "emergency calls only" in disabled SIM strings." into pi-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Android Build Merger (Role) [Sun, 10 Jun 2018 05:26:04 +0000 (05:26 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: 0be149db42 skipped: 3c2edd55ce

Change-Id: I73ec9c33f82e9c2e15430a95b61c500e06ae4c38

commit | commitdiff | tree

Android Build Merger (Role) [Sun, 10 Jun 2018 05:25:57 +0000 (05:25 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: 0be149db42

Change-Id: I3860b45554cd0577a1aab3242537ff1735339ed3

commit | commitdiff | tree

Bill Yi [Sun, 10 Jun 2018 05:25:32 +0000 (22:25 -0700)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Android Build Merger (Role) [Sun, 10 Jun 2018 04:15:10 +0000 (04:15 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: 5e25fd88a8 skipped: c6a1d32ebe

Change-Id: Ibff061c7234a3805ed90d8460ce4ca79d3d112ee

commit | commitdiff | tree

Android Build Merger (Role) [Sun, 10 Jun 2018 04:15:01 +0000 (04:15 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: 5e25fd88a8

Change-Id: Iae2ab9a66d4834c4a85e6bb9eadaa6df54914726

commit | commitdiff | tree

Bill Yi [Sun, 10 Jun 2018 04:14:35 +0000 (21:14 -0700)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

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

commit | commitdiff | tree

TreeHugger Robot [Fri, 8 Jun 2018 23:45:29 +0000 (23:45 +0000)]

Merge "Revert "Fix DefaultPermissionGrantPolicyTest"" into pi-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

TreeHugger Robot [Fri, 8 Jun 2018 21:21:29 +0000 (21:21 +0000)]

Merge "More light grey APIs." into pi-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

TreeHugger Robot [Fri, 8 Jun 2018 17:20:27 +0000 (17:20 +0000)]

Merge "Fixed typo on TextValueSanitizer sample." into pi-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

TreeHugger Robot [Fri, 8 Jun 2018 04:49:39 +0000 (04:49 +0000)]

Merge "Don't access keyguard from instant apps." into pi-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

TreeHugger Robot [Fri, 8 Jun 2018 03:38:01 +0000 (03:38 +0000)]

Merge "Animate owner info during wake-up transition" into pi-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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