TreeHugger Robot
d006eb8d9d
Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev
2020-12-17 14:58:08 +00:00
Bill Yi
f6330f35c6
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I36766724094cdd2b8525fac2177ff61545305a46
2020-12-17 04:32:39 +00:00
Malcolm Chen
abd767ab1d
Automatically dismiss SIM combination warnings and selection dialogs.
...
When configuring CBRS profiles this dialog / notification will be
dismissed after configuration is done, to avoid confusion.
Bug: 142092510
Test: manual and unittest
Change-Id: Iaf30062f555ec2c119c4aafd6aa013e73b5253f0
Merged-In: Iaf30062f555ec2c119c4aafd6aa013e73b5253f0
2020-12-15 22:11:55 +00:00
Wesley.CW Wang
ee1d07d59b
Update Battery Defender tips title
...
Bug: 175662315
Test: make SettingsRoboTests
Change-Id: I13ba773ea4402c5ae54260a8b8cbea4620eed535
2020-12-15 10:21:06 +00:00
Hugh Chen
b767df1a08
Add condition to check case of accessory combinations
...
Before this CL, we only compare whether the value of function is
equal to accessory to ensure usb is in accessory mode. But in some
cases there are different accessory combinations, like
"accessory,audio source". It will make the condition return false
when encountering accessory combinations.
This CL will check whether the function will include accessory mode
to fix this issue.
Bug: 162451162
Test: make -j42 RunSettingsRoboTests
Change-Id: I7c80f02de5340799e292949608e19b86b187b982
Merged-In: I7c80f02de5340799e292949608e19b86b187b982
(cherry picked from commit 7d71081d45
)
2020-12-14 07:32:41 +00:00
Hugh Chen
e8dc7bc283
Do nothing when choosing file transfer when in accessory mode
...
- Before this CL, the device will be disconnected and reconnected
to accessory mode when choosing "File transfer/Android Auto" in
accessory mode. Because the USB menu didn't check state of
function, it should do nothing when choosing
"File transfer/Android Auto" in accessory mode.
This CL add condition to check state of function, it will do
nothing when choosing "File transfer/Android Auto" in
accessory mode.
Bug: 162451162
Test: make -j42 RunSettingsRoboTests
Change-Id: I1749c6c43d2a192e4ce1bf1ae5343ff8deafbe48
Merged-In: I1749c6c43d2a192e4ce1bf1ae5343ff8deafbe48
(cherry picked from commit 3251a04ba3
)
2020-12-14 06:59:06 +00:00
Hugh Chen
91ed63124c
Fix the usb menu didn't switch to "File Transfer/Android Auto" right after connecting to the car unit.
...
- Before this CL, the usb receivers didn't check the extra information
of the accessory. It causes the usb menu not to be aware that the
usb port is switched to accessory mode.
In this CL, the receivers will check whether the intent has an
accessory extra. If the usb port is switched to accessory mode
the usb menu will switch to "File Transfer/Android Auto".
Bug: 162451162
Test: make -j42 RunSettingsRoboTests
Change-Id: I0eca89a23670c674b74753fc526256cc1d52e759
Merged-In: I0eca89a23670c674b74753fc526256cc1d52e759
(cherry picked from commit af0a45bb7a
)
2020-12-14 06:58:26 +00:00
Robert Luo
4dd011b3c7
Merge "Migrate media output switcher metrics - 2/n" into rvc-qpr-dev
2020-12-11 06:56:24 +00:00
TreeHugger Robot
e05f1a4bb7
Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev
2020-12-11 00:11:36 +00:00
Bill Yi
a26056a6ef
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ica5c216524bf124fc447dd64e2b7ca36c244fb81
2020-12-10 12:10:19 -08:00
tim peng
656867b4de
Merge "Add FLAG_RECEIVER_FOREGROUND to run redirect intent at foreground priority" into rvc-qpr-dev
2020-12-10 05:30:42 +00:00
TreeHugger Robot
79bf00aac3
Merge "Add bluetooth package to permission request intent" into oc-mr1-dev am: 504b96d76c
am: 2117006bc6
am: cfdae774cd
am: 635029b87f
am: f49e9d2196
am: 0b89867372
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13088581
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iadf73a6dac422ef24851c603a1e5cd1ab8c0dcf2
2020-12-09 14:31:38 +00:00
Jakub Pawlowski
ad9f74366f
[automerger skipped] Prevent overlay drawing on top of Bluetooth activity dialog am: b29c036522
am: c721dc5bad
-s ours am: b15b6450fa
-s ours am: d35af468b7
-s ours am: 24c8adbd0d
-s ours am: c488511160
-s ours
...
am skip reason: Change-Id I04ebe580db2b299af2bd5e44e0b0f20bd42f8535 with SHA-1 4f7edf692f
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13090436
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I82517ee38de45ef7b2e2ea36d8efa3b6c7f106f6
2020-12-09 14:31:28 +00:00
TreeHugger Robot
0b89867372
Merge "Add bluetooth package to permission request intent" into oc-mr1-dev am: 504b96d76c
am: 2117006bc6
am: cfdae774cd
am: 635029b87f
am: f49e9d2196
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13088581
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I81cd1495fd0beb356554d5a86daa30214d0d27d0
2020-12-09 14:03:32 +00:00
Jakub Pawlowski
c488511160
[automerger skipped] Prevent overlay drawing on top of Bluetooth activity dialog am: b29c036522
am: c721dc5bad
-s ours am: b15b6450fa
-s ours am: d35af468b7
-s ours am: 24c8adbd0d
-s ours
...
am skip reason: Change-Id I04ebe580db2b299af2bd5e44e0b0f20bd42f8535 with SHA-1 4f7edf692f
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13090436
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iff5d3ed58db08fa24afb1deb482ac2e12e9f3a0f
2020-12-09 14:03:14 +00:00
TreeHugger Robot
f49e9d2196
Merge "Add bluetooth package to permission request intent" into oc-mr1-dev am: 504b96d76c
am: 2117006bc6
am: cfdae774cd
am: 635029b87f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13088581
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I36f99bfb1e5eee253bb4ce030d7000cb40c2ff63
2020-12-09 13:49:10 +00:00
Jakub Pawlowski
24c8adbd0d
[automerger skipped] Prevent overlay drawing on top of Bluetooth activity dialog am: b29c036522
am: c721dc5bad
-s ours am: b15b6450fa
-s ours am: d35af468b7
-s ours
...
am skip reason: Change-Id I04ebe580db2b299af2bd5e44e0b0f20bd42f8535 with SHA-1 4f7edf692f
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13090436
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I9e6c8911bbb7a22386468a0d077826151f7faceb
2020-12-09 13:48:57 +00:00
TreeHugger Robot
635029b87f
Merge "Add bluetooth package to permission request intent" into oc-mr1-dev am: 504b96d76c
am: 2117006bc6
am: cfdae774cd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13088581
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iad91ec439965d52c652f79ce4d6fe3b125631f79
2020-12-09 13:03:53 +00:00
Jakub Pawlowski
d35af468b7
[automerger skipped] Prevent overlay drawing on top of Bluetooth activity dialog am: b29c036522
am: c721dc5bad
-s ours am: b15b6450fa
-s ours
...
am skip reason: Change-Id I04ebe580db2b299af2bd5e44e0b0f20bd42f8535 with SHA-1 4f7edf692f
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13090436
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I245a20b64373500c886a47d18da39500fd248c0f
2020-12-09 13:03:47 +00:00
TreeHugger Robot
cfdae774cd
Merge "Add bluetooth package to permission request intent" into oc-mr1-dev am: 504b96d76c
am: 2117006bc6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13088581
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If3605d2b4dbad8b7b4979b644c89352ee8449ba1
2020-12-09 12:17:08 +00:00
Jakub Pawlowski
b15b6450fa
[automerger skipped] Prevent overlay drawing on top of Bluetooth activity dialog am: b29c036522
am: c721dc5bad
-s ours
...
am skip reason: Change-Id I04ebe580db2b299af2bd5e44e0b0f20bd42f8535 with SHA-1 4f7edf692f
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13090436
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I26950e18ca79bb70e0a91492997242934ec19641
2020-12-09 12:16:57 +00:00
TreeHugger Robot
2117006bc6
Merge "Add bluetooth package to permission request intent" into oc-mr1-dev am: 504b96d76c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13088581
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I7d7dcaefd10f297c9e268d8f9d8bf666d98b08fd
2020-12-09 12:08:40 +00:00
TreeHugger Robot
504b96d76c
Merge "Add bluetooth package to permission request intent" into oc-mr1-dev
2020-12-09 12:06:33 +00:00
Jakub Pawlowski
c721dc5bad
Prevent overlay drawing on top of Bluetooth activity dialog am: b29c036522
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13090436
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I956e8906633af45f12617dabbec4e060c14502f2
2020-12-09 11:32:56 +00:00
Jakub Pawlowski
b29c036522
Prevent overlay drawing on top of Bluetooth activity dialog
...
Bug: 168504491
Merged-In: I04ebe580db2b299af2bd5e44e0b0f20bd42f8535
Change-Id: I04ebe580db2b299af2bd5e44e0b0f20bd42f8535
2020-12-09 08:00:22 +00:00
Robert Luo
2b6fd92de9
Migrate media output switcher metrics - 2/n
...
Bug: 172181610
Test: run statsd_testdrive 277 and check the
output correctness after content switching.
Change-Id: I5abb471452ec92670d220b2472eadbe77e243653
Merged-In: I5abb471452ec92670d220b2472eadbe77e243653
2020-12-09 15:42:56 +08:00
TreeHugger Robot
f7f1781146
Merge "Prevent overlay drawing on top of Bluetooth activity dialog" into qt-dev am: 721f43dcdc
am: 537c730ca2
am: 4c4f83eb21
am: db48b810b6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13090438
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I42ad211ac7f3341c38d7b7f992b19e3ae52c9373
2020-12-09 00:32:11 +00:00
TreeHugger Robot
db48b810b6
Merge "Prevent overlay drawing on top of Bluetooth activity dialog" into qt-dev am: 721f43dcdc
am: 537c730ca2
am: 4c4f83eb21
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13090438
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id38617a0c134feeb458a734a86c57360108fdd15
2020-12-09 00:16:09 +00:00
TreeHugger Robot
4c4f83eb21
Merge "Prevent overlay drawing on top of Bluetooth activity dialog" into qt-dev am: 721f43dcdc
am: 537c730ca2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13090438
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic39ad9f7212cdb757f79c61e23c84ac614e73fed
2020-12-08 23:58:02 +00:00
TreeHugger Robot
537c730ca2
Merge "Prevent overlay drawing on top of Bluetooth activity dialog" into qt-dev am: 721f43dcdc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13090438
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I9c3d91f901bc38554732ff2cc428232f117efea0
2020-12-08 23:27:51 +00:00
TreeHugger Robot
721f43dcdc
Merge "Prevent overlay drawing on top of Bluetooth activity dialog" into qt-dev
2020-12-08 22:56:46 +00:00
tim peng
3cea72fb2b
Merge changes from topic "media_output_dialog" into rvc-qpr-dev
...
* changes:
Redirect to output switcher panel to the new dialog
Update rule of launching media output dialog
Update OutputSwitcher from MediaOutputSlice to MediaOutputDialog in Settings
Add PairNewBluetoothReceiver to launch Bluetooth pairing page
2020-12-08 05:46:13 +00:00
tim peng
de2f2754d9
Merge "Fix java.lang.ArrayIndexOutOfBoundsException in RemoteVolumeGroupController" into rvc-qpr-dev
2020-12-08 00:55:21 +00:00
Xiao Ma
a63d8db293
Merge "Update the Warning text about the visibility of device name." into rvc-qpr-dev
2020-12-08 00:15:53 +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
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