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
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
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
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
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
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
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
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
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
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
lbill
021a546a9d
Fix RestrictedPreference icons do not align view state
...
Add android:tint="?android:attr/colorControlNormal" in vector drawable
Bug: 193514112
Test: Manual, set RestrictedPreference to disabled state and check
if icons of preference grey out
Change-Id: Icf2821317da731d862d5eebe968b5704ef78271c
2023-07-26 12:21:50 +00:00
Treehugger Robot
6bcb048b13
Merge "Match APN types with ignoring the case" into main am: 720fd136ed am: 9a44907d9e am: 3d47657593 am: ff78df4b72 am: 4405824d2c
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2671056
Change-Id: I0fc8f2564d064eb4af752d0414ca5437e28ad1fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-26 08:28:01 +00:00
Treehugger Robot
4405824d2c
Merge "Match APN types with ignoring the case" into main am: 720fd136ed am: 9a44907d9e am: 3d47657593 am: ff78df4b72
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2671056
Change-Id: Ibd736933f8d0aa649930a1d432611b958d09f292
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-26 07:19:20 +00:00
Treehugger Robot
ff78df4b72
Merge "Match APN types with ignoring the case" into main am: 720fd136ed am: 9a44907d9e am: 3d47657593
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2671056
Change-Id: Ie247ffcc6ec787912e50474ec1d51744e6dfc5ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-26 06:38:47 +00:00
Treehugger Robot
3d47657593
Merge "Match APN types with ignoring the case" into main am: 720fd136ed am: 9a44907d9e
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2671056
Change-Id: If5c4c47dd5d1b05635e8d5102e52a58f5442a9da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-26 05:31:45 +00:00
Weng Su
c8fdce0a1d
[automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: e3b554b296 am: cb3ebcb4e3 -s ours am: a1f182efb9 -s ours am: 79c41b1104 -s ours am: 6bf9d64ba4 -s ours am: 65fc0b1f90 -s ours am: e2946957da -s ours am: faff4d6bea -s ours am: 63b73e5a29 -s ours am: 56b9900a19 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23982017
Change-Id: I57c871c627f95922330267e91f9d4bfe1942b6ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-26 05:15:10 +00:00
Weng Su
1402833cd2
[automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: e3b554b296 am: cb3ebcb4e3 -s ours am: a1f182efb9 -s ours am: 79c41b1104 -s ours am: 682d6a2e9a -s ours am: 0cb88ae1f0 -s ours am: 0a6a483204 -s ours am: 79cf9bd19e -s ours am: 8a98c204aa -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23982017
Change-Id: I945fbdb053e2cb204119dc63eb7955379fcb5368
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-26 05:15:00 +00:00
Wenhui Yang
42e193a6c0
Merge "Revert "Fix rotate device at face unlock detailed page, device will display"" into udc-d1-dev am: 5239911c6b am: 16dc3ed748 am: 6f61f7dfa5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24199674
Change-Id: I37aceb0690b1e76ec91a99aa072cbf8feb3249a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-26 05:14:49 +00:00
Weng Su
8da316f3d7
[automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: e3b554b296 am: cb3ebcb4e3 -s ours am: a1f182efb9 -s ours am: 79c41b1104 -s ours am: 6bf9d64ba4 -s ours am: 65fc0b1f90 -s ours am: e2946957da -s ours am: 8e9e1946ba -s ours am: 47aa5a25ca -s ours am: 51d0f32f9d -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23982017
Change-Id: Ib99c06db6f03042c342b01954c1407da982ca6b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-26 05:14:39 +00:00
Weng Su
358c19d93a
[automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: e3b554b296 am: cb3ebcb4e3 -s ours am: a1f182efb9 -s ours am: 79c41b1104 -s ours am: 682d6a2e9a -s ours am: 0cb88ae1f0 -s ours am: 03f55c0ab2 -s ours am: 6349278319 -s ours am: 4770a25e7f -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23982017
Change-Id: I293b6e4cbb0d135890579d0570f62be2c6cb5be9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-26 05:14:29 +00:00
Wenhui Yang
d1f2c04069
Merge "Revert "Fix rotate device at face unlock detailed page, device will display"" into udc-d1-dev am: 5239911c6b am: b1feaf710d am: c7240489b0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24199674
Change-Id: I04ec7f26fe4ce68d2083b6ce480735af4a22d6b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-26 05:14:18 +00:00
Weng Su
5197dde191
[automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: e3b554b296 am: cb3ebcb4e3 -s ours am: a1f182efb9 -s ours am: 79c41b1104 -s ours am: 6bf9d64ba4 -s ours am: 65fc0b1f90 -s ours am: e2946957da -s ours am: 8e9e1946ba -s ours am: 88e30593f5 -s ours am: 9312668efd -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23982017
Change-Id: I09482280ba892a0b4059488fc442a6bb5dd04cb4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-26 05:13:34 +00:00
Weng Su
f4ced34fbe
[automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: e3b554b296 am: cb3ebcb4e3 -s ours am: a1f182efb9 -s ours am: 79c41b1104 -s ours am: 682d6a2e9a -s ours am: 0cb88ae1f0 -s ours am: 03f55c0ab2 -s ours am: e687bedbd9 -s ours am: 537b7abe31 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23982017
Change-Id: Ic8957b1004c25c0beb9cfb26ba9513ae2a50cafd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-26 05:08:14 +00:00
Treehugger Robot
9a44907d9e
Merge "Match APN types with ignoring the case" into main am: 720fd136ed
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2671056
Change-Id: I502a8c1c156c26bb68f73afc4a2c5d438aef5dd3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-26 04:47:15 +00:00
Weng Su
56b9900a19
[automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: e3b554b296 am: cb3ebcb4e3 -s ours am: a1f182efb9 -s ours am: 79c41b1104 -s ours am: 6bf9d64ba4 -s ours am: 65fc0b1f90 -s ours am: e2946957da -s ours am: faff4d6bea -s ours am: 63b73e5a29 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23982017
Change-Id: Ic32bdebcd639989bd6b748c56d3b78a8dfaf8c30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-26 04:29:15 +00:00
Weng Su
8a98c204aa
[automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: e3b554b296 am: cb3ebcb4e3 -s ours am: a1f182efb9 -s ours am: 79c41b1104 -s ours am: 682d6a2e9a -s ours am: 0cb88ae1f0 -s ours am: 0a6a483204 -s ours am: 79cf9bd19e -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23982017
Change-Id: If992873a592879e3ae82b3289c303261a7c88cc3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-26 04:29:06 +00:00
Wenhui Yang
6f61f7dfa5
Merge "Revert "Fix rotate device at face unlock detailed page, device will display"" into udc-d1-dev am: 5239911c6b am: 16dc3ed748
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24199674
Change-Id: I3ddba623f23a2fdb2f280ed7573c169c7db7d8ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-26 04:28:34 +00:00
Weng Su
51d0f32f9d
[automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: e3b554b296 am: cb3ebcb4e3 -s ours am: a1f182efb9 -s ours am: 79c41b1104 -s ours am: 6bf9d64ba4 -s ours am: 65fc0b1f90 -s ours am: e2946957da -s ours am: 8e9e1946ba -s ours am: 47aa5a25ca -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23982017
Change-Id: I6f1a0f363f952f6de25d1012e34b8d1346dbc260
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-26 04:28:03 +00:00
Weng Su
4770a25e7f
[automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: e3b554b296 am: cb3ebcb4e3 -s ours am: a1f182efb9 -s ours am: 79c41b1104 -s ours am: 682d6a2e9a -s ours am: 0cb88ae1f0 -s ours am: 03f55c0ab2 -s ours am: 6349278319 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23982017
Change-Id: Ic1cbb57e0dbf262b2fcdb297829e1644dbd3e6a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-26 04:26:51 +00:00
Wenhui Yang
c7240489b0
Merge "Revert "Fix rotate device at face unlock detailed page, device will display"" into udc-d1-dev am: 5239911c6b am: b1feaf710d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24199674
Change-Id: I015c68ff6531bb497e50ac2e21a4c11ba37394b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-26 04:24:43 +00:00
Weng Su
9312668efd
[automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: e3b554b296 am: cb3ebcb4e3 -s ours am: a1f182efb9 -s ours am: 79c41b1104 -s ours am: 6bf9d64ba4 -s ours am: 65fc0b1f90 -s ours am: e2946957da -s ours am: 8e9e1946ba -s ours am: 88e30593f5 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23982017
Change-Id: I3e74adb0a6ccc1a4b7d4a2362b4104a33a48c2d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-26 04:24:34 +00:00
Weng Su
537b7abe31
[automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: e3b554b296 am: cb3ebcb4e3 -s ours am: a1f182efb9 -s ours am: 79c41b1104 -s ours am: 682d6a2e9a -s ours am: 0cb88ae1f0 -s ours am: 03f55c0ab2 -s ours am: e687bedbd9 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23982017
Change-Id: I78963af6be14c136d46f4636b8bb9129bab8ab3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-26 04:23:39 +00:00
Treehugger Robot
720fd136ed
Merge "Match APN types with ignoring the case" into main
2023-07-26 04:03:19 +00:00
Weng Su
63b73e5a29
[automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: e3b554b296 am: cb3ebcb4e3 -s ours am: a1f182efb9 -s ours am: 79c41b1104 -s ours am: 6bf9d64ba4 -s ours am: 65fc0b1f90 -s ours am: e2946957da -s ours am: faff4d6bea -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23982017
Change-Id: I046b7480f15685ffc27e959934f295c09598b57f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-26 03:19:47 +00:00
Treehugger Robot
291e265f01
Merge "Correct used size of Storage Settings." into udc-d1-dev am: d86ec6652a am: 4f21f99c6d am: 78520ce32f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23898724
Change-Id: I1cb3ffad5acf41f6db6a3a7cbe7d11b88ff4ec86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-26 03:19:00 +00:00
Weng Su
c9c0bf4810
[automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: 6afcad7626 -s ours am: 2aa573fbd1 -s ours am: 80de015a39 -s ours am: 29c6c35f9c -s ours am: 513e07f285 -s ours am: 78de3a6d03 -s ours am: ee33044097 -s ours am: 4a62d49360 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24018267
Change-Id: I4c9dd10e4943010bf4cebc06811979bf23d88dbb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-26 03:18:50 +00:00
