PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
110,137 Commits 1 Branch 0 Tags
e1f877e7a6ea22b7e29e84b18adb7927cd19f41c
Commit Graph

110137 Commits

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

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

Change-Id: If536c05600e8c63286f3ca35e5526b3dd0179e62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-23 06:10:54 +00:00
TreeHugger Robot
ad78b5a675 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-08-23 05:47:36 +00:00
TreeHugger Robot
c6e9ba1100 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-08-23 05:46:40 +00:00
TreeHugger Robot
fa53f6fafe Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-08-23 05:46:40 +00:00
Sayak Dutta
af11c676a9 Merge "Update back FooterButton visibility for navigation instead of back button" into tm-qpr-dev 2022-08-23 05:45:03 +00:00
changbetty
c918fa812b [LE Audio] Display the correct title on broadcast assistant device 
Bug: 241509690
Test: manual test
Change-Id: Iaf3a54108faaa82354ca30656dd4b7a384806408
 2022-08-23 03:01:42 +00:00
Diya Bera
0b34834c92 Merge "Removed redundant face unlock option." into tm-qpr-dev am: 02ca9bd23e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19645603

Change-Id: I1ad6fb329ecfdcffcecd8bb80b6d300b7bc9e0d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-22 22:17:53 +00:00
Diya Bera
02ca9bd23e Merge "Removed redundant face unlock option." into tm-qpr-dev 2022-08-22 21:57:44 +00:00
Joe Bolinger
d3b4bf7e03 Merge "Cache context for generateChallenge response." into tm-qpr-dev am: aeb042d965 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19662253

Change-Id: I668ff41be6cda1b42c8815eb5ad382ab4757e763
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-22 21:22:40 +00:00
Joe Bolinger
aeb042d965 Merge "Cache context for generateChallenge response." into tm-qpr-dev 2022-08-22 21:04:40 +00:00
Lucas Silva
059154ebb2 Update dream complication settings to use boolean setting. 
This simplifies the logic and prevents the boolean from toggling itself
when new complication types are added.

Bug: 241469874
Test: manually on device
Change-Id: I0b67f9f2ce75dcfc5e57a50f9b27e374ea9295b1
 2022-08-22 16:22:53 -04:00
Oli Lan
fa1157048c [automerger skipped] Merge "Revert "Prevent exfiltration of system files via user image settings."" into qt-dev am: b9bafa0d3d am: 05031cc574 am: 03b1a52977 am: e2815b7e11 -s ours am: 48046cf4ae -s ours am: 141dc63796 -s ours am: 40ec6382a0 -s ours am: bb562d7426 -s ours am: 80cdde7ce8 -s ours am: 5c46283548 -s ours 
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e is already in history. Merged-In was found from reverted change.

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

Change-Id: I26abf022c66735e7c44794911eaa47f0056c16f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-22 17:11:39 +00:00
Automerger Merge Worker
d30d0a603a Merge "[automerger skipped] Merge "Revert "Prevent exfiltration of system files via user image settings."" into qt-dev am: b9bafa0d3d am: 05031cc574 am: 03b1a52977 am: e2815b7e11 -s ours am: 48046cf4ae -s ours am: 141dc63796 -s ours am: 40ec6382a0 -s ours am: bb562d7426 -s ours am: 5d23958f2a -s ours" into tm-d1-dev-plus-aosp am: 19f1f4fb14 -s ours 
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e is already in history. Merged-In was found from reverted change.

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

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

Change-Id: I2dff5ada9e9d3dd76bee050cf1e946d9f52f7937
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-22 17:11:29 +00:00
Oli Lan
3df07a2543 [automerger skipped] Merge "Revert "Prevent exfiltration of system files via user image settings."" into qt-dev am: b9bafa0d3d am: 05031cc574 am: 03b1a52977 am: e2815b7e11 -s ours am: 48046cf4ae -s ours am: 141dc63796 -s ours am: 40ec6382a0 -s ours am: bb562d7426 -s ours am: 5d23958f2a -s ours am: d9da83fc20 -s ours 
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e is already in history. Merged-In was found from reverted change.

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

Change-Id: I72172d0e443962175b3c5c85a8896e29e62f13bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-22 17:11:27 +00:00
Oli Lan
93e71dbcc2 [automerger skipped] Merge "Revert "Prevent exfiltration of system files via user image settings."" into qt-dev am: b9bafa0d3d am: 05031cc574 am: 03b1a52977 am: e2815b7e11 -s ours am: 48046cf4ae -s ours am: 819430ed60 -s ours am: d3938dfc4c -s ours am: da927d5a6b -s ours am: 4d00a7174b -s ours 
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e is already in history. Merged-In was found from reverted change.

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

