PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
92,260 Commits 1 Branch 0 Tags
03f23b726baaf9d77dd121f502975ffeb3ac7b51
Commit Graph

92260 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
03f23b726b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 026fba52e8 -s ours am: a0cee9f717 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id8b3b3c626031a5b34326cb32c25bd2a56a715c6
 2021-07-16 15:05:37 +00:00
TreeHugger Robot
9b9bcd450a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 1a87f6494f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I63ce58117a6fe11a7c5f4839687ea247d6be8c7f
 2021-07-16 15:05:28 +00:00
TreeHugger Robot
d1b1083a35 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: bc60dff6bf -s ours am: 0fe7a8176a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic9197dfdde00f9be65d12a797a211dd1708a9cb9
 2021-07-16 15:00:13 +00:00
TreeHugger Robot
a0cee9f717 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 026fba52e8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I756d81a8f8f7302cbde9d9e207fd27c9476b4b79
 2021-07-16 14:59:41 +00:00
TreeHugger Robot
1a87f6494f Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2021-07-16 14:52:22 +00:00
TreeHugger Robot
1f0d7193b0 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-07-16 14:52:12 +00:00
TreeHugger Robot
026fba52e8 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-07-16 14:46:30 +00:00
TreeHugger Robot
0fe7a8176a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: bc60dff6bf -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I599e1fd675a3de86cb41a6a42c734af35d8e947c
 2021-07-16 14:44:59 +00:00
TreeHugger Robot
bc60dff6bf Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2021-07-16 14:31:28 +00:00
Stanley Wang
e039077efd Merge "Fix the problem that the SIM status and IMEI after the "Build number"." 2021-07-16 12:59:17 +00:00
Stanley Wang
74cde9c569 Merge "Update the illustrations of System navigation page." into sc-dev am: c916876cc7 am: 69a9d7aa11 am: 15738313b2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15297631

Change-Id: I804e97c554f15cd48164b467630b0aba15d26fb5
 2021-07-16 12:30:09 +00:00
Stanley Wang
30a7eea2fd Merge "Update the illustrations of System navigation page." into sc-dev am: c916876cc7 am: 21a148d9fe am: 89f82c126b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15297631

Change-Id: Ib34841f6aa2e7608ce069eee9db24c6129d68f03
 2021-07-16 12:29:53 +00:00
Stanley Wang
15738313b2 Merge "Update the illustrations of System navigation page." into sc-dev am: c916876cc7 am: 69a9d7aa11 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15297631

Change-Id: I1122c56ed939fe9eeaaf213d52b08f4cd5fd1be7
 2021-07-16 12:15:34 +00:00
Stanley Wang
89f82c126b Merge "Update the illustrations of System navigation page." into sc-dev am: c916876cc7 am: 21a148d9fe 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15297631

Change-Id: Id188157c1f68ff6227458ff6771910ecd40d4cae
 2021-07-16 12:15:12 +00:00
Stanley Wang
12fd312660 Merge "Update the illustrations of System navigation page." into sc-dev am: c916876cc7 am: c7459e9ec1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15297631

Change-Id: Ia7089bb61f85cbddd08f21da37f1f37cacb8904e
 2021-07-16 12:14:47 +00:00
Stanley Wang
21a148d9fe Merge "Update the illustrations of System navigation page." into sc-dev am: c916876cc7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15297631

Change-Id: Ifdc3f6d19e74290c2ff6ccb037590861627d6f5e
 2021-07-16 11:55:24 +00:00
Stanley Wang
c7459e9ec1 Merge "Update the illustrations of System navigation page." into sc-dev am: c916876cc7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15297631

Change-Id: Idb8abbe0559f777a01923ada2b79f55fe7213c2b
 2021-07-16 11:54:38 +00:00
Stanley Wang
69a9d7aa11 Merge "Update the illustrations of System navigation page." into sc-dev am: c916876cc7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15297631

Change-Id: I287a6788e9ff460ab58a1c61e019be0cf37480a6
 2021-07-16 11:54:13 +00:00
Stanley Wang
9c63c415ea Fix the problem that the SIM status and IMEI after the "Build number". 
- Adding the SIM status and IMEI items of SIM2 to the PreferenceScreen
  can not put these items in the correct categories. We have to put
  these items directly into the correct categories.

