PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
122,333 Commits 1 Branch 0 Tags
788a1ee2f682a31d77d8f1df5b6fb3d19da9a5af
Commit Graph

122333 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Treehugger Robot
788a1ee2f6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 11ba47eebb -s ours am: c537439f3a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I180520a7cbb04c5978af4a22203b969f1d81a18f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 08:56:50 +00:00
Bill Yi
df0a1a06a3 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dc96a91fff -s ours am: c7e5bc37f1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia765c4911206c444c00562b7d7220317780adec6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 08:56:41 +00:00
Treehugger Robot
c537439f3a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 11ba47eebb -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I19e3f9ad92a238698ffce7cad4d08c3d90199df6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 05:04:04 +00:00
Bill Yi
c7e5bc37f1 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dc96a91fff -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id79f748013e887d8a73f16f386675844449512d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 05:03:44 +00:00
Tom Hsu
f23adec53e Merge "[Settings] Fix NPE from updating subinfo changed." into udc-dev am: 99e03458fa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22954342

Change-Id: Iff62b8e3b4e60e501a34cbd4bb12914490b0857c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 04:43:06 +00:00
Treehugger Robot
11ba47eebb Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2023-05-04 04:36:13 +00:00
Tom Hsu
99e03458fa Merge "[Settings] Fix NPE from updating subinfo changed." into udc-dev 2023-05-04 04:21:51 +00:00
TreeHugger Robot
2c750a41f4 Merge "Add Tapjacking Protection for all screens extends StorageWizardBase in Settings." into udc-dev am: 7bf4c8f9f5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23001477

Change-Id: I831234e174a614c1b6ce20f9ae6a70cfe9b92b01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 04:21:34 +00:00
TreeHugger Robot
7bf4c8f9f5 Merge "Add Tapjacking Protection for all screens extends StorageWizardBase in Settings." into udc-dev 2023-05-04 04:09:13 +00:00
Treehugger Robot
7e99eaa9bc Merge "Fix testNonIndexableKeys_existInXmlLayout" into udc-dev am: e71643efac 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22981573

Change-Id: I04ced0608e4e782af915767ff477cca01b369d93
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 04:00:30 +00:00
Treehugger Robot
e71643efac Merge "Fix testNonIndexableKeys_existInXmlLayout" into udc-dev 2023-05-04 03:15:40 +00:00
Lin Yuan
19eb02122b [automerge] Fix: Bluetooth and Wifi scanning location MainSwitch page policy transparency. 2p: 7591fff234 am: 062a9ca549 am: f86d507407 am: d8321f5df7 am: ae2dd3d513 am: 9e84690fb7 am: dac4ef66d9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22861203

Change-Id: Ib80f670072c0374a62799565be55c60717a52f55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 02:27:50 +00:00
Lin Yuan
ba360fb0a8 [automerge] Fix: Bluetooth and Wifi scanning location MainSwitch page policy transparency. 2p: 7591fff234 am: 062a9ca549 am: f86d507407 am: d8321f5df7 am: eb3be1fa5b am: d2ddc84c14 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22861203

Change-Id: Id91a0044b2863e3cc0d454ac520bddd37f93efba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 02:27:32 +00:00
Lin Yuan
dac4ef66d9 [automerge] Fix: Bluetooth and Wifi scanning location MainSwitch page policy transparency. 2p: 7591fff234 am: 062a9ca549 am: f86d507407 am: d8321f5df7 am: ae2dd3d513 am: 9e84690fb7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22861203

Change-Id: Ia36438aa214a976c0b98eeecec0db054298a8bb3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 02:25:07 +00:00
Lin Yuan
9e84690fb7 [automerge] Fix: Bluetooth and Wifi scanning location MainSwitch page policy transparency. 2p: 7591fff234 am: 062a9ca549 am: f86d507407 am: d8321f5df7 am: ae2dd3d513 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22861203

Change-Id: I0521342515969ccb2d46b9e9159d29b998713cd7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 01:41:25 +00:00
Lin Yuan
d2ddc84c14 [automerge] Fix: Bluetooth and Wifi scanning location MainSwitch page policy transparency. 2p: 7591fff234 am: 062a9ca549 am: f86d507407 am: d8321f5df7 am: eb3be1fa5b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22861203

Change-Id: I69571348ce67c5a5572a5fb5c15d31c88fb26a4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 01:37:49 +00:00
Lin Yuan
ae2dd3d513 [automerge] Fix: Bluetooth and Wifi scanning location MainSwitch page policy transparency. 2p: 7591fff234 am: 062a9ca549 am: f86d507407 am: d8321f5df7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22861203

Change-Id: I3a9a9ef33b0a7fd985861a85d63d5078d3fe5aa9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 00:53:38 +00:00
Lin Yuan
eb3be1fa5b [automerge] Fix: Bluetooth and Wifi scanning location MainSwitch page policy transparency. 2p: 7591fff234 am: 062a9ca549 am: f86d507407 am: d8321f5df7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22861203

Change-Id: Iff01dd3f1528b2ded54b281c1f810293093f2ff4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 00:52:56 +00:00
Treehugger Robot
e46c4e5a87 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 7b5293a704 -s ours am: a1b3c500fd -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie8baab558556cc4ed06ffcb8b79caa3779990aad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 00:28:23 +00:00
Lin Yuan
d8321f5df7 [automerge] Fix: Bluetooth and Wifi scanning location MainSwitch page policy transparency. 2p: 7591fff234 am: 062a9ca549 am: f86d507407 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22861203