Change-Id: Ifee2a5fe38a06fc2d741c3d52e256fd706f0e0f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-22 17:11:07 +00:00
Oli Lan
322dc3b2ad [automerger skipped] Merge "Revert "Prevent exfiltration of system files via user image settings."" into qt-dev am: b9bafa0d3d am: 05031cc574 am: 03b1a52977 am: e2815b7e11 -s ours am: 48046cf4ae -s ours am: 819430ed60 -s ours am: d3938dfc4c -s ours am: 1dbf6b7d60 -s ours am: 505e7f9b1b -s ours 
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e is already in history. Merged-In was found from reverted change.

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

Change-Id: I861a96c2b141b7736d99dae39fd94ab3fd19a1cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-22 17:10:43 +00:00
Oli Lan
30ede7524b [automerger skipped] Merge "Revert "Prevent exfiltration of system files via user image settings."" into qt-dev am: b9bafa0d3d am: 05031cc574 am: 03b1a52977 am: e2815b7e11 -s ours am: 48046cf4ae -s ours am: 141dc63796 -s ours am: 40ec6382a0 -s ours am: bb562d7426 -s ours am: 80cdde7ce8 -s ours am: 20dacec65b -s ours 
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e is already in history. Merged-In was found from reverted change.

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

Change-Id: I57ef1768699e86fe21534120bd891ab73bfdcb23
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-22 17:09:57 +00:00
Oli Lan
d8879d9720 [automerger skipped] Merge "Revert "Prevent exfiltration of system files via user image settings."" into qt-dev am: b9bafa0d3d am: 05031cc574 am: 03b1a52977 am: e2815b7e11 -s ours am: 48046cf4ae -s ours am: 819430ed60 -s ours am: d3938dfc4c -s ours am: da927d5a6b -s ours am: 9190be8288 -s ours 
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e is already in history. Merged-In was found from reverted change.

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

Change-Id: Iecfa7f7492c11543783899f97d6d67713db28206
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-22 17:09:30 +00:00
Oli Lan
5c46283548 [automerger skipped] Merge "Revert "Prevent exfiltration of system files via user image settings."" into qt-dev am: b9bafa0d3d am: 05031cc574 am: 03b1a52977 am: e2815b7e11 -s ours am: 48046cf4ae -s ours am: 141dc63796 -s ours am: 40ec6382a0 -s ours am: bb562d7426 -s ours am: 80cdde7ce8 -s ours 
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e is already in history. Merged-In was found from reverted change.

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

Change-Id: Icb22ace85025a844aedfcc8f83a2f25aa88912af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-22 16:53:19 +00:00
Automerger Merge Worker
19f1f4fb14 Merge "[automerger skipped] Merge "Revert "Prevent exfiltration of system files via user image settings."" into qt-dev am: b9bafa0d3d am: 05031cc574 am: 03b1a52977 am: e2815b7e11 -s ours am: 48046cf4ae -s ours am: 141dc63796 -s ours am: 40ec6382a0 -s ours am: bb562d7426 -s ours am: 5d23958f2a -s ours" into tm-d1-dev-plus-aosp 2022-08-22 16:53:13 +00:00
Oli Lan
d9da83fc20 [automerger skipped] Merge "Revert "Prevent exfiltration of system files via user image settings."" into qt-dev am: b9bafa0d3d am: 05031cc574 am: 03b1a52977 am: e2815b7e11 -s ours am: 48046cf4ae -s ours am: 141dc63796 -s ours am: 40ec6382a0 -s ours am: bb562d7426 -s ours am: 5d23958f2a -s ours 
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e is already in history. Merged-In was found from reverted change.

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

Change-Id: Iecd9189cd8e37f5f784dce3b0b12395a513ba3f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-22 16:53:10 +00:00
Oli Lan
20dacec65b [automerger skipped] Merge "Revert "Prevent exfiltration of system files via user image settings."" into qt-dev am: b9bafa0d3d am: 05031cc574 am: 03b1a52977 am: e2815b7e11 -s ours am: 48046cf4ae -s ours am: 141dc63796 -s ours am: 40ec6382a0 -s ours am: bb562d7426 -s ours am: 80cdde7ce8 -s ours 
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e is already in history. Merged-In was found from reverted change.

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

Change-Id: Idac34b4a807a9cda12ad28cfa38a9a195cec12c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-22 16:53:09 +00:00
Oli Lan
4d00a7174b [automerger skipped] Merge "Revert "Prevent exfiltration of system files via user image settings."" into qt-dev am: b9bafa0d3d am: 05031cc574 am: 03b1a52977 am: e2815b7e11 -s ours am: 48046cf4ae -s ours am: 819430ed60 -s ours am: d3938dfc4c -s ours am: da927d5a6b -s ours 
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e is already in history. Merged-In was found from reverted change.

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

