PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
105,368 Commits 1 Branch 0 Tags
a73b5018b0937d457532392d7a508b362cea2c1c
Commit Graph

105368 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
94d7904bf9 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: aabc1c3bf6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I01ec44cbd2614c9527ecdb6e4fed55acabef408d
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-24 00:15:43 +00:00
Bill Yi
587f38be4d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: f5ea12c99d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I659f9566c999001f5634a0fe107d2907d298be2e
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-24 00:15:25 +00:00
Bill Yi
940a16b235 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8a7a0cf680 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If9902f023ba4d339dbf4359deabf120a96bdb576
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-24 00:15:10 +00:00
Bill Yi
eec01885fe Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2022-04-23 23:26:53 +00:00
Bill Yi
f5ea12c99d Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2022-04-23 23:26:53 +00:00
Treehugger Robot
a556770d2f Merge "Update OWNERS file for enterprise modules in Settings" am: 0edc7fb3cb am: 08f97c9bc0 am: 7191d7d09d am: 97d9c0fd07 am: 3ff1c69be2 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2064127

Change-Id: I74041b444fe978b9e15044ea982e38eb1e3f32ce
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-23 21:01:19 +00:00
Treehugger Robot
3ff1c69be2 Merge "Update OWNERS file for enterprise modules in Settings" am: 0edc7fb3cb am: 08f97c9bc0 am: 7191d7d09d am: 97d9c0fd07 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2064127

Change-Id: I61eaf88879353c3847e6049e5736277a35213905
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-23 20:45:09 +00:00
Treehugger Robot
97d9c0fd07 Merge "Update OWNERS file for enterprise modules in Settings" am: 0edc7fb3cb am: 08f97c9bc0 am: 7191d7d09d 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2064127

Change-Id: Ia710b1bd651880e0dddc39f6cb41d168c18c96ee
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-23 20:20:58 +00:00
Treehugger Robot
7191d7d09d Merge "Update OWNERS file for enterprise modules in Settings" am: 0edc7fb3cb am: 08f97c9bc0 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2064127

Change-Id: I016b3fa9032e278a9d88b842b0e72f460b71d6c6
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-23 19:56:36 +00:00
Treehugger Robot
08f97c9bc0 Merge "Update OWNERS file for enterprise modules in Settings" am: 0edc7fb3cb 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2064127

Change-Id: Iec813ee718cda4e6d0bd5a32ec6a2af9a136cfaa
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-23 19:38:41 +00:00
Prabal Singh
67007e5933 Use settingslib util methods for work policy info 
Bug: b/229889270
Test: make ROBOTEST_FILTER=EnterprisePrivacyFeatureProviderImplTest RunSettingsRoboTests -j40
Change-Id: I0d968732a4dd601955e18b2ebb2af365638b450f
 2022-04-23 20:35:41 +01:00
Treehugger Robot
0edc7fb3cb Merge "Update OWNERS file for enterprise modules in Settings" 2022-04-23 18:55:44 +00:00
Bonian Chen
cc7474d50d [Settings] Fix flaky presubmit failure 
Bug: 229689535
Test: unit test
Change-Id: I0fc193d6f34cfff13d15487ad0c1f646f67d4c97
 2022-04-23 17:53:14 +00:00
Will
640247eb58 Disable screen saver setting for non-system users. 
On devices where non-system users are not allowed to dream, disable the
screen saver setting when the current user is not the system user.

Bug: 213906883
Test: atest ScreenSaverPreferenceControllerTest
Test: Manually with the following steps:
Step 1: On a device with the config setting
config_dreamsOnlyEnabledForSystemUser set to false, make sure that
non-system users can still access the screen saver setting.
Step 2: On a device with the config setting
config_dreamsOnlyEnabledForSystemUser setting is set to true, make sure
that non-system users can not access (or see) the screen saver setting.
Step 3: Make sure that system users can still see the screen saver
setting on a device where config_dreamsOnlyEnabledForSystemUser is set
to true.

Change-Id: I7e167ed5a1ea183c725ba89a57b8d0b372064b82
 2022-04-22 16:03:31 -07:00
