PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
71,192 Commits 1 Branch 0 Tags
302cd0590893059bc9a8998dbb10e6183776b52c
Commit Graph

71192 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Kevin Chyn
bc8814da7c 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: Id853e4aac4590a0fc92a8f2debb4bee02de7736b
 2020-06-12 20:19:45 +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
Kevin Chyn
5c4334276f Merge "BiometricFragment should commitAllowingStateLoss" into rvc-dev 2020-06-12 19:56:01 +00:00
TreeHugger Robot
0ca5c9526b Merge "[Wi-Fi] Add WifiNetworkDetailsFragment2 unit test cases" 2020-06-12 12:58:04 +00:00
Jason Chiu
40c5e77949 Merge "Fix Slice not pinned error" into rvc-dev am: 8cbee49d28 am: 7b40a59fd1 am: adad56d9e2 am: 69c4d619b9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11833849

Change-Id: I8eecb178c5a541376471a305b88a0db8408b190f
 2020-06-12 12:34:06 +00:00
Automerger Merge Worker
c320c99ffe Merge "Merge "Fix Slice not pinned error" into rvc-dev am: 8cbee49d28 am: 6eca50ddf0 am: 981d30f49e" into rvc-qpr-dev-plus-aosp am: a3e8536cc5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11833849

Change-Id: I59236c16b832f951666fba602199b0f60f9d9cde
 2020-06-12 12:33:30 +00:00
Jason Chiu
f5eb561872 Merge "Fix Slice not pinned error" into rvc-dev am: 8cbee49d28 am: 7b40a59fd1 am: e6eb3775ac am: 963ab5d9c5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11833849

Change-Id: I5d1d72d381234a45c48146cf398e44039f09e0fd
 2020-06-12 12:32:50 +00:00
Jason Chiu
69c4d619b9 Merge "Fix Slice not pinned error" into rvc-dev am: 8cbee49d28 am: 7b40a59fd1 am: adad56d9e2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11833849

Change-Id: I1e58ff556be7cc0467b37651a2c56b2ada9fbebe
 2020-06-12 12:22:15 +00:00
Automerger Merge Worker
a3e8536cc5 Merge "Merge "Fix Slice not pinned error" into rvc-dev am: 8cbee49d28 am: 6eca50ddf0 am: 981d30f49e" into rvc-qpr-dev-plus-aosp 2020-06-12 12:21:42 +00:00
Jason Chiu
947ab95fef Merge "Fix Slice not pinned error" into rvc-dev am: 8cbee49d28 am: 6eca50ddf0 am: 981d30f49e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11833849

Change-Id: Ida948a7aa59f8ce6e3e50333a57e6edbd41a9c3c
 2020-06-12 12:21:33 +00:00
Jason Chiu
963ab5d9c5 Merge "Fix Slice not pinned error" into rvc-dev am: 8cbee49d28 am: 7b40a59fd1 am: e6eb3775ac 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11833849

Change-Id: I08c7a4dc4c024044442cd1ea63e5885ce63e05b7
 2020-06-12 12:21:32 +00:00
Jason Chiu
adad56d9e2 Merge "Fix Slice not pinned error" into rvc-dev am: 8cbee49d28 am: 7b40a59fd1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11833849

Change-Id: I391ad1f65f6d1fe328254a80540cb75bd2babacf
 2020-06-12 12:05:53 +00:00
Jason Chiu
981d30f49e Merge "Fix Slice not pinned error" into rvc-dev am: 8cbee49d28 am: 6eca50ddf0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11833849

Change-Id: Iafe23935be9d14dc6f9ea05a638e50630b1630ec
 2020-06-12 12:05:36 +00:00
Jason Chiu
e6eb3775ac Merge "Fix Slice not pinned error" into rvc-dev am: 8cbee49d28 am: 7b40a59fd1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11833849

Change-Id: I4b982cfb1b71506ce45b02ee3b7cfea8c04fb673
 2020-06-12 12:05:24 +00:00
