Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
85,937 Commits 1 Branch 0 Tags
a04623c46d0d0bbfa97b426e57f4e2e37ee8f2da
Commit Graph

23897 Commits

Author SHA1 Message Date
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
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
c916876cc7 Merge "Update the illustrations of System navigation page." into sc-dev 2021-07-16 11:37:51 +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
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
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
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
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
69be0fa6bf Merge "Disable the mic/cam toggles when admin disallows" into sc-dev am: caa670fad4 am: c100eb4e32 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15089520

Change-Id: Ifcfdbddceb1e6ed12291f87f2845d46988c7b525
 2021-07-15 22:05:53 +00:00
TreeHugger Robot
bcccb92239 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-07-15 21:41:51 +00:00
TreeHugger Robot
c100eb4e32 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: I4d26a22136ef98071de7f36f1d836e902c2aae85
 2021-07-15 20:05:56 +00:00
Bill Yi
0b52dfd5d1 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: If905d49fd63da653490a6771de1223697a2c85dc
 2021-07-15 19:56:05 +00:00
TreeHugger Robot
caa670fad4 Merge "Disable the mic/cam toggles when admin disallows" into sc-dev 2021-07-15 19:52:50 +00:00
Stanley Wang
602f59ba42 Update the illustrations of System navigation page. 
- Upate 3 types of navigation illustrations.

Fix: 189426848
Test: robotest and see the UI
Change-Id: Ie56057713d528398a2e3ddad5580c6de2f60bd3f
 2021-07-15 19:33:24 +08:00
menghanli
6c7b52b703 Provides TC ID for shortcut title in AccessibilityShortcutPreferenceFragment 
Goal: Improve readability which is a bit difficult because of string concatenation for accurate translation.
Root cause: In some locales, framework features name would be a word rather than a product name. Hence it need to be in the different position in a sentence.
Solution: Use whole sentence to translate instead of concatenating the string could solve this issue.

Bug: 185478543
Test: Manually testing
Change-Id: Iced1fe7db81e4e78ddfed30ab947d449b5f9c735
 2021-07-15 18:10:50 +08:00
Beth Thibodeau
647b3ef070 Remove lockdown toggle 
This button will be on by default now, so remove the switch

Bug: 185618694
Test: build
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.display
Change-Id: Iecbeb590a5b750ec2fcf9c31fece5814241200b1
 2021-07-14 19:39:30 -04:00
Bill Yi
4dc320540d Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ia76dcfef58e0d6c025e4b93e9fda413fc26216c3
 2021-07-14 22:04:54 +00:00
Menghan Li
e8cba63525 Merge "Provides TC ID for accessibility framework feature for "about" and "learn more" part" into sc-v2-dev am: 7f907d35cd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15175506

Change-Id: Ie28863b4fe41b5d4c4e83c541be546aab13b3f68
 2021-07-14 11:59:46 +00:00
Menghan Li
7f907d35cd Merge "Provides TC ID for accessibility framework feature for "about" and "learn more" part" into sc-v2-dev 2021-07-14 11:48:24 +00:00
menghanli
bae720ffc3 Provides TC ID for accessibility framework feature for "about" and "learn more" part 
Goal: Improve readability which is a bit difficult because of string concatenation for accurate translation.
Root cause: In some locales, framework features name would be a word rather than a product name. Hence it need to be in the different position in a sentence.
Solution: Use whole sentence to translate instead of concatenating the string could solve this issue.

Bug: 185478543
Test: make RunSettingsRoboTests ROBOTEST_FILTER=AccessibilityFooterPreferenceControllerTest
Change-Id: Id198805329be9c773df87f38a074ae956e4d0cdb
 2021-07-14 15:15:48 +08:00
Bill Yi
bc7e4bcd46 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I2e1daee1d28291d142e05b2f4e4d670de47ff0b9
 2021-07-14 02:44:20 +00:00
Curtis Belmonte
f0aadce0d6 Merge "Add "eyes open" setting message to face enroll intro" into sc-dev am: e796b8bf6e am: b7c2a07117 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15147510

Change-Id: I609f5f3264ddb862ab0d19fb7ba36494d0f87f94
 2021-07-13 17:01:01 +00:00
Curtis Belmonte
9683efd43f Merge "Add "eyes open" setting message to face enroll intro" into sc-dev am: e796b8bf6e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15147510

Change-Id: I2991e2efc7f0ecc56c8b34ed6ab8bbb42e8d22a3
 2021-07-13 16:46:51 +00:00
Curtis Belmonte
b7c2a07117 Merge "Add "eyes open" setting message to face enroll intro" into sc-dev am: e796b8bf6e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15147510

Change-Id: I68d7b957f9910d2328dbec028ee292a17723ed7a
 2021-07-13 16:45:24 +00:00
Curtis Belmonte
e796b8bf6e Merge "Add "eyes open" setting message to face enroll intro" into sc-dev 2021-07-13 16:36:53 +00:00
Bill Yi
4e7a021a3f Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I1907d2b0f31200d7a55ab9b8e4f305e031428f93
 2021-07-13 06:56:33 +00:00
PETER LIANG
1910983174 Merge "Update the preview image of caption preference fragment." into sc-v2-dev am: 00c2fb2a4a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15221070

