TreeHugger Robot
0d82f65875
[automerger skipped] Merge "Allows to launch only authenticator owned activities" into pi-dev am: d3ab16f1e2
-s ours am: b3448be7c7
-s ours am: 2076a10386
-s ours am: c5cc1c5939
-s ours am: 9a4e24e12e
-s ours am: d6f6c8da11
-s ours
...
am skip reason: Change-Id I5ce1a0b3838db7b3fbe48c6ea23d5f093d625cdb with SHA-1 818fef48f3
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11802013
Change-Id: Ia5a4353c5437338f539c61c2341bcdff3359dcbb
2020-07-30 17:48:26 +00:00
TreeHugger Robot
08d93061f5
[automerger skipped] Merge "Allows to launch only authenticator owned activities" into pi-dev am: d3ab16f1e2
-s ours am: b3448be7c7
-s ours am: 2076a10386
-s ours am: c5cc1c5939
-s ours am: f3f682446d
-s ours
...
am skip reason: Change-Id I5ce1a0b3838db7b3fbe48c6ea23d5f093d625cdb with SHA-1 e2eab4e258
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11802013
Change-Id: I726bb91508cef24f5ffc0ba598eb541c6a74aefc
2020-07-30 17:30:15 +00:00
TreeHugger Robot
d6f6c8da11
[automerger skipped] Merge "Allows to launch only authenticator owned activities" into pi-dev am: d3ab16f1e2
-s ours am: b3448be7c7
-s ours am: 2076a10386
-s ours am: c5cc1c5939
-s ours am: 9a4e24e12e
-s ours
...
am skip reason: Change-Id I5ce1a0b3838db7b3fbe48c6ea23d5f093d625cdb with SHA-1 818fef48f3
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11802013
Change-Id: Ia57744d17a4c1fa1cdf092ce5e1777acc772b922
2020-07-30 17:30:02 +00:00
TreeHugger Robot
a23d9273aa
[automerger skipped] Merge "Allows to launch only authenticator owned activities" into pi-dev am: d3ab16f1e2
-s ours am: b3448be7c7
-s ours am: 2076a10386
-s ours am: c5cc1c5939
-s ours am: 9a4e24e12e
-s ours
...
am skip reason: Change-Id I5ce1a0b3838db7b3fbe48c6ea23d5f093d625cdb with SHA-1 818fef48f3
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11802013
Change-Id: Ia15c8c835df5ae2934b21b9a7ceff856de349cef
2020-07-30 17:28:47 +00:00
TreeHugger Robot
f3f682446d
[automerger skipped] Merge "Allows to launch only authenticator owned activities" into pi-dev am: d3ab16f1e2
-s ours am: b3448be7c7
-s ours am: 2076a10386
-s ours am: c5cc1c5939
-s ours
...
am skip reason: Change-Id I5ce1a0b3838db7b3fbe48c6ea23d5f093d625cdb with SHA-1 818fef48f3
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11802013
Change-Id: Id9d192f0b0112a75a352bfd0a910ee1cbb88be27
2020-07-30 17:12:15 +00:00
TreeHugger Robot
9a4e24e12e
[automerger skipped] Merge "Allows to launch only authenticator owned activities" into pi-dev am: d3ab16f1e2
-s ours am: b3448be7c7
-s ours am: 2076a10386
-s ours am: c5cc1c5939
-s ours
...
am skip reason: Change-Id I5ce1a0b3838db7b3fbe48c6ea23d5f093d625cdb with SHA-1 818fef48f3
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11802013
Change-Id: Icfb4a5ba3aa6c8086788d166ded8e871c5c8efaf
2020-07-30 17:12:01 +00:00
TreeHugger Robot
c5cc1c5939
[automerger skipped] Merge "Allows to launch only authenticator owned activities" into pi-dev am: d3ab16f1e2
-s ours am: b3448be7c7
-s ours am: 2076a10386
-s ours
...
am skip reason: Change-Id I5ce1a0b3838db7b3fbe48c6ea23d5f093d625cdb with SHA-1 818fef48f3
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11802013
Change-Id: Ic782d5e5a5e1943394e735b6e8ca39a3436e9a88
2020-07-30 16:52:18 +00:00
TreeHugger Robot
2076a10386
[automerger skipped] Merge "Allows to launch only authenticator owned activities" into pi-dev am: d3ab16f1e2
-s ours am: b3448be7c7
-s ours
...
am skip reason: Change-Id I5ce1a0b3838db7b3fbe48c6ea23d5f093d625cdb with SHA-1 818fef48f3
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11802013
Change-Id: I1cfca1524b3a01f509de2d39a28f1139ded1c5dc
2020-07-30 16:31:55 +00:00
TreeHugger Robot
b3448be7c7
[automerger skipped] Merge "Allows to launch only authenticator owned activities" into pi-dev am: d3ab16f1e2
-s ours
...
am skip reason: Change-Id I5ce1a0b3838db7b3fbe48c6ea23d5f093d625cdb with SHA-1 818fef48f3
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11802013
Change-Id: I617235e4c0ed84c85737980bbc77af18fbf3105a
2020-07-30 16:13:58 +00:00
TreeHugger Robot
d3ab16f1e2
Merge "Allows to launch only authenticator owned activities" into pi-dev
2020-07-30 15:53:33 +00:00
changbetty
7eb7f6c795
Add setPackage for PendingIntent in SimSelectNotification
...
Bug: 153556754
Test: make RunSettingsRoboTests
ROBOTEST_FILTER=SimSelectNotificationTest
Change-Id: I919bbc92df24b5557b3d95c342b330075153a9cd
2020-07-30 23:29:51 +08:00
Blake Kragten
aea24e652a
Merge "Remove Enhanced Connectivity Dev Option" into rvc-d1-dev am: 4a142045aa
am: 9efa2b85f0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12172090
Change-Id: Ib24274b8006238992cbaea5701e799a392b2edc3
2020-07-29 23:45:51 +00:00
Blake Kragten
9efa2b85f0
Merge "Remove Enhanced Connectivity Dev Option" into rvc-d1-dev am: 4a142045aa
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12172090
Change-Id: I00117ec751f2e097e11dca61c9bb25e37e6b3016
2020-07-29 23:27:51 +00:00
Blake Kragten
23dd1699e2
Merge "Remove Enhanced Connectivity Dev Option" into rvc-d1-dev am: 4a142045aa
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12172090
Change-Id: I394df7a8da5c74ae0937d04e60e1a7acc9c62791
2020-07-29 23:26:26 +00:00
Blake Kragten
4a142045aa
Merge "Remove Enhanced Connectivity Dev Option" into rvc-d1-dev
2020-07-29 23:04:17 +00:00
Amy Hsu
45e4334a8a
[automerger skipped] Change the UI strings of developer in Settings app am: e81c695a47
am: 8fdbf9c60e
-s ours
...
am skip reason: Change-Id I79a9b955aae70da5e19f93504b39b2191a151c8f with SHA-1 e81c695a47
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12248943
Change-Id: Ic7fb82dfd760c4133a555198551163a38c4740f3
2020-07-29 09:27:09 +00:00
Amy Hsu
8fdbf9c60e
Change the UI strings of developer in Settings app am: e81c695a47
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12248943
Change-Id: Idd8a83f2d2edfa7f5b13f8e90738cfa9418d2fcc
2020-07-29 09:06:39 +00:00
Amy Hsu
3d3da5a356
Change the UI strings of developer in Settings app am: e81c695a47
am: df5b523ead
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12248943
Change-Id: I500936a6958e89240cca3acfd8b48b62ce2db372
2020-07-29 09:05:34 +00:00
Amy Hsu
df5b523ead
Change the UI strings of developer in Settings app am: e81c695a47
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12248943
Change-Id: I9420885b7e20207f022a22a76fa83b8bf24e8c5a
2020-07-29 09:05:18 +00:00
Treehugger Robot
0c65a47568
Merge "Update language to comply with Android's inclusive language guidance" am: 7df1fb2af1
am: 4d421a47dc
am: 7b10a29318
am: 9b63618b47
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1374789
Change-Id: I7b1b7b777fcf8b93744e5950a31359ae71c4b98d
2020-07-29 09:05:17 +00:00
Treehugger Robot
9b63618b47
Merge "Update language to comply with Android's inclusive language guidance" am: 7df1fb2af1
am: 4d421a47dc
am: 7b10a29318
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1374789
Change-Id: I3be1c10144d2d4b1076f843aa4fecbfe7bed8b0c
2020-07-29 08:49:06 +00:00
Treehugger Robot
7b10a29318
Merge "Update language to comply with Android's inclusive language guidance" am: 7df1fb2af1
am: 4d421a47dc
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1374789
Change-Id: I47066c39d6fced154b263febab7a3fb0a1e56049
2020-07-29 08:26:22 +00:00
Treehugger Robot
4d421a47dc
Merge "Update language to comply with Android's inclusive language guidance" am: 7df1fb2af1
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1374789
Change-Id: I02ccfae146dd0e360fa34592a3bb21f5c2501833
2020-07-29 08:07:46 +00:00
Treehugger Robot
7df1fb2af1
Merge "Update language to comply with Android's inclusive language guidance"
2020-07-29 07:47:02 +00:00
Amy Hsu
e81c695a47
Change the UI strings of developer in Settings app
...
Bug: 161694718
Test: Manually check Settings app
Change-Id: I79a9b955aae70da5e19f93504b39b2191a151c8f
Merged-In: I79a9b955aae70da5e19f93504b39b2191a151c8f
2020-07-29 07:21:34 +00:00
Treehugger Robot
033bbb2df6
Merge "Update language to comply with Android's inclusive language guidance" am: 2c5a28bb2d
am: f130a08d5e
am: 0dd2798bf6
am: 2d6884929e
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1375044
Change-Id: I309ee3bbc1e950f0a77099da008a0660c4c602d6
2020-07-29 07:01:28 +00:00
Treehugger Robot
2d6884929e
Merge "Update language to comply with Android's inclusive language guidance" am: 2c5a28bb2d
am: f130a08d5e
am: 0dd2798bf6
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1375044
Change-Id: If5c1b0a191bd1695f73c20eb7a6bb535cd8d7217
2020-07-29 06:46:24 +00:00
Treehugger Robot
0dd2798bf6
Merge "Update language to comply with Android's inclusive language guidance" am: 2c5a28bb2d
am: f130a08d5e
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1375044
Change-Id: I72db12567fbe5febdb09e67535904ad82925484d
2020-07-29 06:28:35 +00:00
Treehugger Robot
f130a08d5e
Merge "Update language to comply with Android's inclusive language guidance" am: 2c5a28bb2d
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1375044
Change-Id: If0c4119754ddb20c9dab6e6a3221ef2898c34c55
2020-07-29 06:13:21 +00:00
Treehugger Robot
2c5a28bb2d
Merge "Update language to comply with Android's inclusive language guidance"
2020-07-29 05:51:09 +00:00
Treehugger Robot
4727c3b1c5
Merge "Update language to comply with Android's inclusive language guidance" am: ba534426bf
am: 95773b6f1a
am: d7e5e940ea
am: c397bd301d
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1374111
Change-Id: Idd6d6589c99d8b40eaba09cc435aac6fd5a5db0e
2020-07-29 03:27:08 +00:00
Treehugger Robot
78399afc0f
Merge "Update language to comply with Android's inclusive language guidance" am: c0d28b0f96
am: da02fb34b7
am: 0a318adf46
am: 0093ecd57f
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1375043
Change-Id: I0f68a475fcfc214b4b8b39a0f80fe8fd99558879
2020-07-29 03:25:37 +00:00
Treehugger Robot
c397bd301d
Merge "Update language to comply with Android's inclusive language guidance" am: ba534426bf
am: 95773b6f1a
am: d7e5e940ea
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1374111
Change-Id: I3b337e53b5696121ccb6a72634aebddf9c04f955
2020-07-29 03:08:26 +00:00
Treehugger Robot
0093ecd57f
Merge "Update language to comply with Android's inclusive language guidance" am: c0d28b0f96
am: da02fb34b7
am: 0a318adf46
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1375043
Change-Id: Ie8d9822dba24a284fb18fe6c3a167fd747bebd17
2020-07-29 03:08:10 +00:00
Treehugger Robot
d7e5e940ea
Merge "Update language to comply with Android's inclusive language guidance" am: ba534426bf
am: 95773b6f1a
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1374111
Change-Id: I458ae96ae298c32cc2f070dddac54d625929332c
2020-07-29 02:48:26 +00:00
Treehugger Robot
0a318adf46
Merge "Update language to comply with Android's inclusive language guidance" am: c0d28b0f96
am: da02fb34b7
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1375043
Change-Id: I497a616313d2f9465f9a33fc296cd26ded64c835
2020-07-29 02:48:12 +00:00
Treehugger Robot
95773b6f1a
Merge "Update language to comply with Android's inclusive language guidance" am: ba534426bf
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1374111
Change-Id: I8470490508ae353636146d760564449938999daa
2020-07-29 02:23:46 +00:00
Treehugger Robot
da02fb34b7
Merge "Update language to comply with Android's inclusive language guidance" am: c0d28b0f96
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1375043
Change-Id: I9ceecd654f6ac6403d46b8287c18afe6994fc953
2020-07-29 02:23:33 +00:00
Treehugger Robot
ba534426bf
Merge "Update language to comply with Android's inclusive language guidance"
2020-07-29 02:22:28 +00:00
Treehugger Robot
c0d28b0f96
Merge "Update language to comply with Android's inclusive language guidance"
2020-07-29 02:09:58 +00:00
Blake Kragten
eda0a42118
Remove Enhanced Connectivity Dev Option
...
Applying to d1-dev as this change will be propagated to qpr branch.
Remove Developer Option Enhanced Connectivity. Remove controller and
layout variables/tests.
Bug: 162231796
Test: On Device Custom Build. Testing BSM trigger. Developer Option does
not appear anymore.
Change-Id: I8a385eb444e84975a3bbd7c063c5ce94e507c25f
2020-07-28 22:44:06 +00:00
Curtis Belmonte
5612e2c5c7
Update language to comply with Android's inclusive language guidance
...
See https://source.android.com/setup/contribute/respectful-code for reference
Test: Presubmit
Bug: 161896447
Change-Id: Ib5f445c3987c6eda2c3f3be8b9ac641c4e7f934e
2020-07-28 20:23:05 +00:00
Curtis Belmonte
1e8c7905a2
Update language to comply with Android's inclusive language guidance
...
See https://source.android.com/setup/contribute/respectful-code for reference
Test: Presubmit
Bug: 161896447
Change-Id: I4ecfd2d806314e7dc3bbff00849ad4be6f81d506
2020-07-28 20:16:03 +00:00
Curtis Belmonte
bd8f120e95
Update language to comply with Android's inclusive language guidance
...
See https://source.android.com/setup/contribute/respectful-code for reference
Test: Presubmit
Bug: 161896447
Change-Id: I89dbc737c62a796d3622cf17437f9eac930c99b3
2020-07-28 20:12:49 +00:00
Treehugger Robot
07f44b2a4a
[automerger skipped] Merge "BluetoothPairingRequest: Add null check for action" am: ed7662f6f6
am: 3366290e20
am: 5486a2fdd4
am: 785b480259
-s ours
...
am skip reason: Change-Id I24668e20accf96c7469c9e1ab589b1383ab59d18 with SHA-1 1805f666e7
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1372268
Change-Id: I6ad95d0325e6ec8d9ffe58a2ff6083518f5e1b61
2020-07-28 20:08:31 +00:00
Curtis Belmonte
1aa03da058
Update language to comply with Android's inclusive language guidance
...
See https://source.android.com/setup/contribute/respectful-code for reference
Change-Id: I25b5f8a2d87d8754e6536d24f986ab90a2bc69fe
Test: Presubmit
Bug: 161896447
2020-07-28 20:08:17 +00:00
Treehugger Robot
785b480259
Merge "BluetoothPairingRequest: Add null check for action" am: ed7662f6f6
am: 3366290e20
am: 5486a2fdd4
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1372268
Change-Id: Ia6bb375c12cf0acba4c5c79e292eefa2d69cddfe
2020-07-28 19:50:46 +00:00
Treehugger Robot
5486a2fdd4
Merge "BluetoothPairingRequest: Add null check for action" am: ed7662f6f6
am: 3366290e20
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1372268
Change-Id: Iad124b74fc6c55d2220d340fbe14ae85ddcb1d13
2020-07-28 19:33:12 +00:00
Treehugger Robot
3366290e20
Merge "BluetoothPairingRequest: Add null check for action" am: ed7662f6f6
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1372268
Change-Id: Icebef90c2b18b36e5112d94aae02ae770ab300d3
2020-07-28 19:05:02 +00:00
Treehugger Robot
ed7662f6f6
Merge "BluetoothPairingRequest: Add null check for action"
2020-07-28 18:51:00 +00:00