Change-Id: Ie4280bc8c8c693709f838656e00b66c7b7b390e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-22 16:53:04 +00:00
Oli Lan
505e7f9b1b [automerger skipped] Merge "Revert "Prevent exfiltration of system files via user image settings."" into qt-dev am: b9bafa0d3d am: 05031cc574 am: 03b1a52977 am: e2815b7e11 -s ours am: 48046cf4ae -s ours am: 819430ed60 -s ours am: d3938dfc4c -s ours am: 1dbf6b7d60 -s ours 
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e is already in history. Merged-In was found from reverted change.

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

Change-Id: Ife850b6223e0b6abbbab9a2dd145a31e3e69023c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-22 16:52:55 +00:00
Oli Lan
9190be8288 [automerger skipped] Merge "Revert "Prevent exfiltration of system files via user image settings."" into qt-dev am: b9bafa0d3d am: 05031cc574 am: 03b1a52977 am: e2815b7e11 -s ours am: 48046cf4ae -s ours am: 819430ed60 -s ours am: d3938dfc4c -s ours am: da927d5a6b -s ours 
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e is already in history. Merged-In was found from reverted change.

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

Change-Id: Ibfa43da3f5eb0d54d820615acaba4c10727aa59f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-22 16:52:51 +00:00
Oli Lan
80cdde7ce8 [automerger skipped] Merge "Revert "Prevent exfiltration of system files via user image settings."" into qt-dev am: b9bafa0d3d am: 05031cc574 am: 03b1a52977 am: e2815b7e11 -s ours am: 48046cf4ae -s ours am: 141dc63796 -s ours am: 40ec6382a0 -s ours am: bb562d7426 -s ours 
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e is already in history. Merged-In was found from reverted change.

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

Change-Id: Ic216159568b50b5e42fd19f762fe16b83f3de50a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-22 16:34:53 +00:00
Oli Lan
da927d5a6b [automerger skipped] Merge "Revert "Prevent exfiltration of system files via user image settings."" into qt-dev am: b9bafa0d3d am: 05031cc574 am: 03b1a52977 am: e2815b7e11 -s ours am: 48046cf4ae -s ours am: 819430ed60 -s ours am: d3938dfc4c -s ours 
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e is already in history. Merged-In was found from reverted change.

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

Change-Id: I81a86c60b0b2a352d6b326864a2e5a8eee53ca98
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-22 16:34:43 +00:00
Oli Lan
5d23958f2a [automerger skipped] Merge "Revert "Prevent exfiltration of system files via user image settings."" into qt-dev am: b9bafa0d3d am: 05031cc574 am: 03b1a52977 am: e2815b7e11 -s ours am: 48046cf4ae -s ours am: 141dc63796 -s ours am: 40ec6382a0 -s ours am: bb562d7426 -s ours 
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e is already in history. Merged-In was found from reverted change.

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

Change-Id: Ia834ccb8fe8912400f49b891dc12666acd59bb36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-22 16:33:31 +00:00
Oli Lan
bb562d7426 [automerger skipped] Merge "Revert "Prevent exfiltration of system files via user image settings."" into qt-dev am: b9bafa0d3d am: 05031cc574 am: 03b1a52977 am: e2815b7e11 -s ours am: 48046cf4ae -s ours am: 141dc63796 -s ours am: 40ec6382a0 -s ours 
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e is already in history. Merged-In was found from reverted change.

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

Change-Id: I07b0906b78784d42784afcc982973e916517b479
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-22 16:33:17 +00:00
Oli Lan
1dbf6b7d60 [automerger skipped] Merge "Revert "Prevent exfiltration of system files via user image settings."" into qt-dev am: b9bafa0d3d am: 05031cc574 am: 03b1a52977 am: e2815b7e11 -s ours am: 48046cf4ae -s ours am: 819430ed60 -s ours am: d3938dfc4c -s ours 
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e is already in history. Merged-In was found from reverted change.

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

Change-Id: Id581ae55b5a6ff4fc0d5c96b33ef58e8562215e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-22 16:33:17 +00:00
Oli Lan
40ec6382a0 [automerger skipped] Merge "Revert "Prevent exfiltration of system files via user image settings."" into qt-dev am: b9bafa0d3d am: 05031cc574 am: 03b1a52977 am: e2815b7e11 -s ours am: 48046cf4ae -s ours am: 141dc63796 -s ours 
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e is already in history. Merged-In was found from reverted change.

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

Change-Id: I4db81a26ef2ede09401e576c6fc5afeb57d48291
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-22 16:16:49 +00:00
Oli Lan
d3938dfc4c [automerger skipped] Merge "Revert "Prevent exfiltration of system files via user image settings."" into qt-dev am: b9bafa0d3d am: 05031cc574 am: 03b1a52977 am: e2815b7e11 -s ours am: 48046cf4ae -s ours am: 819430ed60 -s ours 
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e is already in history. Merged-In was found from reverted change.

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