Change-Id: Id02ecb6d4533e0864c71c22a2fcf9016ce349c92
 2021-07-13 00:34:25 +00:00
PETER LIANG
00c2fb2a4a Merge "Update the preview image of caption preference fragment." into sc-v2-dev 2021-07-13 00:23:30 +00:00
Curtis Belmonte
68c12f2e04 Add "eyes open" setting message to face enroll intro 
Adds an additional message about the "Require eyes to be open" setting
for Face Unlock to the intro/consent screen of enrollment, gated by a
config flag.

Test: Manual

Bug: 192272785
Change-Id: Idcd2395a290b74f4578898fdfebd05b81cd74075
 2021-07-12 17:05:45 -07:00
Treehugger Robot
bc08889feb Merge "Revise strings for the NFC developer option" am: 8dd6ce02d8 am: 476c3dc62a am: b664dbe93f 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1762584

Change-Id: Ic56026cffaa57fa4cc8a66c65f34ac833e30a624
 2021-07-12 11:02:20 +00:00
Treehugger Robot
b664dbe93f Merge "Revise strings for the NFC developer option" am: 8dd6ce02d8 am: 476c3dc62a 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1762584

Change-Id: I53b5765f78098e466379454d228dda47cc007aa9
 2021-07-12 11:01:58 +00:00
Treehugger Robot
476c3dc62a Merge "Revise strings for the NFC developer option" am: 8dd6ce02d8 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1762584

Change-Id: I48ab5a9d8bd431e6e9854d9f3c36373f95118cf6
 2021-07-12 10:49:01 +00:00
Jack Yu
cfb0bbc0d0 Revise strings for the NFC developer option 
Bug: 187083201
Test: build pass
Change-Id: Id90627235dbdb714d13a78b61826bafeb9f80360
 2021-07-12 16:39:22 +08:00
Bill Yi
e3343dcb23 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I18a4de23bbd4151ba9b9bba1b74867667a108f8f
 2021-07-12 01:26:09 +00:00
Bill Yi
f360fb7f80 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I95d60c69d8b002a5714a5ec18f0cf3026e10ab60
 2021-07-12 01:22:27 +00:00
Bill Yi
80494f3b36 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I9743e34ecaaec254b43ced73ad24c93a917dbe6d
 2021-07-10 23:13:40 +00:00
TreeHugger Robot
0543cd0231 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-07-10 02:01:32 +00:00
Bill Yi
becb6d091c Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Iac93f20d863db9b7ec8335150421940c3724dc5f
 2021-07-10 00:14:00 +00:00
Meng Wang
f91d19ae7d Merge "Refine WFC location notice text." into sc-dev am: d43986fa96 am: 3e5b063766 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15224306

Change-Id: I6f9759680f39f8b5661c9867339e613c2159d296
 2021-07-09 23:00:37 +00:00
Meng Wang
3e5b063766 Merge "Refine WFC location notice text." into sc-dev am: d43986fa96 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15224306

Change-Id: I5c13502898e86af3a39854b77e8b2a856b0139e9
 2021-07-09 22:45:02 +00:00
Meng Wang
eef4b8fd1a Merge "Refine WFC location notice text." into sc-dev am: d43986fa96 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15224306

Change-Id: If9feedd87413eff719bb695791e52bda4f5a7263
 2021-07-09 22:44:07 +00:00
Meng Wang
d43986fa96 Merge "Refine WFC location notice text." into sc-dev 2021-07-09 22:30:44 +00:00
Becca Milman
b25c6234bc Merge "Removed nested GlifRecyclerLayout on choose_sim_activity.xml" into sc-dev am: 06a92e109f am: 32f84cc057 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15237437

Change-Id: I3f94ad09a9983fbe8bb41330703d3f79f022fbe2
 2021-07-09 17:21:19 +00:00
Becca Milman
6fdf6b293f Merge "Removed nested GlifRecyclerLayout on choose_sim_activity.xml" into sc-dev am: 06a92e109f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15237437

Change-Id: I702c25bf724f34ba6d114cf07fbee3cdbbb6f495
 2021-07-09 17:08:40 +00:00
Becca Milman
32f84cc057 Merge "Removed nested GlifRecyclerLayout on choose_sim_activity.xml" into sc-dev am: 06a92e109f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15237437

Change-Id: I89966f6d42faa17df97d5d9311ef9a95311c4ba3
 2021-07-09 17:07:44 +00:00
Becca Milman
06a92e109f Merge "Removed nested GlifRecyclerLayout on choose_sim_activity.xml" into sc-dev 2021-07-09 16:55:31 +00:00
Meng Wang
17ef8294c3 Refine WFC location notice text. 
Bug: 190642193
Test: manual - see updated screenshot in the bug.
Change-Id: Ia417c8486dc324a65e41bfb667eaaf3bc9894033
 2021-07-09 09:39:03 -07:00
TreeHugger Robot
78b9774e94 Merge "Remove learn more from smart-auto-rotate privacy string" into sc-dev am: 2a149d9932 am: 3ec3e800ff 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15237712

Change-Id: I2921c82267a16f9e020c30cbeb00724b77f096f2
 2021-07-09 16:36:26 +00:00