Commit Graph

132940 Commits

Author SHA1 Message Date
Avinash Vadlamudi
0fe62fa541 Merge "Remove redundant code of setting the DeviceConfig overrides" into udc-qpr-dev am: 4e460ed41e am: fea57771ad
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24099788

Change-Id: Icfb7379fab2fc973045c4cc381ae577468f1f92d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27 11:42:35 +00:00
Avinash Vadlamudi
fea57771ad Merge "Remove redundant code of setting the DeviceConfig overrides" into udc-qpr-dev am: 4e460ed41e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24099788

Change-Id: If440d5c2a6e65a760af7836b180e443c420a5991
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27 11:00:07 +00:00
Avinash Vadlamudi
4e460ed41e Merge "Remove redundant code of setting the DeviceConfig overrides" into udc-qpr-dev 2023-07-27 10:20:48 +00:00
Weng Su
3505537aec [automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: 5c2d727b8f am: f869bfa55f -s ours am: 72784b097a -s ours am: d75d8aef39 -s ours am: fcd82fa052 -s ours am: 22e2de50eb -s ours am: febb6c3eca -s ours am: a01bbe4acb -s ours am: 37263f087d -s ours am: f7bd475bbd -s ours am: 37a29ac4a6 -s ours am: a3b8680926 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8ba3d99e5674f9964f2d7a31992cd6d22da4746e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27 09:11:35 +00:00
Weng Su
c31296cc59 [automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: 5c2d727b8f am: f869bfa55f -s ours am: 72784b097a -s ours am: d75d8aef39 -s ours am: fcd82fa052 -s ours am: 22e2de50eb -s ours am: 8a69b9830f -s ours am: 854aa4dfa3 -s ours am: dee47d1bd5 -s ours am: 01f4981e69 -s ours am: 32260411d6 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id5a3e59760269f04ff4b1583a08704fcb24cb886
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27 09:11:24 +00:00
Weng Su
57a312e49a [automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: 5c2d727b8f am: f869bfa55f -s ours am: 72784b097a -s ours am: d75d8aef39 -s ours am: fcd82fa052 -s ours am: 22e2de50eb -s ours am: febb6c3eca -s ours am: a01bbe4acb -s ours am: 37263f087d -s ours am: cced777c0f -s ours am: 579351cc99 -s ours am: 05bda009bf -s ours
am skip reason: subject contains skip directive

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

Change-Id: I372bfb28d0ee16bf36475020f774efa6b3fca36a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27 09:11:15 +00:00
Weng Su
da40d5ab99 [automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: 5c2d727b8f am: f869bfa55f -s ours am: 72784b097a -s ours am: d75d8aef39 -s ours am: fcd82fa052 -s ours am: 22e2de50eb -s ours am: 8a69b9830f -s ours am: 854aa4dfa3 -s ours am: 9ddb3ae3e0 -s ours am: 49856c7362 -s ours am: 6b51fdafbb -s ours
am skip reason: subject contains skip directive

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

Change-Id: I74fb309668bd8d88af8f65d647f4aae40ea6f862
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27 09:11:04 +00:00
Weng Su
025044f4a8 [automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: 5c2d727b8f am: f869bfa55f -s ours am: 72784b097a -s ours am: d75d8aef39 -s ours am: fcd82fa052 -s ours am: 22e2de50eb -s ours am: febb6c3eca -s ours am: a01bbe4acb -s ours am: 37263f087d -s ours am: cced777c0f -s ours am: c9ae9fe3d4 -s ours am: e11dab3f7a -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id820a8079a04d671e7cfbc41277d43111b247446
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27 09:10:54 +00:00
Weng Su
004ab89411 [automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: 5c2d727b8f am: f869bfa55f -s ours am: 72784b097a -s ours am: d75d8aef39 -s ours am: fcd82fa052 -s ours am: 22e2de50eb -s ours am: 8a69b9830f -s ours am: 854aa4dfa3 -s ours am: 9ddb3ae3e0 -s ours am: 7e645b1340 -s ours am: adf212e2d3 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I417afd2e2b01a4f09d1e3436d8562392677b5d9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27 09:10:22 +00:00
Bill Lin
6acdfbd6bc Merge "Fix RestrictedPreference icons do not align view state" into udc-qpr-dev am: 18d0e96e33 am: 918d7659bb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24210404

Change-Id: I78b3529660ddd786f425765dd6d9845e44adb10e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27 09:09:39 +00:00
Weng Su
a3b8680926 [automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: 5c2d727b8f am: f869bfa55f -s ours am: 72784b097a -s ours am: d75d8aef39 -s ours am: fcd82fa052 -s ours am: 22e2de50eb -s ours am: febb6c3eca -s ours am: a01bbe4acb -s ours am: 37263f087d -s ours am: f7bd475bbd -s ours am: 37a29ac4a6 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3311506c68e3ece2fdb308f0a793c6c5ac060b8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27 08:25:50 +00:00
Weng Su
32260411d6 [automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: 5c2d727b8f am: f869bfa55f -s ours am: 72784b097a -s ours am: d75d8aef39 -s ours am: fcd82fa052 -s ours am: 22e2de50eb -s ours am: 8a69b9830f -s ours am: 854aa4dfa3 -s ours am: dee47d1bd5 -s ours am: 01f4981e69 -s ours
am skip reason: subject contains skip directive

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

Change-Id: If9cf7c8c9d56b73559e0c5d3b70308fa47826427
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27 08:25:39 +00:00
Weng Su
05bda009bf [automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: 5c2d727b8f am: f869bfa55f -s ours am: 72784b097a -s ours am: d75d8aef39 -s ours am: fcd82fa052 -s ours am: 22e2de50eb -s ours am: febb6c3eca -s ours am: a01bbe4acb -s ours am: 37263f087d -s ours am: cced777c0f -s ours am: 579351cc99 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib433a249736044287995f2f25b2a75aefb9111e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27 08:25:29 +00:00
Weng Su
6b51fdafbb [automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: 5c2d727b8f am: f869bfa55f -s ours am: 72784b097a -s ours am: d75d8aef39 -s ours am: fcd82fa052 -s ours am: 22e2de50eb -s ours am: 8a69b9830f -s ours am: 854aa4dfa3 -s ours am: 9ddb3ae3e0 -s ours am: 49856c7362 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9fff0e2d367b53438c26a69aa07c53993b0dafba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27 08:25:11 +00:00
Weng Su
e11dab3f7a [automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: 5c2d727b8f am: f869bfa55f -s ours am: 72784b097a -s ours am: d75d8aef39 -s ours am: fcd82fa052 -s ours am: 22e2de50eb -s ours am: febb6c3eca -s ours am: a01bbe4acb -s ours am: 37263f087d -s ours am: cced777c0f -s ours am: c9ae9fe3d4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2535889207bccdc649fe630c7597b670e03fd0fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27 08:01:58 +00:00
Weng Su
adf212e2d3 [automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: 5c2d727b8f am: f869bfa55f -s ours am: 72784b097a -s ours am: d75d8aef39 -s ours am: fcd82fa052 -s ours am: 22e2de50eb -s ours am: 8a69b9830f -s ours am: 854aa4dfa3 -s ours am: 9ddb3ae3e0 -s ours am: 7e645b1340 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie2cd0a0856250b9259ec9f8634992fba9b847382
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27 08:01:48 +00:00
Bill Lin
918d7659bb Merge "Fix RestrictedPreference icons do not align view state" into udc-qpr-dev am: 18d0e96e33
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24210404

Change-Id: Ia87a8b547ee8efacd881b01bfcb2d58ee1bbd92a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27 08:01:06 +00:00
Weng Su
c9ae9fe3d4 [automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: 5c2d727b8f am: f869bfa55f -s ours am: 72784b097a -s ours am: d75d8aef39 -s ours am: fcd82fa052 -s ours am: 22e2de50eb -s ours am: febb6c3eca -s ours am: a01bbe4acb -s ours am: 37263f087d -s ours am: cced777c0f -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iedcd9a581a39b92d337a233106ca1c6a941d355a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27 07:37:50 +00:00
Weng Su
c878ed5b9b [automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: 5c2d727b8f am: f869bfa55f -s ours am: 72784b097a -s ours am: d75d8aef39 -s ours am: fcd82fa052 -s ours am: 22e2de50eb -s ours am: febb6c3eca -s ours am: a01bbe4acb -s ours am: 37263f087d -s ours am: e7aa31fe1f -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3b1b4405044109a3b2212f3005e8e9328b985804
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27 07:37:32 +00:00
Weng Su
7e645b1340 [automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: 5c2d727b8f am: f869bfa55f -s ours am: 72784b097a -s ours am: d75d8aef39 -s ours am: fcd82fa052 -s ours am: 22e2de50eb -s ours am: 8a69b9830f -s ours am: 854aa4dfa3 -s ours am: 9ddb3ae3e0 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4ed2674b648a9cba8d8915d99ae11c538aa8b7f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27 07:37:24 +00:00
Weng Su
efef291385 [automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: 5c2d727b8f am: f869bfa55f -s ours am: 72784b097a -s ours am: d75d8aef39 -s ours am: fcd82fa052 -s ours am: 22e2de50eb -s ours am: 8a69b9830f -s ours am: 854aa4dfa3 -s ours am: b6b2be1491 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I00446dc9e2a1ab71ab0ccfa8e648a209e5ac93d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27 07:37:17 +00:00
Weng Su
37a29ac4a6 [automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: 5c2d727b8f am: f869bfa55f -s ours am: 72784b097a -s ours am: d75d8aef39 -s ours am: fcd82fa052 -s ours am: 22e2de50eb -s ours am: febb6c3eca -s ours am: a01bbe4acb -s ours am: 37263f087d -s ours am: f7bd475bbd -s ours
am skip reason: subject contains skip directive

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

Change-Id: I212014b423a37deae8c81007123513596dbf5b38
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27 07:37:13 +00:00
Weng Su
01f4981e69 [automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: 5c2d727b8f am: f869bfa55f -s ours am: 72784b097a -s ours am: d75d8aef39 -s ours am: fcd82fa052 -s ours am: 22e2de50eb -s ours am: 8a69b9830f -s ours am: 854aa4dfa3 -s ours am: dee47d1bd5 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4dbec11a5121ce7a65ca4418133714474e53857c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27 07:36:52 +00:00
Weng Su
579351cc99 [automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: 5c2d727b8f am: f869bfa55f -s ours am: 72784b097a -s ours am: d75d8aef39 -s ours am: fcd82fa052 -s ours am: 22e2de50eb -s ours am: febb6c3eca -s ours am: a01bbe4acb -s ours am: 37263f087d -s ours am: cced777c0f -s ours
am skip reason: subject contains skip directive

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

Change-Id: I631dac23280078bf32ba576e862b53c2789e7e39
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27 07:36:38 +00:00
Weng Su
49856c7362 [automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: 5c2d727b8f am: f869bfa55f -s ours am: 72784b097a -s ours am: d75d8aef39 -s ours am: fcd82fa052 -s ours am: 22e2de50eb -s ours am: 8a69b9830f -s ours am: 854aa4dfa3 -s ours am: 9ddb3ae3e0 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I81bcafca2db52046c095af8974595f0307acc6cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27 07:36:24 +00:00
Bill Lin
18d0e96e33 Merge "Fix RestrictedPreference icons do not align view state" into udc-qpr-dev 2023-07-27 07:12:08 +00:00
Weng Su
cced777c0f [automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: 5c2d727b8f am: f869bfa55f -s ours am: 72784b097a -s ours am: d75d8aef39 -s ours am: fcd82fa052 -s ours am: 22e2de50eb -s ours am: febb6c3eca -s ours am: a01bbe4acb -s ours am: 37263f087d -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iba606bf2c12351c971525d34069898587d197c02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27 06:52:12 +00:00
Weng Su
e7aa31fe1f [automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: 5c2d727b8f am: f869bfa55f -s ours am: 72784b097a -s ours am: d75d8aef39 -s ours am: fcd82fa052 -s ours am: 22e2de50eb -s ours am: febb6c3eca -s ours am: a01bbe4acb -s ours am: 37263f087d -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia9c0e1dcb4c5a846e8eee63d0d6de8c1e30568ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27 06:34:38 +00:00
Weng Su
f7bd475bbd [automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: 5c2d727b8f am: f869bfa55f -s ours am: 72784b097a -s ours am: d75d8aef39 -s ours am: fcd82fa052 -s ours am: 22e2de50eb -s ours am: febb6c3eca -s ours am: a01bbe4acb -s ours am: 37263f087d -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib8f86ea54ddfe350dc37e4a3195b06bbfe672816
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27 06:34:24 +00:00
Weng Su
b6b2be1491 [automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: 5c2d727b8f am: f869bfa55f -s ours am: 72784b097a -s ours am: d75d8aef39 -s ours am: fcd82fa052 -s ours am: 22e2de50eb -s ours am: 8a69b9830f -s ours am: 854aa4dfa3 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4e2c72226c382ab374c5df34e3561412cf3c4f56
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27 06:34:20 +00:00
Weng Su
dee47d1bd5 [automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: 5c2d727b8f am: f869bfa55f -s ours am: 72784b097a -s ours am: d75d8aef39 -s ours am: fcd82fa052 -s ours am: 22e2de50eb -s ours am: 8a69b9830f -s ours am: 854aa4dfa3 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6a511e41e45dc899ee0b6165e07ec0170f0f4239
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27 06:34:15 +00:00
Weng Su
37263f087d [automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: 5c2d727b8f am: f869bfa55f -s ours am: 72784b097a -s ours am: d75d8aef39 -s ours am: fcd82fa052 -s ours am: 22e2de50eb -s ours am: febb6c3eca -s ours am: a01bbe4acb -s ours
am skip reason: subject contains skip directive

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

Change-Id: I89c1a5df31111db99192aebe07bd3250fb494704
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27 06:30:19 +00:00
Weng Su
9ddb3ae3e0 [automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: 5c2d727b8f am: f869bfa55f -s ours am: 72784b097a -s ours am: d75d8aef39 -s ours am: fcd82fa052 -s ours am: 22e2de50eb -s ours am: 8a69b9830f -s ours am: 854aa4dfa3 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I44d04651ecb34cdf96e2eb43387fccaa91c3b31e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27 06:30:10 +00:00
Weng Su
854aa4dfa3 [automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: 5c2d727b8f am: f869bfa55f -s ours am: 72784b097a -s ours am: d75d8aef39 -s ours am: fcd82fa052 -s ours am: 22e2de50eb -s ours am: 8a69b9830f -s ours
am skip reason: subject contains skip directive

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

Change-Id: I13f9f338dd48c83ee1c64f5391fd762b2e95b483
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27 05:51:52 +00:00
Weng Su
a01bbe4acb [automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: 5c2d727b8f am: f869bfa55f -s ours am: 72784b097a -s ours am: d75d8aef39 -s ours am: fcd82fa052 -s ours am: 22e2de50eb -s ours am: febb6c3eca -s ours
am skip reason: subject contains skip directive

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

Change-Id: I75c8012a87166a46fe58bacff3123c103fae2e7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27 05:46:37 +00:00
Weng Su
febb6c3eca [automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: 5c2d727b8f am: f869bfa55f -s ours am: 72784b097a -s ours am: d75d8aef39 -s ours am: fcd82fa052 -s ours am: 22e2de50eb -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic4175d8e3b330edecddc5eec6b3590b245456798
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27 04:43:09 +00:00
Weng Su
8a69b9830f [automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: 5c2d727b8f am: f869bfa55f -s ours am: 72784b097a -s ours am: d75d8aef39 -s ours am: fcd82fa052 -s ours am: 22e2de50eb -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ied784396c2408e1b5b2692c4b3adf359ec54ce9c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27 04:40:56 +00:00
Weng Su
22e2de50eb [automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: 5c2d727b8f am: f869bfa55f -s ours am: 72784b097a -s ours am: d75d8aef39 -s ours am: fcd82fa052 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5e3f24bdd22f7f0e59e7baaa3d4fe4835cf6386e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27 03:55:45 +00:00
Weng Su
fcd82fa052 [automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: 5c2d727b8f am: f869bfa55f -s ours am: 72784b097a -s ours am: d75d8aef39 -s ours
am skip reason: subject contains skip directive

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

Change-Id: If0e63c0c18ab4f14b3b031ecf8a45e811aa2bb11
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27 03:13:58 +00:00
Weng Su
d75d8aef39 [automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: 5c2d727b8f am: f869bfa55f -s ours am: 72784b097a -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3523d29eee6901db206e74f2e65affa680451f14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27 02:26:42 +00:00
Treehugger Robot
6e43b13cb8 Merge "[BiometricsV2] Refine ErrorDialogViewModelTest" into main 2023-07-27 02:13:09 +00:00
Weng Su
72784b097a [automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: 5c2d727b8f am: f869bfa55f -s ours
am skip reason: subject contains skip directive

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

Change-Id: I65ed5a2db7bc34112ddcd8f819b7ab995e571c30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27 00:56:13 +00:00
Weng Su
f869bfa55f [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: 5c2d727b8f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24025008

Change-Id: Ia2f6bfa237d211be6b884c56d831c84d0c437210
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27 00:13:52 +00:00
Tetiana Meronyk
80ccb0351a Merge "Fix keyboard showing after dialog dismissed" into udc-qpr-dev am: 98df5bcde2 am: 414c82a2f2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24174129

Change-Id: I11b0555e8c4a8db2e5799799fc778732d1fe8ec2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-26 19:13:31 +00:00
Chris Antol
b95ceb53ba Merge "Storage Apps Lists SPA migration" into main 2023-07-26 19:00:40 +00:00
Tetiana Meronyk
414c82a2f2 Merge "Fix keyboard showing after dialog dismissed" into udc-qpr-dev am: 98df5bcde2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24174129

Change-Id: I111635a0c02a4a37e4a2f1bfe0ecaf0067a1703f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-26 18:11:04 +00:00
Avinash Vadlamudi
5567bdbfb3 Remove redundant code of setting the DeviceConfig overrides
- The auto pin confirm feature is now always available: (ag/23288037)

Bug: 291146670
Test: atest ChooseLockPasswordTest
Test: atest AutoPinConfirmPreferenceControllerTest
Change-Id: I6b9337dfee5d84ffdd3391f7b424377d640d451c
2023-07-26 17:51:13 +00:00
Tetiana Meronyk
98df5bcde2 Merge "Fix keyboard showing after dialog dismissed" into udc-qpr-dev 2023-07-26 16:47:18 +00:00
Treehugger Robot
35d8c4fcdf Merge "Disable FontWeightAdjustmentPreferenceControllerTest" into main 2023-07-26 13:18:28 +00:00
Adrian Roos
af4e91db85 Disable FontWeightAdjustmentPreferenceControllerTest
The test modifies the system-global font weight adjustment setting,
but doesn't reset it, leaving the system in a bad state for subsequent
tests.

Bug: 293250385
Change-Id: I9f7b8fc100b71181d17e5e72cc8c6d871c41de7d
Test: n/a

Bug: 293250385
Change-Id: I9f7b8fc100b71181d17e5e72cc8c6d871c41de7d
Test: n/a
2023-07-26 12:32:11 +00:00