Change-Id: Iecf56bfac38ff2dbc603a9f96f4f57add7de3a2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-22 16:16:47 +00:00
Oli Lan
819430ed60 [automerger skipped] Merge "Revert "Prevent exfiltration of system files via user image settings."" into qt-dev am: b9bafa0d3d am: 05031cc574 am: 03b1a52977 am: e2815b7e11 -s ours am: 48046cf4ae -s ours 
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e is already in history. Merged-In was found from reverted change.

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

Change-Id: Iec95e74515918dd7a9c7c0598f88031ee58682d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-22 15:58:26 +00:00
Oli Lan
141dc63796 [automerger skipped] Merge "Revert "Prevent exfiltration of system files via user image settings."" into qt-dev am: b9bafa0d3d am: 05031cc574 am: 03b1a52977 am: e2815b7e11 -s ours am: 48046cf4ae -s ours 
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e is already in history. Merged-In was found from reverted change.

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

Change-Id: Ic969ff87d67009c3737c74f950966f19772f3269
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-22 15:57:47 +00:00
Oli Lan
48046cf4ae [automerger skipped] Merge "Revert "Prevent exfiltration of system files via user image settings."" into qt-dev am: b9bafa0d3d am: 05031cc574 am: 03b1a52977 am: e2815b7e11 -s ours 
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e is already in history. Merged-In was found from reverted change.

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

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

Change-Id: I8dbc2b22a606856e839bcdbdc368c139df7d0b30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-22 15:39:22 +00:00
Oli Lan
e2815b7e11 Merge "Revert "Prevent exfiltration of system files via user image settings."" into qt-dev am: b9bafa0d3d am: 05031cc574 am: 03b1a52977 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19449016

Change-Id: I017c55ae2e7770bd52f1daca54e2aed7be05cb5e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-22 15:21:18 +00:00
Michael Mikhail
d06eaf6f43 Merge "Add media on lock screen setting" into tm-qpr-dev am: c77ab55735 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19457762

Change-Id: I9bfdf646fb6191e201ce014b610cf612c037443f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-22 15:04:04 +00:00
Oli Lan
03b1a52977 Merge "Revert "Prevent exfiltration of system files via user image settings."" into qt-dev am: b9bafa0d3d am: 05031cc574 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19449016

Change-Id: I5a78c2328f8c68fb5bf15799a69479a82b8e7af7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-22 15:03:51 +00:00
Oli Lan
05031cc574 Merge "Revert "Prevent exfiltration of system files via user image settings."" into qt-dev am: b9bafa0d3d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19449016

Change-Id: Icfcf27040f9402b736306cf19178feee9f2a774b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-22 14:46:20 +00:00
Michael Mikhail
c77ab55735 Merge "Add media on lock screen setting" into tm-qpr-dev 2022-08-22 14:46:06 +00:00
Oli Lan
b9bafa0d3d Merge "Revert "Prevent exfiltration of system files via user image settings."" into qt-dev 2022-08-22 14:27:57 +00:00
Julia Reynolds
e8409ecf10 Merge "Revert^2 "Improve App notification loading"" into tm-qpr-dev am: 635b3f065e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19583473

Change-Id: I85fd316de253f7d3879962e74aece04db0f3f0f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-22 14:18:35 +00:00
Julia Reynolds
635b3f065e Merge "Revert^2 "Improve App notification loading"" into tm-qpr-dev 2022-08-22 13:56:41 +00:00
wesleycwwang
27cbd5bccd Update extra defend layout string 
Bug: 235246949
Test: make RunSettingsRoboTests
Change-Id: I3a3afe2e47d90882bdc4e4180ea5c6b079efd828
 2022-08-22 18:51:45 +08:00
Bill Yi
9c441ad4fe Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ia5f187a561427f4822814e50b6a490df46dc432d
 2022-08-22 02:33:14 -07:00
Bill Yi
23c81a0a7f Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: If98f2b4da32441a1a198e663094cf2a9d0718a2c
 2022-08-22 02:29:14 -07:00
Bill Yi
789b774cb2 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I39edf1cef0326d044fa50b652adbddb6a7a2a437
 2022-08-22 02:21:31 -07:00
Bill Yi
31ea59660b Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I091646803b9c75b2bacb36c226d4f5a1a4c90535
 2022-08-22 02:19:51 -07:00
Bill Yi
32ddcf7c21 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I39be64756b5d020673c662eb51e372997587ccc7
 2022-08-22 02:18:18 -07:00
Sayak Dutta
05b7cb0225 Merge "Revamp SD card UX" into tm-qpr-dev am: e66ae3f9db 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19673917

Change-Id: I589676bfca185db1bbefbe804e9512b72142676d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-22 06:33:54 +00:00