Commit Graph

64643 Commits

Author SHA1 Message Date
TreeHugger Robot
c7f5577653 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 9ebeb21c36 -s ours am: 3be94f3a54 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11862718

Change-Id: I17b8352e4aa0a8654da55e33cd0f812760d1ec7a
2020-06-15 06:18:28 +00:00
TreeHugger Robot
32a8567521 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 9ebeb21c36 -s ours am: 4ee27b4813 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11862718

Change-Id: I9f868011bcb3ff3bac9680be3f12b88e6115ccde
2020-06-15 06:18:22 +00:00
TreeHugger Robot
4ee27b4813 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 9ebeb21c36 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11862718

Change-Id: Ied987a5fa2dd11c2e7a0188a9efcceb8a7f4d2a6
2020-06-15 06:07:33 +00:00
TreeHugger Robot
3be94f3a54 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 9ebeb21c36 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11862718

Change-Id: Icc77ebd01ad7d0eb7f1813a26b88b35b2cb017ee
2020-06-15 06:06:35 +00:00
TreeHugger Robot
9ebeb21c36 Merge "Import translations. DO NOT MERGE" into rvc-dev 2020-06-15 05:49:54 +00:00
SongFerng Wang
fcd0677370 Merge "Revert "Mainline: removed legacy UI for network selection mode."" into rvc-dev am: 518ffd7c76 am: 58d36c2d48
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11837795

Change-Id: Ic51904ec93d5ed3417bb81b3d67c8f7b1ddb1dab
2020-06-15 03:18:55 +00:00
Automerger Merge Worker
348ff2c535 Merge "Merge "Update App info behavior for mainline module" into rvc-dev am: 8357871465 am: af13156dea" into rvc-d1-dev-plus-aosp 2020-06-15 03:18:50 +00:00
SongFerng Wang
24d6bb3ed0 Merge "Revert "Mainline: removed legacy UI for network selection mode."" into rvc-dev am: 518ffd7c76 am: d32cb38e45
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11837795

Change-Id: Ie3b090330bc2114a67e9229060ba5c6e23b74347
2020-06-15 03:18:41 +00:00
Automerger Merge Worker
f9cf45fa07 Merge "Merge "Update App info behavior for mainline module" into rvc-dev am: 8357871465 am: 14da7dd1fa" into rvc-d1-dev-plus-aosp 2020-06-15 03:18:38 +00:00
Yanting Yang
7cd514eb49 Merge "Update App info behavior for mainline module" into rvc-dev am: 8357871465 am: af13156dea
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11822585

Change-Id: I29b79a9e4ca14dd1d77b4c039afffc44d4ff40e4
2020-06-15 03:18:35 +00:00
Yanting Yang
70a20ad328 Merge "Update App info behavior for mainline module" into rvc-dev am: 8357871465 am: 14da7dd1fa
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11822585

Change-Id: I9e15289b31778b138f1668bcf556e650635c621e
2020-06-15 03:18:31 +00:00
TreeHugger Robot
c051e4830c [automerger skipped] Merge "NetworkRequestDialog: Exit the dialog on connect failure" into rvc-dev am: eac45c6a89 am: d452bfdfdc -s ours
am skip reason: Change-Id I625ca76298ed549dbed76d398aea0c957c9102fc with SHA-1 924e9e39c1 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11852224

Change-Id: I1a500b7b916db88e158d9eb1fc2256b10f7367f5
2020-06-15 03:18:27 +00:00
TreeHugger Robot
9cc918849c Merge "NetworkRequestDialog: Exit the dialog on connect failure" into rvc-dev am: eac45c6a89 am: 051df5910e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11852224

Change-Id: Ie3357deaaa46e7a2172f9760b77321bd3705bc83
2020-06-15 03:18:21 +00:00
SongFerng Wang
58d36c2d48 Merge "Revert "Mainline: removed legacy UI for network selection mode."" into rvc-dev am: 518ffd7c76
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11837795

Change-Id: If6fbc2d5b6e82fedbb3f41ce7c11301491fd0c70
2020-06-15 03:12:27 +00:00
SongFerng Wang
d32cb38e45 Merge "Revert "Mainline: removed legacy UI for network selection mode."" into rvc-dev am: 518ffd7c76
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11837795

Change-Id: I8de7097200c087bac8cf74001000b96712f370d7
2020-06-15 03:11:50 +00:00
SongFerng Wang
518ffd7c76 Merge "Revert "Mainline: removed legacy UI for network selection mode."" into rvc-dev 2020-06-15 03:09:21 +00:00
Yanting Yang
af13156dea Merge "Update App info behavior for mainline module" into rvc-dev am: 8357871465
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11822585

Change-Id: I5852891ae326e0e88c184f94b46f5d9ff9134aa1
2020-06-15 03:07:05 +00:00
Yanting Yang
14da7dd1fa Merge "Update App info behavior for mainline module" into rvc-dev am: 8357871465
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11822585