Change-Id: I23d09d7f0c376493ba30ac38577d196b69d46335
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 00:02:52 +00:00
Treehugger Robot
a1b3c500fd [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 7b5293a704 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I17e41ec494a5893cb8eb1f3b8dfbeb46e28d7310
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-03 23:46:47 +00:00
Lin Yuan
f86d507407 [automerge] Fix: Bluetooth and Wifi scanning location MainSwitch page policy transparency. 2p: 7591fff234 am: 062a9ca549 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22861203

Change-Id: I7884ced3a0a1d29508127fbc263197c20f6ff0d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-03 23:23:36 +00:00
Bill Yi
c4204c0ef5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e23f6ea87c -s ours am: 8b08d034f0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia545578de8ee5ec1147a7c47d0f07c51eedc0fac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-03 22:12:29 +00:00
Treehugger Robot
4195ac4a28 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 1c79500a0d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1dbc044b56e00fa91ae7bc49b59935d965d3ec08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-03 22:11:59 +00:00
Bill Yi
56cb3df78d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 86c5b0816b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I70725f091a2da02f8303c8fa1e3af0da89156959
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-03 22:11:52 +00:00
Treehugger Robot
79c090dd85 Merge changes from topic "tc_change_23050307_28" into udc-dev am: 954afa9586 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22964411

Change-Id: I1af2ab2bf8673b338b10542099519c98ac6cc777
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-03 21:50:06 +00:00
Bill Yi
2658b9338f [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 437972564f am: aa9489179b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie2e88d5a7767dcfbb631795bab3bd667cf6df57b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-03 21:49:59 +00:00
Treehugger Robot
d25d75be91 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: f4ca8c6033 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Icb1b76e223533802998bd976b5e45f0f67801d6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-03 21:49:24 +00:00
Bill Yi
afc79889f6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5c7368b683 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1c66afa2a7b26c9030123e6787947c569ea91bad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-03 21:49:21 +00:00
Bill Yi
8b08d034f0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e23f6ea87c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Icd9523da2593ab59557125aa5c996230e2589030
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-03 21:46:45 +00:00
Treehugger Robot
1c79500a0d Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev 2023-05-03 21:31:19 +00:00
Treehugger Robot
7b5293a704 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2023-05-03 21:31:16 +00:00
Treehugger Robot
954afa9586 Merge changes from topic "tc_change_23050307_28" into udc-dev 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 437972564f
  Import translations. DO NOT MERGE ANYWHERE
 2023-05-03 21:31:16 +00:00
TreeHugger Robot
6759c1f3bc Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev 2023-05-03 21:29:38 +00:00
TreeHugger Robot
5b29767921 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev 2023-05-03 21:29:38 +00:00
TreeHugger Robot
b4d72181f8 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev 2023-05-03 21:29:38 +00:00
Treehugger Robot
f4ca8c6033 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev 2023-05-03 21:27:41 +00:00
David Liu
6ff8643e82 Add Tapjacking Protection for all screens extends StorageWizardBase in Settings. 
Add/remove the SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS flag into/from all screens extends StorageWizardBase with lifecycle.

Bug: 255305175

Test: manual test with make RunSettingsRoboTests
Change-Id: I7ed9e2bf9bbebf6cd6b7e76ad47a6d4155eb2eb2
 2023-05-03 21:11:35 +00:00
Treehugger Robot
f9e3b286f3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 30fe673ac9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iebcec0e41e7766276b907b4ece881e319c049c45
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-03 21:06:49 +00:00
Bill Yi
77e56766c3 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6096cceb3c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I583569809810380cb5a34088d216e84f001b41ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-03 21:06:37 +00:00
Treehugger Robot
30fe673ac9 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev 2023-05-03 20:55:59 +00:00
TreeHugger Robot
61f1af73e6 Merge changes from topic "tc_change_23050307_27" into udc-dev am: 0848931c62 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22964410

Change-Id: Ic8d79dfaa411f3293f1a2905d834f731a69711ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-03 20:51:39 +00:00
Bill Yi
44d28ab6f5 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: a68ce93fbe am: 7951afa544 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3f702284b57f224f55eb10f49cbabdd030f92aaf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-03 20:51:24 +00:00
TreeHugger Robot
0848931c62 Merge changes from topic "tc_change_23050307_27" into udc-dev 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: a68ce93fbe
  Import translations. DO NOT MERGE ANYWHERE
 2023-05-03 20:46:29 +00:00
Treehugger Robot
c3d6820ffd Merge "Update auto_rotate_summary string for different product" into udc-dev am: 7244f3a0ae 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22985400

Change-Id: Id1f507633ad33b5b0719dba4bc507e73ce7832e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-03 19:36:46 +00:00
Treehugger Robot
7244f3a0ae Merge "Update auto_rotate_summary string for different product" into udc-dev 2023-05-03 19:09:07 +00:00
David Gutierrez
6a8a9492d7 Merge "Revert "Disable Settings large-screen optimization"" into udc-dev am: 570943637c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22993391

Change-Id: I71a855eb9c082e8c32d6a56c07722c08984b019e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-03 16:37:22 +00:00
Becca Hughes
454cfbf2cc Merge "Align settings with new mocks" into udc-dev am: 21733fa106 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22912923

Change-Id: I2a423b8a0a96ebcc51f04f0603e73e4f2fd24bc2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-03 16:36:56 +00:00
David Gutierrez
570943637c Merge "Revert "Disable Settings large-screen optimization"" into udc-dev 2023-05-03 16:17:31 +00:00
Becca Hughes
21733fa106 Merge "Align settings with new mocks" into udc-dev 2023-05-03 16:14:12 +00:00