TreeHugger Robot
7787e22dd3
[automerger skipped] Merge "RESTRICT AUTOMERGE Prevent non-system overlays from showing over notification listener consent dialog" into qt-dev am: a91519976e
am: 2aa9a43701
-s ours am: a9892de23f
am: 85f6ce8e71
am: d6d4c2ac64
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12998689
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I9675f55bc51baea068c6487f0a3fe7da7235aa6b
2020-12-07 21:08:45 +00:00
Eugene Susla
cd191477c8
[automerger skipped] RESTRICT AUTOMERGE am: 2e82aa5d05
am: c8d81959a2
-s ours am: bfee0284e1
am: a5da16b1d6
am: bbad7cee9c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12998689
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I153982db74a0316f1ac09bb2b6c72c1ac6bd282e
2020-12-07 21:08:42 +00:00
Eugene Susla
39075b350e
[automerger skipped] RESTRICT AUTOMERGE am: 0c870fd7df
-s ours am: 74ca730b4a
-s ours am: 22864c728b
am: 24ec36b6e8
-s ours am: 40961e80cd
am: cf7f335294
am: edad8243b0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13066751
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Idf07ef6acf26be8079fd48d4af4311c7b38f330a
2020-12-07 21:08:33 +00:00
TreeHugger Robot
d6d4c2ac64
[automerger skipped] Merge "RESTRICT AUTOMERGE Prevent non-system overlays from showing over notification listener consent dialog" into qt-dev am: a91519976e
am: 2aa9a43701
-s ours am: a9892de23f
am: 85f6ce8e71
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12998689
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I17f588dc8bcd527b9f43492bc6437ac3d7dbff7f
2020-12-07 20:54:43 +00:00
Eugene Susla
bbad7cee9c
[automerger skipped] RESTRICT AUTOMERGE am: 2e82aa5d05
am: c8d81959a2
-s ours am: bfee0284e1
am: a5da16b1d6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12998689
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I69282d3c13d0bc4652beddc4823384a9817f148f
2020-12-07 20:54:40 +00:00
Eugene Susla
edad8243b0
[automerger skipped] RESTRICT AUTOMERGE am: 0c870fd7df
-s ours am: 74ca730b4a
-s ours am: 22864c728b
am: 24ec36b6e8
-s ours am: 40961e80cd
am: cf7f335294
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13066751
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iac627656862cbf1348a29e7401c98e6fa74cba33
2020-12-07 20:54:30 +00:00
TreeHugger Robot
85f6ce8e71
[automerger skipped] Merge "RESTRICT AUTOMERGE Prevent non-system overlays from showing over notification listener consent dialog" into qt-dev am: a91519976e
am: 2aa9a43701
-s ours am: a9892de23f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12998689
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I65d77c3c623f4c4ee099e0814db1d30cda2af6dd
2020-12-07 20:22:50 +00:00
Eugene Susla
a5da16b1d6
[automerger skipped] RESTRICT AUTOMERGE am: 2e82aa5d05
am: c8d81959a2
-s ours am: bfee0284e1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12998689
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id3914c813a2c1fb40afd9fa8704d103ce74a0a80
2020-12-07 20:22:47 +00:00
Eugene Susla
cf7f335294
[automerger skipped] RESTRICT AUTOMERGE am: 0c870fd7df
-s ours am: 74ca730b4a
-s ours am: 22864c728b
am: 24ec36b6e8
-s ours am: 40961e80cd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13066751
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I66c2806838f41b9e5fd022fd126e65773ae125cd
2020-12-07 20:22:32 +00:00
TreeHugger Robot
a9892de23f
[automerger skipped] Merge "RESTRICT AUTOMERGE Prevent non-system overlays from showing over notification listener consent dialog" into qt-dev am: a91519976e
am: 2aa9a43701
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12998689
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4a415856595ff465a67d7312d2d9c09a410e87af
2020-12-07 20:02:48 +00:00
Eugene Susla
bfee0284e1
[automerger skipped] RESTRICT AUTOMERGE am: 2e82aa5d05
am: c8d81959a2
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12998689
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id8bb775b57acd051c5ce9658cdb0faeac152890f
2020-12-07 20:02:46 +00:00
Eugene Susla
40961e80cd
[automerger skipped] RESTRICT AUTOMERGE am: 0c870fd7df
-s ours am: 74ca730b4a
-s ours am: 22864c728b
am: 24ec36b6e8
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13066751
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I67d0a5b8803ed1480752f1bd82852ce4d5ad8e13
2020-12-07 20:02:31 +00:00
TreeHugger Robot
2aa9a43701
Merge "RESTRICT AUTOMERGE Prevent non-system overlays from showing over notification listener consent dialog" into qt-dev am: a91519976e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12998689
Change-Id: I5bd01274e4f00a8f7666a364323525faa60e3251
2020-12-07 19:28:33 +00:00
Eugene Susla
c8d81959a2
RESTRICT AUTOMERGE am: 2e82aa5d05
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12998689
Change-Id: I850120ab85fa938ebce7115c778b833b5266594c
2020-12-07 19:28:31 +00:00
Eugene Susla
24ec36b6e8
[automerger skipped] RESTRICT AUTOMERGE am: 0c870fd7df
-s ours am: 74ca730b4a
-s ours am: 22864c728b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13066751
Change-Id: I633b0e35a224055ca9f07de627322f48065a234e
2020-12-07 19:28:24 +00:00
TreeHugger Robot
a91519976e
Merge "RESTRICT AUTOMERGE Prevent non-system overlays from showing over notification listener consent dialog" into qt-dev
2020-12-07 19:19:14 +00:00
Eugene Susla
22864c728b
[automerger skipped] RESTRICT AUTOMERGE am: 0c870fd7df
-s ours am: 74ca730b4a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13066751
Change-Id: I689123f39fc3399d71f873025605319131ff19ab
2020-12-07 19:01:56 +00:00
Eugene Susla
74ca730b4a
[automerger skipped] RESTRICT AUTOMERGE am: 0c870fd7df
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13066751
Change-Id: Idd2522623b35128ccc207d99d21371aefa0c4454
2020-12-07 18:47:31 +00:00
Eugene Susla
ff7de9afd8
[automerger skipped] RESTRICT AUTOMERGE am: bd4d6d8138
-s ours am: 7bd20e27ab
am: 90a1422f8c
-s ours am: 5dcdc8c8f4
am: 03b269ea1d
am: f0ecfe2cfc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12998691
Change-Id: I2e8e5d8d7a9d2cb78d7bf7dee9c3a7787dce3550
2020-12-07 18:18:36 +00:00
Eugene Susla
f0ecfe2cfc
[automerger skipped] RESTRICT AUTOMERGE am: bd4d6d8138
-s ours am: 7bd20e27ab
am: 90a1422f8c
-s ours am: 5dcdc8c8f4
am: 03b269ea1d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12998691
Change-Id: I635d9648a8facd4383de1eea4890f8ad43ddf289
2020-12-07 18:05:24 +00:00
Eugene Susla
03b269ea1d
[automerger skipped] RESTRICT AUTOMERGE am: bd4d6d8138
-s ours am: 7bd20e27ab
am: 90a1422f8c
-s ours am: 5dcdc8c8f4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12998691
Change-Id: Ife51a5f9684c6f7fa5ce49a976c522bb0871913e
2020-12-07 17:36:41 +00:00
Xin Li
4a0b338a72
DO NOT MERGE - Merge RQ1A.201205.011 am: 07ccb42665
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13177007
Change-Id: I7776a64392da353f47e50892a395015d0ec08b4f
2020-12-07 17:31:32 +00:00
Eugene Susla
337aa8dbf3
RESTRICT AUTOMERGE am: bfa7a75545
am: d67e22c122
am: 31505ca0b3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12998688
Change-Id: Ibef7c004a50181c2b3708d282d7c9f166c90708c
2020-12-07 17:21:25 +00:00
Eugene Susla
5dcdc8c8f4
[automerger skipped] RESTRICT AUTOMERGE am: bd4d6d8138
-s ours am: 7bd20e27ab
am: 90a1422f8c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12998691
Change-Id: If59a3b1d966223a067f4dc3eb54a3628b3232efc
2020-12-07 17:21:19 +00:00
Eugene Susla
90a1422f8c
[automerger skipped] RESTRICT AUTOMERGE am: bd4d6d8138
-s ours am: 7bd20e27ab
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12998691
Change-Id: I0805128072ee688c6ff33e9ab3de25bc693bf077
2020-12-07 17:05:46 +00:00
Eugene Susla
31505ca0b3
RESTRICT AUTOMERGE am: bfa7a75545
am: d67e22c122
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12998688
Change-Id: I1a046e98511c50641b0fcb42b97233b3fa36e6dd
2020-12-07 16:58:33 +00:00
Eugene Susla
7bd20e27ab
[automerger skipped] RESTRICT AUTOMERGE am: bd4d6d8138
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12998691
Change-Id: Ia78ec5e90df9f6b8744c30cde67806eaff01ccbb
2020-12-07 16:45:24 +00:00
Eugene Susla
d67e22c122
RESTRICT AUTOMERGE am: bfa7a75545
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12998688
Change-Id: Id7909dd47451e3fbd02b5ca3ce4643cdd1da6715
2020-12-07 16:44:22 +00:00
Xin Li
07ccb42665
DO NOT MERGE - Merge RQ1A.201205.011
...
Bug: 172690556
Merged-In: I3f7d41c196569c0cb61e89cfc270b957e2f0add5
Change-Id: Id2d9c4f56beae280e6299b6695185577a1521345
2020-12-07 00:39:43 -08:00
Wesley.CW Wang
974f359a26
Add Battery Defender feature to Settings am: 7ccb54feb6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13108999
Change-Id: I3b172988dd71c520ac6e1d286ae055243cb723e0
2020-12-07 08:29:16 +00:00
Wesley.CW Wang
7ccb54feb6
Add Battery Defender feature to Settings
...
- Adding new tips of Battery Defender, will be presented once battery is overheated
- Launch Help Center article of battery overheat when clicking Battery Defender tip
Screenshots: https://screenshot.googleplex.com/7jUibTJANgR6UQ6.png
https://screenshot.googleplex.com/tUj2LLi87SfndBN.png
Bug: 172794045
Bug: 173497281
Bug: 173496188
Test: make RunSettingsRoboTests -j40
Merged-In: Ibb106a5d42cdf6232abf9ddf4b3225bdcebccf4a
Change-Id: Id400cec248a87dd27194d93bdf035e43bbcb7f4f
2020-12-07 08:06:22 +00:00
TreeHugger Robot
cbbc224e4d
Merge "Fix output switcher will show 2 media sessions in some use cases" into rvc-qpr-dev am: 9ccf19cb9f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13109545
Change-Id: I5f2c4d8549c28d1c91d81b7808183b0c97700dda
2020-12-07 06:47:40 +00:00
TreeHugger Robot
9ccf19cb9f
Merge "Fix output switcher will show 2 media sessions in some use cases" into rvc-qpr-dev
2020-12-07 06:29:43 +00:00
Hugh Chen
d1da284831
Fix output switcher will show 2 media sessions in some use cases
...
Before this CL, we didn't check whether the remote session existed
in the list before. If the priority of a remote session is higher than
a local session, it causes us to return the local session even if
the list has a remote session.
This CL uses a list to cache package names of remote sessions.
If the local session has the same package name of the remote session
then don't return the local session.
Bug: 169052790
Test: make -j42 RunSettingsRoboTests
Change-Id: I2726a3deb397f646e4c74a8c445dde6fafb694a8
Merged-In: I2726a3deb397f646e4c74a8c445dde6fafb694a8
(cherry picked from commit 3a7293cbbf
)
2020-12-07 06:28:52 +00:00
Xin Li
c19e729570
DO NOT MERGE - Mark RQ1A.201004.001 as merged am: 835215964f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13176357
Change-Id: I64db73472e9ad6b504a65033d2850cb0863af448
2020-12-07 04:01:20 +00:00
TreeHugger Robot
436633ab5d
Merge "Fix output switcher will show 2 media session when remote playing" into rvc-qpr-dev am: d7cf95ef74
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13109544
Change-Id: I5ca519b1a3475afb9697bc76b20f550997afda2b
2020-12-07 03:29:14 +00:00
TreeHugger Robot
d7cf95ef74
Merge "Fix output switcher will show 2 media session when remote playing" into rvc-qpr-dev
2020-12-07 03:07:25 +00:00
Xin Li
835215964f
DO NOT MERGE - Mark RQ1A.201004.001 as merged
...
Bug: 172690556
Change-Id: I32dff08f7cea0c4e645c653d1b63945b775b1078
2020-12-06 14:43:21 -08:00
Treehugger Robot
209710e0ba
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 4d181cc04f
-s ours am: 11b0105b98
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1518870
Change-Id: Ib768abcf5080d9973e38b1b21c3c881e1c8b4d88
2020-12-06 17:06:48 +00:00
TreeHugger Robot
9f9300d38b
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: e5350c9e20
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13174152
Change-Id: I635569dfc187ffd874bd4c9189039608ba762b08
2020-12-06 17:06:17 +00:00
Treehugger Robot
11b0105b98
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 4d181cc04f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1518870
Change-Id: Iafacdf7b241ac8c7f4aa65861f885868bc4578dc
2020-12-06 16:38:51 +00:00
TreeHugger Robot
e5350c9e20
Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master
2020-12-06 16:22:59 +00:00
Treehugger Robot
b07d67eeaf
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 97bc1fcff7
-s ours am: 7c2ed6be16
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1519229
Change-Id: I719c254b4796c4dd1d53dc30e0f53d63b3e75fce
2020-12-06 16:06:01 +00:00
Treehugger Robot
4d181cc04f
Merge "Import translations. DO NOT MERGE ANYWHERE"
2020-12-06 16:05:53 +00:00
Treehugger Robot
7c2ed6be16
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 97bc1fcff7
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1519229
Change-Id: I215cb3c7612b323dd67437d31dfee850b8a12227
2020-12-06 15:48:44 +00:00
Treehugger Robot
97bc1fcff7
Merge "Import translations. DO NOT MERGE ANYWHERE"
2020-12-06 15:36:04 +00:00
Bill Yi
10caa304c0
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I6e8d356f279ba834c5493badcb5a0f8e7b916c6c
2020-12-06 12:37:23 +00:00
Bill Yi
b9a5248b95
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I518f13a32c239dfc98b053ad002d31577cd41a9a
2020-12-06 12:10:17 +00:00
Bill Yi
a815a12c40
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I267bdda4fe2a243d548b1842e9a08950e61069c0
2020-12-05 16:49:34 -08:00
TreeHugger Robot
8e913664b5
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 448ec6b5fe
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13168703
Change-Id: Id2a91ce9acfc651d32f9a3ca46f52612a8904eb7
2020-12-05 01:55:42 +00:00