Bug: 193384705
Test: robotest and see the UI
Change-Id: I2de7ee72fc1315eeef01288b386f8756ca366e33
 2021-07-16 19:44:25 +08:00
Stanley Wang
c916876cc7 Merge "Update the illustrations of System navigation page." into sc-dev 2021-07-16 11:37:51 +00:00
Bill Yi
165a3c9880 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I162d0b3f065d8dd902a251aa847c4367b1dc1767
 2021-07-16 09:19:39 +00:00
Bill Yi
8165043546 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: If9f25bb8fe9349790b04162a6d09c5ef5183e2e4
 2021-07-16 09:15:26 +00:00
Bill Yi
f9cccd900f Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I0a4dec292485f58d7ee2b1a96d862486819c2b72
 2021-07-16 09:11:08 +00:00
Bill Yi
783ad2b74e Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I19360b0a8f018f68de38dc04be164ab789c38e29
 2021-07-16 08:50:32 +00:00
Menghan Li
5cdaaed04c Merge "Provides TC ID for shortcut title in AccessibilityShortcutPreferenceFragment" into sc-v2-dev am: 77b8431156 am: 7c011ae5c0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15297637

Change-Id: Ib1bbfc97929be4de656a70e1afa0e353c5ac6c88
 2021-07-16 06:20:43 +00:00
Menghan Li
7c011ae5c0 Merge "Provides TC ID for shortcut title in AccessibilityShortcutPreferenceFragment" into sc-v2-dev am: 77b8431156 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15297637

Change-Id: I81c5f633fb3c1f94056136777fab23b0ab97d6eb
 2021-07-16 06:08:25 +00:00
Menghan Li
77b8431156 Merge "Provides TC ID for shortcut title in AccessibilityShortcutPreferenceFragment" into sc-v2-dev 2021-07-16 05:54:31 +00:00
Beth Thibodeau
1eddd35553 Merge "Remove lockdown toggle" into sc-dev am: 20e57d33ff am: fb3af25ce1 am: 8e65092ee9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15290234

Change-Id: Ie74e3f63f2fdc1a8bb4ea9913df5d2d2381a333f
 2021-07-16 02:38:06 +00:00