TreeHugger Robot
6585a18362 Merge "Import translations. DO NOT MERGE ANYWHERE" 2022-04-22 22:29:26 +00:00
TreeHugger Robot
642cacec6a Merge "Import translations. DO NOT MERGE ANYWHERE" 2022-04-22 22:29:26 +00:00
Nate Myren
d1749cfbab Allow intent into Privacy Controls page 
Test: manual
Bug: 222127397
Change-Id: If98ce8b89332eaaaa9be70885afe9d8465c191dd
 2022-04-22 13:58:50 -07:00
TreeHugger Robot
b2308b060d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 3624b9a2ef -s ours am: 32f8460aac -s ours am: d3cba01021 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If75a5eee9eaafbe782c9f0661f26c0d798af0abb
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-22 20:50:56 +00:00
Bill Yi
2b554b0dbb [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8460461f4d -s ours am: a3fdaece70 -s ours am: f385713f6b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9292e164bddeed437c618067c00563c2c743fb33
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-22 20:50:22 +00:00
TreeHugger Robot
39143b0b93 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 7a6e5d0b0b -s ours am: 8c759d6469 -s ours am: ad9bfbffaf -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I21ca5abea8fcc7b22951ffef2f928fede621a5d8
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-22 20:50:03 +00:00
Bill Yi
6a5c064925 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5e411e93e7 -s ours am: 5fb0418563 -s ours am: 55211b61d3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I79c7cbfb2bb03965077db22ba5c0af609d47f34a
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-22 20:49:46 +00:00
TreeHugger Robot
d3cba01021 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 3624b9a2ef -s ours am: 32f8460aac -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I35d560b1756ac96068c60a26689393683901dceb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-22 20:10:35 +00:00
Bill Yi
f385713f6b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8460461f4d -s ours am: a3fdaece70 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I177958553a72fc56d2eab5da68d4b2e383dbe03e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-22 20:10:06 +00:00
TreeHugger Robot
ad9bfbffaf [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 7a6e5d0b0b -s ours am: 8c759d6469 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2a0e05b77836f0b6927c841c3f7104ef8150c943
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-22 20:09:42 +00:00
Bill Yi
55211b61d3 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5e411e93e7 -s ours am: 5fb0418563 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3c97ae3cc9810284905954ab68a5f6072b81625d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-22 20:09:20 +00:00
TreeHugger Robot
1de2f7a557 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 3624b9a2ef -s ours am: c2a243d18e -s ours am: 53c6bea932 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Icb108d270e7a9cc5332cc4e920ab62fd5e7eee96
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-22 20:01:36 +00:00
Bill Yi
9de0d65337 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8460461f4d -s ours am: a677c158cb -s ours am: ffdb2b7614 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic628c812a3c444a6f898515eef7faba8c3d209e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-22 20:00:59 +00:00
TreeHugger Robot
d9802bbdb6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 7a6e5d0b0b -s ours am: 5cbf83555b -s ours am: 2501bf61be -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I998932bf6f48d19335d1a98c1ea3cfcf3e3fcba9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-22 20:00:40 +00:00
Bill Yi
ddb2717884 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5e411e93e7 -s ours am: 4b425d20e9 -s ours am: ba0eb24634 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9b12a1c9a50e613c6dd2e50ac2a5c209cc35f7d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-22 20:00:25 +00:00
TreeHugger Robot
32f8460aac [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 3624b9a2ef -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I363d10e518483394ead5bcc4bf6e7f35f663f434
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-22 19:44:36 +00:00
Bill Yi
a3fdaece70 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8460461f4d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5ad6e33af4bad2d9a9d4d006b21d4f6e005b2f21
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-22 19:44:08 +00:00
TreeHugger Robot
8c759d6469 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 7a6e5d0b0b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2433ce74a331e7114970e3014cf54ffab3385cdc
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-22 19:43:46 +00:00
Bill Yi
5fb0418563 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5e411e93e7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4e13760430a92441037a847f37ae9d0cd1945942
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-22 19:43:26 +00:00
TreeHugger Robot
53c6bea932 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 3624b9a2ef -s ours am: c2a243d18e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3aaa24f8888a57a29c3b2e24fca71e78c2120bcf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-22 19:32:13 +00:00
Bill Yi
ffdb2b7614 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8460461f4d -s ours am: a677c158cb -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I658d9e5fa7772e7e7d24f395b5ac78aa12ae4601
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-22 19:31:40 +00:00
TreeHugger Robot
2501bf61be [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 7a6e5d0b0b -s ours am: 5cbf83555b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I432a12d19f8d5062ac5e31a2a1632edda108e4ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-22 19:31:19 +00:00
Bill Yi
ba0eb24634 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5e411e93e7 -s ours am: 4b425d20e9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7f76fb8d8a431541c4570c6b3fe2f6b6ab630151
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-22 19:31:01 +00:00
TreeHugger Robot
c2a243d18e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 3624b9a2ef -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I99d292630bcfbd5889c08c643fc86668af23c2c0
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-22 19:21:01 +00:00
Bill Yi
a677c158cb [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8460461f4d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I55f07f8d0ba4b3266573f76b7b96384248566626
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-22 19:20:34 +00:00
TreeHugger Robot
5cbf83555b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 7a6e5d0b0b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I79d31ce9d982d951446f2cb5fb3fdf99e493105c
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-22 19:20:11 +00:00
Bill Yi
4b425d20e9 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5e411e93e7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie5f16a932cfe36d923f82a9d582eef544e490a71
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-22 19:19:50 +00:00
TreeHugger Robot
3624b9a2ef Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-04-22 18:56:18 +00:00
TreeHugger Robot
7a6e5d0b0b Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-04-22 18:56:18 +00:00
Ricky Wai
8371aadccb Merge "Apply enhanced confirmation mode OEM config to Settings" into tm-dev am: fd7153ed39 am: 8f61acd8c2 am: cbeee15903 am: 6495fbd287 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17615240

Change-Id: Ie7b42f09206fab9aa2838502bac1278b46cff312
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-22 16:07:47 +00:00
Ricky Wai
e07603cb0e Merge "Apply enhanced confirmation mode OEM config to Settings" into tm-dev am: fd7153ed39 am: 8f61acd8c2 am: f3ed6ffb04 am: 6dcd03fa4c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17615240

Change-Id: Iddde321f1945f7ab2994739437aa69664f1d5f45
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-22 16:05:55 +00:00
Ricky Wai
ca190ec8ab Merge "Apply enhanced confirmation mode OEM config to Settings" into tm-dev am: fd7153ed39 am: e2edfe3235 am: 1a574d518b am: ca6662d2cd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17615240

Change-Id: I585d5a29b62a0e90bee5f4e616f3199906d8fcf0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-22 16:03:34 +00:00
Ricky Wai
6495fbd287 Merge "Apply enhanced confirmation mode OEM config to Settings" into tm-dev am: fd7153ed39 am: 8f61acd8c2 am: cbeee15903 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17615240

Change-Id: I3cfc1e988490ccbf18884c564e710231d438c617
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-22 16:01:08 +00:00
Ricky Wai
6dcd03fa4c Merge "Apply enhanced confirmation mode OEM config to Settings" into tm-dev am: fd7153ed39 am: 8f61acd8c2 am: f3ed6ffb04 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17615240

Change-Id: I9a81012b7635696bb26d7d972498dfac04547795
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-22 15:51:22 +00:00
Ricky Wai
f3ed6ffb04 Merge "Apply enhanced confirmation mode OEM config to Settings" into tm-dev am: fd7153ed39 am: 8f61acd8c2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17615240

Change-Id: I63d21313f123db06ce3c70e8e2bfb8429f3e531e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-22 15:45:10 +00:00
Ricky Wai
cbeee15903 Merge "Apply enhanced confirmation mode OEM config to Settings" into tm-dev am: fd7153ed39 am: 8f61acd8c2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17615240

Change-Id: Ic8af009c1dd59d59d45139379c2d66c4d8992baf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-22 15:44:59 +00:00