Jason Chiu
7b40a59fd1 Merge "Fix Slice not pinned error" into rvc-dev am: 8cbee49d28 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11833849

Change-Id: I1e4d0fd72093d6674f8960e9af500adaa9d8f36a
 2020-06-12 11:44:12 +00:00
Jason Chiu
6eca50ddf0 Merge "Fix Slice not pinned error" into rvc-dev am: 8cbee49d28 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11833849

Change-Id: Iba28857a715609cb332f9f50884a4de9ba81e5cb
 2020-06-12 11:43:24 +00:00
govenliu
688946b7af [Wi-Fi] Add WifiNetworkDetailsFragment2 unit test cases 
Add new unit test file: WifiNetworkDetailsFragment2Test.java

Bug: 151696220
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiNetworkDetailsFragment2Test
Change-Id: I41d8a6b2c645ec5ca88dc2e1f894be0ac8887555
 2020-06-12 19:38:46 +08:00
Jason Chiu
8cbee49d28 Merge "Fix Slice not pinned error" into rvc-dev 2020-06-12 11:31:23 +00:00
Automerger Merge Worker
1fc9de2ee7 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 05103c79d1 -s ours am: bf139f4a58 -s ours" into rvc-d1-dev-plus-aosp am: d1cc88ce31 -s ours am: 4cb3c84d26 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id977f6b1b6af5c8cb304a11205339a3076dcc40c
 2020-06-12 06:02:43 +00:00
Automerger Merge Worker
23bb94d091 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 05103c79d1 -s ours am: 8215f663ed -s ours" into rvc-d1-dev-plus-aosp am: cab87fe707 -s ours am: cf9a2fa4c0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4eb2e8f1ad14a5f2003bd2a4a1e18f1c771d1f30
 2020-06-12 06:02:36 +00:00
TreeHugger Robot
1470f39625 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 05103c79d1 -s ours am: bf139f4a58 -s ours am: 005448ab04 -s ours am: be2b9edcd4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I48e8ed12b31b74fa7f0c19c00e4cf6fb1b824fc7
 2020-06-12 06:02:28 +00:00
Automerger Merge Worker
102e9b7788 Merge "Merge "Output switcher panel requires large title icon for Slice slider style" into rvc-dev am: c21406a0a2 am: b2ab3dfff2" into rvc-d1-dev-plus-aosp am: ee1cfddac8 am: 3e1ae056bc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11818502

Change-Id: Ic467cf019dc70fb9c74db7d77647e471dd09e671
 2020-06-12 06:02:15 +00:00
Automerger Merge Worker
3559d7614c Merge "Merge "Output switcher panel requires large title icon for Slice slider style" into rvc-dev am: c21406a0a2 am: b2ab3dfff2 am: 94cc0775d9" into rvc-qpr-dev-plus-aosp am: a583f0c74a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11818502

Change-Id: Iba3815dfa8022570d7f178a6a42fd1d91ec725f3
 2020-06-12 06:02:01 +00:00
tim peng
518d5d15b8 Merge "Output switcher panel requires large title icon for Slice slider style" into rvc-dev am: c21406a0a2 am: de8b0ada5f am: 1d4e2258a2 am: 8115a2a109 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11818502

Change-Id: Id8ab7bdb15c42ffd484a59f43f79b1b72104fc3b
 2020-06-12 06:01:40 +00:00
Automerger Merge Worker
4cb3c84d26 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 05103c79d1 -s ours am: bf139f4a58 -s ours" into rvc-d1-dev-plus-aosp am: d1cc88ce31 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ieefdcc16dafac09c0a5c394b40098655fce88ad7
 2020-06-12 05:47:47 +00:00
Automerger Merge Worker
cf9a2fa4c0 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 05103c79d1 -s ours am: 8215f663ed -s ours" into rvc-d1-dev-plus-aosp am: cab87fe707 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic17933e51fba70af98dea1d10248bb23903f4a57
 2020-06-12 05:47:40 +00:00
TreeHugger Robot
be2b9edcd4 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 05103c79d1 -s ours am: bf139f4a58 -s ours am: 005448ab04 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I06af42a2f31bfa4d284aefec0dda241b4044553e
 2020-06-12 05:47:30 +00:00
