TreeHugger Robot
edbaef567b
Merge "[Wi-Fi] Fix exception when clicking About phone -> Wi-Fi MAC address" am: cd7e0e7c31
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11862078
Change-Id: I2fa2b5ef39c369fc1e4867c6951d1873dd6dcd13
2020-06-14 14:18:23 +00:00
TreeHugger Robot
142a5a922b
Merge "NetworkRequestDialog: Exit the dialog on connect failure" am: 030baada8b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11852770
Change-Id: I7f1a98665356604a515a4aaee7e11a7db5f91a7e
2020-06-14 14:18:15 +00:00
TreeHugger Robot
cd7e0e7c31
Merge "[Wi-Fi] Fix exception when clicking About phone -> Wi-Fi MAC address"
2020-06-14 14:17:38 +00:00
TreeHugger Robot
030baada8b
Merge "NetworkRequestDialog: Exit the dialog on connect failure"
2020-06-14 14:05:56 +00:00
Arc Wang
3370cc5991
[Wi-Fi] Fix exception when clicking About phone -> Wi-Fi MAC address
...
From android R, SavedAccessPointsWifiSettings2 is added for WifiTrackerLib,
SavedAccessPointsWifiSettings is deprecated.
From android S, SavedAccessPointsWifiSettings is removed, About phone ->
Wi-Fi MAC address should open SavedAccessPointsWifiSettings2 instead of
SavedAccessPointsWifiSettings.
Bug: 158172263
Test: manual
Click About phone -> Wi-Fi MAC address and see SavedAccessPointsWifiSettings2 .
Change-Id: Ic51f0c4f955e7c7c4a26ddea57923b7c17e6d534
2020-06-14 20:48:21 +08:00
Automerger Merge Worker
3ebdb41c97
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 4b25f3f159 -s ours am: 7f8fa44f44 -s ours am: f518191f3c -s ours" into rvc-qpr-dev-plus-aosp am: 536f14837d -s ours am: 92cd5c3214 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11854964
Change-Id: I83116b17381de9029cb90b23b4903a303f5cc248
2020-06-13 01:28:16 +00:00
TreeHugger Robot
a057a9fa94
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 4b25f3f159 -s ours am: 039a7b619e -s ours am: 8afac4a232 -s ours am: 9beea769f7 -s ours am: 801f26629f -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11854964
Change-Id: Iacf8fcbb4b68310750ae10dea9fdba61d31f9735
2020-06-13 01:28:09 +00:00
Automerger Merge Worker
7948b1b59a
Merge "Merge "Explicitly request focus after button pressed" into rvc-dev am: d9a246c49e am: 2f75ebed19 am: 3e96041f7b" into rvc-qpr-dev-plus-aosp am: 319f0b4d5b am: ea87124ddc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11851989
Change-Id: I81fbd73c2f886e6ba78978c4fd7fb144362e7a68
2020-06-13 01:28:03 +00:00
Automerger Merge Worker
2a071675a4
Merge "Merge "Explicitly request focus after button pressed" into rvc-dev am: d9a246c49e am: 5775784492" into rvc-d1-dev-plus-aosp am: edc887c7f3 am: d0d151c334 am: f8fec5b6fd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11851989
Change-Id: Iff48d9568ce89c9ae5d7e2007dd33221be433489
2020-06-13 01:27:57 +00:00
TreeHugger Robot
c126a4ba34
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 4b25f3f159 -s ours am: 7f8fa44f44 -s ours am: 75b68e1055 -s ours am: a57dabb9ba -s ours am: a237151397 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11854964
Change-Id: I21ff5979bc9b270d24981796784000c973cf78f9
2020-06-13 01:27:51 +00:00
TreeHugger Robot
583d690d92
Merge "Explicitly request focus after button pressed" into rvc-dev am: d9a246c49e am: 2f75ebed19 am: b4e5ddbe05 am: 46e6fc9fbb am: 593e8f578f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11851989
Change-Id: Id3dc53c88a15d6c90dcc04254bf016ec97a802eb
2020-06-13 01:27:44 +00:00
Automerger Merge Worker
92cd5c3214
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 4b25f3f159 -s ours am: 7f8fa44f44 -s ours am: f518191f3c -s ours" into rvc-qpr-dev-plus-aosp am: 536f14837d -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11854964
Change-Id: Ia5089964f272333573c3bbe2d922371e9528797b
2020-06-13 01:17:42 +00:00
TreeHugger Robot
801f26629f
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 4b25f3f159 -s ours am: 039a7b619e -s ours am: 8afac4a232 -s ours am: 9beea769f7 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11854964
Change-Id: I9672e72ee35efce370604559a5e683a6f7276b02
2020-06-13 01:17:33 +00:00
Automerger Merge Worker
ea87124ddc
Merge "Merge "Explicitly request focus after button pressed" into rvc-dev am: d9a246c49e am: 2f75ebed19 am: 3e96041f7b" into rvc-qpr-dev-plus-aosp am: 319f0b4d5b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11851989
Change-Id: Idad9f2741939a3aa22753417c53092eaa0eed08f
2020-06-13 01:17:27 +00:00
Automerger Merge Worker
f8fec5b6fd
Merge "Merge "Explicitly request focus after button pressed" into rvc-dev am: d9a246c49e am: 5775784492" into rvc-d1-dev-plus-aosp am: edc887c7f3 am: d0d151c334
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11851989
Change-Id: I982363f265f284200beba6a620e40e92e17eb175
2020-06-13 01:17:13 +00:00
TreeHugger Robot
a237151397
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 4b25f3f159 -s ours am: 7f8fa44f44 -s ours am: 75b68e1055 -s ours am: a57dabb9ba -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11854964
Change-Id: Ib0ee1bd16ba2910d80eb247dcfe80aa7ffcdd063
2020-06-13 01:17:04 +00:00
TreeHugger Robot
593e8f578f
Merge "Explicitly request focus after button pressed" into rvc-dev am: d9a246c49e am: 2f75ebed19 am: b4e5ddbe05 am: 46e6fc9fbb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11851989
Change-Id: Idafec177c32350899490960d9e44bb990c1f1d57
2020-06-13 01:16:35 +00:00
Automerger Merge Worker
536f14837d
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 4b25f3f159 -s ours am: 7f8fa44f44 -s ours am: f518191f3c -s ours" into rvc-qpr-dev-plus-aosp
2020-06-13 01:00:55 +00:00
TreeHugger Robot
7ff7fc6ed5
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 4b25f3f159 -s ours am: 7f8fa44f44 -s ours am: f518191f3c -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11854964
Change-Id: I05f4695d6bc9bf51babc54a1d2b2b899b7c6e42b
2020-06-13 01:00:51 +00:00
TreeHugger Robot
9beea769f7
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 4b25f3f159 -s ours am: 039a7b619e -s ours am: 8afac4a232 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11854964
Change-Id: I6f4c7637216aafdb4b8b294ed12b45029b08a23f
2020-06-13 01:00:49 +00:00
Automerger Merge Worker
319f0b4d5b
Merge "Merge "Explicitly request focus after button pressed" into rvc-dev am: d9a246c49e am: 2f75ebed19 am: 3e96041f7b" into rvc-qpr-dev-plus-aosp
2020-06-13 01:00:47 +00:00
Automerger Merge Worker
d0d151c334
Merge "Merge "Explicitly request focus after button pressed" into rvc-dev am: d9a246c49e am: 5775784492" into rvc-d1-dev-plus-aosp am: edc887c7f3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11851989
Change-Id: Iac7f99f85b4bea509a3d015be984eb7f2464bffe
2020-06-13 01:00:43 +00:00
TreeHugger Robot
6836db5bc9
Merge "Explicitly request focus after button pressed" into rvc-dev am: d9a246c49e am: 2f75ebed19 am: 3e96041f7b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11851989
Change-Id: I3164791e6a8cd56faf22f9a378260aff8ace7405
2020-06-13 01:00:41 +00:00
TreeHugger Robot
a57dabb9ba
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 4b25f3f159 -s ours am: 7f8fa44f44 -s ours am: 75b68e1055 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11854964
Change-Id: Ie4976df869347d98d3f1e5e171eafe0485639956
2020-06-13 01:00:31 +00:00
TreeHugger Robot
46e6fc9fbb
Merge "Explicitly request focus after button pressed" into rvc-dev am: d9a246c49e am: 2f75ebed19 am: b4e5ddbe05
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11851989
Change-Id: I7a688f0d25f11fffb148a15341e33f1c3c8e0727
2020-06-13 01:00:19 +00:00
TreeHugger Robot
8afac4a232
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 4b25f3f159 -s ours am: 039a7b619e -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11854964
Change-Id: Id7f9103d9f353e87e5e44d1012f4feda5139a90a
2020-06-13 00:49:43 +00:00
Automerger Merge Worker
edc887c7f3
Merge "Merge "Explicitly request focus after button pressed" into rvc-dev am: d9a246c49e am: 5775784492" into rvc-d1-dev-plus-aosp
2020-06-13 00:49:23 +00:00
TreeHugger Robot
f518191f3c
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 4b25f3f159 -s ours am: 7f8fa44f44 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11854964
Change-Id: Idc538b075e037b20c3155a9123fd7e226afec344
2020-06-13 00:49:21 +00:00
TreeHugger Robot
75b68e1055
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 4b25f3f159 -s ours am: 7f8fa44f44 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11854964
Change-Id: I6825449dbde20639c440bb73f6f9391ca54b5e94
2020-06-13 00:49:19 +00:00
TreeHugger Robot
44d2ff72a8
Merge "Explicitly request focus after button pressed" into rvc-dev am: d9a246c49e am: 5775784492
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11851989
Change-Id: Iee3f5a3aa710f51c46b70ee3fe2edd38137307b0
2020-06-13 00:49:18 +00:00
TreeHugger Robot
b4e5ddbe05
Merge "Explicitly request focus after button pressed" into rvc-dev am: d9a246c49e am: 2f75ebed19
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11851989
Change-Id: I6b09a66fb86ac3b912f692cb345770b629718730
2020-06-13 00:49:12 +00:00
TreeHugger Robot
3e96041f7b
Merge "Explicitly request focus after button pressed" into rvc-dev am: d9a246c49e am: 2f75ebed19
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11851989
Change-Id: I70bf395ae415f83733d96664b6458b8348b45e79
2020-06-13 00:49:10 +00:00
TreeHugger Robot
039a7b619e
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 4b25f3f159 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11854964
Change-Id: Icee464d8647b4d0564474b5e6cf8f02bfaa73a20
2020-06-13 00:30:44 +00:00
TreeHugger Robot
7f8fa44f44
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 4b25f3f159 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11854964
Change-Id: Ia08fa4469f757d18ead86633cd82f5e96a6ef312
2020-06-13 00:30:42 +00:00
TreeHugger Robot
5775784492
Merge "Explicitly request focus after button pressed" into rvc-dev am: d9a246c49e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11851989
Change-Id: I56a6494e50665fa4e53e88fb3cff0604a1e1f4a9
2020-06-13 00:30:37 +00:00
TreeHugger Robot
2f75ebed19
Merge "Explicitly request focus after button pressed" into rvc-dev am: d9a246c49e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11851989
Change-Id: I5c6cdfe795d9df67bbb034e2120a0916e0dea570
2020-06-13 00:30:34 +00:00
TreeHugger Robot
4b25f3f159
Merge "Import translations. DO NOT MERGE" into rvc-dev
2020-06-13 00:26:09 +00:00
TreeHugger Robot
d9a246c49e
Merge "Explicitly request focus after button pressed" into rvc-dev
2020-06-13 00:19:44 +00:00
Bill Yi
23e3832fe0
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Change-Id: I4248ba5dd6eddcba4c94f9b25e6ef46ffec387c6
2020-06-12 15:02:57 -07:00
Kevin Chyn
ede4b88d4c
Merge "BiometricFragment should commitAllowingStateLoss" into rvc-dev am: 5c4334276f am: 5754ba7dce am: 1ecaeb33ad am: 0dd6af8f83 am: 302cd05908
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11838911
Change-Id: I787c997d04b999e39342fa15adc65cf184a6f763
2020-06-12 21:06:51 +00:00
Kevin Chyn
685870f87f
Merge "BiometricFragment should commitAllowingStateLoss" into rvc-dev am: 5c4334276f am: 6d5a778090 am: bc8814da7c am: 9bec8cbcb2 am: 2283db4202
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11838911
Change-Id: I36e1165a4bedb39b1202ec43d9726efedf898fb1
2020-06-12 21:06:33 +00:00
Kevin Chyn
0c438937b1
Merge "BiometricFragment should commitAllowingStateLoss" into rvc-dev am: 5c4334276f am: 6d5a778090 am: f1a45e1257 am: 4ae5cc5564 am: 6abb90c7af
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11838911
Change-Id: Ibc323cab9c471e477f85cdeec143b6360ed21d8b
2020-06-12 21:05:36 +00:00
Kevin Chyn
302cd05908
Merge "BiometricFragment should commitAllowingStateLoss" into rvc-dev am: 5c4334276f am: 5754ba7dce am: 1ecaeb33ad am: 0dd6af8f83
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11838911
Change-Id: Ie5417354b59c6013eadeec23305be064d9588209
2020-06-12 20:50:13 +00:00
Kevin Chyn
2283db4202
Merge "BiometricFragment should commitAllowingStateLoss" into rvc-dev am: 5c4334276f am: 6d5a778090 am: bc8814da7c am: 9bec8cbcb2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11838911
Change-Id: Ie3f445a4fcdd39e4a3e6d7f9bbf31ec351c1da0d
2020-06-12 20:50:03 +00:00
Kevin Chyn
6abb90c7af
Merge "BiometricFragment should commitAllowingStateLoss" into rvc-dev am: 5c4334276f am: 6d5a778090 am: f1a45e1257 am: 4ae5cc5564
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11838911
Change-Id: I9a9d53f0fe5e47a005a30893cf55170b25a7892b
2020-06-12 20:48:23 +00:00
Kevin Chyn
0dd6af8f83
Merge "BiometricFragment should commitAllowingStateLoss" into rvc-dev am: 5c4334276f am: 5754ba7dce am: 1ecaeb33ad
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11838911
Change-Id: I7aee64782cf1db948d643144c60157ec6aba357a
2020-06-12 20:36:36 +00:00
Kevin Chyn
9bec8cbcb2
Merge "BiometricFragment should commitAllowingStateLoss" into rvc-dev am: 5c4334276f am: 6d5a778090 am: bc8814da7c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11838911
Change-Id: I8bf495339c029993c800710ff89d2cd7a1398565
2020-06-12 20:35:40 +00:00
Kevin Chyn
4ae5cc5564
Merge "BiometricFragment should commitAllowingStateLoss" into rvc-dev am: 5c4334276f am: 6d5a778090 am: f1a45e1257
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11838911
Change-Id: I1477e4c2c8df725aeb47479fc3b6acd36b698322
2020-06-12 20:35:19 +00:00
Kevin Chyn
1ecaeb33ad
Merge "BiometricFragment should commitAllowingStateLoss" into rvc-dev am: 5c4334276f am: 5754ba7dce
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11838911
Change-Id: I7df21689af7f749b37696f67eab1ec6a26adf3d2
2020-06-12 20:20:07 +00:00
Kevin Chyn
f1a45e1257
Merge "BiometricFragment should commitAllowingStateLoss" into rvc-dev am: 5c4334276f am: 6d5a778090
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11838911
Change-Id: I39e23f9eb82e59e35bf8124c463d0c3a333caf82
2020-06-12 20:19:48 +00:00