TreeHugger Robot
5334c472ac [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: bcccb92239 -s ours am: cdfe31e4cf -s ours am: 91e57d79fc -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9e79a8eb09f21664a019cac811989395be76a9e3
 2021-07-16 02:36:47 +00:00
Curtis Belmonte
4948cd3466 Merge "Use correct choose lock password/pattern subtitles" into sc-dev am: 4aa06d7639 am: 0378dfff5a am: 88b1052394 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15302650

Change-Id: I9b02755395575cca8b383ee55d245dbb373fe641
 2021-07-16 02:36:42 +00:00
TreeHugger Robot
5bdccf5f6e Merge "Disable the mic/cam toggles when admin disallows" into sc-dev am: caa670fad4 am: e36357fd71 am: 8ce3b2f8a1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15089520

Change-Id: I49f87a8101df08e6f231fad1e1b8d0db49b0d39d
 2021-07-16 02:36:10 +00:00
Beth Thibodeau
8e65092ee9 Merge "Remove lockdown toggle" into sc-dev am: 20e57d33ff am: fb3af25ce1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15290234

Change-Id: I7978ec3a1686df7594431b9f413bda6b53f3916e
 2021-07-16 02:15:18 +00:00
TreeHugger Robot
91e57d79fc [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: bcccb92239 -s ours am: cdfe31e4cf -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie64f39a579a8627236b2d9214ae67aed3309ef15
 2021-07-16 02:13:40 +00:00
Curtis Belmonte
88b1052394 Merge "Use correct choose lock password/pattern subtitles" into sc-dev am: 4aa06d7639 am: 0378dfff5a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15302650

Change-Id: Ieb4335ffb95f59aab3ade0eea6860448e2e23382
 2021-07-16 02:13:37 +00:00
TreeHugger Robot
8ce3b2f8a1 Merge "Disable the mic/cam toggles when admin disallows" into sc-dev am: caa670fad4 am: e36357fd71 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15089520

Change-Id: I532b3f44ad90e21b8f4fa7a302ee78bcba0b9688
 2021-07-16 02:13:25 +00:00
Beth Thibodeau
fb3af25ce1 Merge "Remove lockdown toggle" into sc-dev am: 20e57d33ff 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15290234

Change-Id: I004edf20fb3ecbc7f169a0105516f78cc542f841
 2021-07-16 02:01:22 +00:00
TreeHugger Robot
cdfe31e4cf [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: bcccb92239 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3512f7dcfdcaa905af33add6a6d16b752b2b3abd
 2021-07-16 01:58:22 +00:00
Curtis Belmonte
0378dfff5a Merge "Use correct choose lock password/pattern subtitles" into sc-dev am: 4aa06d7639 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15302650

Change-Id: I86852d25a8fb258ba8ffbbe594f2ce04780e40cb
 2021-07-16 01:58:16 +00:00
TreeHugger Robot
e36357fd71 Merge "Disable the mic/cam toggles when admin disallows" into sc-dev am: caa670fad4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15089520

Change-Id: I044f2cb21d3816e0e46cfde468421ddf56c6bebb
 2021-07-16 01:58:08 +00:00
Beth Thibodeau
465b1caed3 Merge "Remove lockdown toggle" into sc-dev am: 20e57d33ff am: 97b8a6409d am: f77c705e4b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15290234

Change-Id: I0cdb23d4d27eaa727d2455dead7474f13116e685
 2021-07-15 23:32:25 +00:00
Beth Thibodeau
f77c705e4b Merge "Remove lockdown toggle" into sc-dev am: 20e57d33ff am: 97b8a6409d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15290234

Change-Id: I0770404823036e30f4e38cf8ff298b90d78e34a6
 2021-07-15 23:10:52 +00:00
Beth Thibodeau
3ebe4c9bc2 Merge "Remove lockdown toggle" into sc-dev am: 20e57d33ff am: b65c1ace04 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15290234

Change-Id: I06c80d5f42986bdb6b2dd7818570e4f8eb4e1066
 2021-07-15 23:10:12 +00:00
Beth Thibodeau
b65c1ace04 Merge "Remove lockdown toggle" into sc-dev am: 20e57d33ff 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15290234

Change-Id: I4212b8bd1f7f72bf22c17af38d16b1a5716b21e2
 2021-07-15 22:54:21 +00:00
Beth Thibodeau
97b8a6409d Merge "Remove lockdown toggle" into sc-dev am: 20e57d33ff 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15290234

Change-Id: I49989ad03fa694d188865a9d13a0cf9b0c58134a
 2021-07-15 22:54:20 +00:00
Beth Thibodeau
20e57d33ff Merge "Remove lockdown toggle" into sc-dev 2021-07-15 22:44:24 +00:00
TreeHugger Robot
d9ce23072d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: bcccb92239 -s ours am: 246951b84e -s ours am: 40e622d440 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idde52955cece7668541baefc38e4421707afac9c
 2021-07-15 22:20:09 +00:00
Automerger Merge Worker
eb09a47f48 Merge "Merge "Use correct choose lock password/pattern subtitles" into sc-dev am: 4aa06d7639 am: ec4d101cac am: ce924dc3fc" 2021-07-15 22:20:06 +00:00
TreeHugger Robot
cf0b4db06c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: bcccb92239 -s ours am: 4d37f8d642 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I290e29054132d2037074e45f62f59e5aeba9a441
 2021-07-15 22:20:02 +00:00
Curtis Belmonte
bba3dce4cd Merge "Use correct choose lock password/pattern subtitles" into sc-dev am: 4aa06d7639 am: ec4d101cac am: ce924dc3fc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15302650

Change-Id: I285fe94b060dd20e64e368e5d4dca0aa00bdc35d
 2021-07-15 22:20:02 +00:00
TreeHugger Robot
40dd1aa25e Merge "Disable the mic/cam toggles when admin disallows" into sc-dev am: caa670fad4 am: c100eb4e32 am: 69be0fa6bf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15089520

Change-Id: Iccf950bc6175f441430087a33e0dc2f8e785fd7b
 2021-07-15 22:11:20 +00:00