Automerger Merge Worker
3e1ae056bc Merge "Merge "Output switcher panel requires large title icon for Slice slider style" into rvc-dev am: c21406a0a2 am: b2ab3dfff2" into rvc-d1-dev-plus-aosp am: ee1cfddac8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11818502

Change-Id: Ie985a8ed6d9e7e0abf5b29556ef1d9527694a392
 2020-06-12 05:47:24 +00:00
Automerger Merge Worker
a583f0c74a Merge "Merge "Output switcher panel requires large title icon for Slice slider style" into rvc-dev am: c21406a0a2 am: b2ab3dfff2 am: 94cc0775d9" into rvc-qpr-dev-plus-aosp 2020-06-12 05:47:16 +00:00
tim peng
9e8f2a1e4e Merge "Output switcher panel requires large title icon for Slice slider style" into rvc-dev am: c21406a0a2 am: b2ab3dfff2 am: 94cc0775d9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11818502

Change-Id: I980e169a32d488e3073ab928b9adeeb2c037a099
 2020-06-12 05:47:09 +00:00
tim peng
8115a2a109 Merge "Output switcher panel requires large title icon for Slice slider style" into rvc-dev am: c21406a0a2 am: de8b0ada5f am: 1d4e2258a2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11818502

Change-Id: I5d521387bd686ef446856442ca177193d56a12cd
 2020-06-12 05:46:59 +00:00
Automerger Merge Worker
d1cc88ce31 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 05103c79d1 -s ours am: bf139f4a58 -s ours" into rvc-d1-dev-plus-aosp 2020-06-12 05:25:24 +00:00
Automerger Merge Worker
cab87fe707 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 05103c79d1 -s ours am: 8215f663ed -s ours" into rvc-d1-dev-plus-aosp 2020-06-12 05:25:19 +00:00
TreeHugger Robot
337d64b985 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 05103c79d1 -s ours am: bf139f4a58 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I52f0cb116a5bcc73947bd775747d7e4499ba3e96
 2020-06-12 05:25:19 +00:00
TreeHugger Robot
7483b01c8e [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 05103c79d1 -s ours am: 8215f663ed -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2a2ad5dbc5d89c7e8a7ff791a3b1952bf505337f
 2020-06-12 05:25:15 +00:00
Automerger Merge Worker
ee1cfddac8 Merge "Merge "Output switcher panel requires large title icon for Slice slider style" into rvc-dev am: c21406a0a2 am: b2ab3dfff2" into rvc-d1-dev-plus-aosp 2020-06-12 05:25:14 +00:00
TreeHugger Robot
005448ab04 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 05103c79d1 -s ours am: bf139f4a58 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia24a58b220fb67cc562a2acb8cf641e5c6b57ac0
 2020-06-12 05:25:13 +00:00
tim peng
1d4e2258a2 Merge "Output switcher panel requires large title icon for Slice slider style" into rvc-dev am: c21406a0a2 am: de8b0ada5f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11818502

Change-Id: I7103136caa2b9139e2c598826d6ae7494678c6c0
 2020-06-12 05:25:08 +00:00
tim peng
ae2f75a060 Merge "Output switcher panel requires large title icon for Slice slider style" into rvc-dev am: c21406a0a2 am: b2ab3dfff2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11818502

Change-Id: Ia8bafba6aa8fe7042be82288a11b48ec4d3e1839
 2020-06-12 05:25:08 +00:00
tim peng
94cc0775d9 Merge "Output switcher panel requires large title icon for Slice slider style" into rvc-dev am: c21406a0a2 am: b2ab3dfff2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11818502

Change-Id: I769ad89870ac16016683e8cfaed2488e4a6d78a7
 2020-06-12 05:25:06 +00:00
TreeHugger Robot
8215f663ed [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 05103c79d1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I14d51e59d67ded733a532e7d8d15d65269db4c1e
 2020-06-12 05:10:44 +00:00