Change-Id: Ia4f89a44ef37dc53ac32e25a2ee7757e652d3c1f
2020-06-15 03:07:05 +00:00
TreeHugger Robot
d452bfdfdc Merge "NetworkRequestDialog: Exit the dialog on connect failure" into rvc-dev am: eac45c6a89
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11852224

Change-Id: I95f0cda2c92101ea746916cee813f0a2d56d2ac2
2020-06-15 03:06:26 +00:00
TreeHugger Robot
051df5910e Merge "NetworkRequestDialog: Exit the dialog on connect failure" into rvc-dev am: eac45c6a89
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11852224

Change-Id: Ibe7a5bfe717c511c585eb651c3ba7cc0a412a3a9
2020-06-15 03:06:16 +00:00
Yanting Yang
8357871465 Merge "Update App info behavior for mainline module" into rvc-dev 2020-06-15 02:59:13 +00:00
TreeHugger Robot
eac45c6a89 Merge "NetworkRequestDialog: Exit the dialog on connect failure" into rvc-dev 2020-06-15 02:52:27 +00:00
tim peng
ccaa2ea466 Merge "Refine layout for output switcher panel" into rvc-dev am: 7874c0fdc4 am: b1b26c8b70
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11596546

Change-Id: I8e7e4e0ee9cb0b79b8822acfe42b98a6102d2a73
2020-06-15 01:42:59 +00:00
tim peng
79b4ddeb4c Merge "Refine layout for output switcher panel" into rvc-dev am: 7874c0fdc4 am: bdd31f4508
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11596546

Change-Id: Iec1e3cc7e53a2a2062dd7fdfdb4fdd17a3bfbb68
2020-06-15 01:42:40 +00:00
tim peng
b1b26c8b70 Merge "Refine layout for output switcher panel" into rvc-dev am: 7874c0fdc4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11596546

Change-Id: I9dfcf15cd5654b4cdbfa286c9e75c6c18514ffa7
2020-06-15 01:29:10 +00:00
tim peng
bdd31f4508 Merge "Refine layout for output switcher panel" into rvc-dev am: 7874c0fdc4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11596546

Change-Id: I107a836766ab9aef4f2e8cc5fc953c35f414f5f0
2020-06-15 01:28:58 +00:00
tim peng
7874c0fdc4 Merge "Refine layout for output switcher panel" into rvc-dev 2020-06-15 01:14:57 +00:00
Bill Yi
451ae5441e Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Change-Id: I9d2dd999c963161e7283fc6a6bd7d76c7d44bafa
2020-06-15 00:45:36 +00:00
Jason Chiu
e54c5f60e7 Merge "Improve BT slice card loading performance" into rvc-dev am: 85f03668a5 am: 47df625ffe
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11833854

Change-Id: I90a858bba72e29f301eee64a541b7c6e498c5f5f
2020-06-14 17:42:26 +00:00
Jason Chiu
8bcaa4bc47 Merge "Improve BT slice card loading performance" into rvc-dev am: 85f03668a5 am: 42a725039a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11833854

Change-Id: If95d439f1767415ac1c23d5c62eb6731529c6f34
2020-06-14 17:42:03 +00:00
Jason Chiu
47df625ffe Merge "Improve BT slice card loading performance" into rvc-dev am: 85f03668a5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11833854

Change-Id: Id2cfccbafd268452178ea68845286daa480924b2
2020-06-14 17:30:12 +00:00
Jason Chiu
42a725039a Merge "Improve BT slice card loading performance" into rvc-dev am: 85f03668a5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11833854

Change-Id: Ifbefcfcc4e5a1481ea432262a82c1aef3ed0de4b
2020-06-14 17:29:58 +00:00
Jason Chiu
85f03668a5 Merge "Improve BT slice card loading performance" into rvc-dev 2020-06-14 17:14:11 +00:00
Roshan Pius
924e9e39c1 NetworkRequestDialog: Exit the dialog on connect failure
Connection failure (similar to connection success) is the end of the
processng of a request. We should dismiss the dialog on connection
failure.

Bug: 158844146
Bug: 158616070
Test: Manual tests - Simulate connection failure and ensure that the
dialog vanishes with a toast.

Change-Id: I625ca76298ed549dbed76d398aea0c957c9102fc
Merged-In: I625ca76298ed549dbed76d398aea0c957c9102fc
2020-06-14 15:19:30 +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
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
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
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
Kevin Chyn
5754ba7dce Merge "BiometricFragment should commitAllowingStateLoss" into rvc-dev am: 5c4334276f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11838911

Change-Id: I900d9aa2bd3c584c64785dc60ac646e6fd0ce05a
2020-06-12 20:08:52 +00:00
Kevin Chyn
6d5a778090 Merge "BiometricFragment should commitAllowingStateLoss" into rvc-dev am: 5c4334276f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11838911

Change-Id: I6ebcf9c066ee56092f1b165e806622c1eadc87d4
2020-06-12 20:08:21 +00:00