Commit Graph

23852 Commits

Author SHA1 Message Date
TreeHugger Robot
f97a194881 Merge "Update dark theme battery info error text color" into sc-dev am: 501a4cea3b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15308397

Change-Id: I4df788647ce68c6043b876345d4753f7fbae6555
2021-07-21 10:57:00 +00:00
TreeHugger Robot
501a4cea3b Merge "Update dark theme battery info error text color" into sc-dev 2021-07-21 10:47:56 +00:00
Bill Yi
d5ded6d0fa Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ib2bfb253a81bc12d86ddf3fb31823f79d2f23170
2021-07-20 11:07:44 +00:00
Stanley Wang
95b330da7d Merge "Move the illustrations of System navigation page to AOSP." into sc-dev am: de6214c442
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15328196

Change-Id: Ifcbb2823dddea66d53ab1103c21f7f33884deb17
2021-07-19 13:50:45 +00:00
Stanley Wang
de6214c442 Merge "Move the illustrations of System navigation page to AOSP." into sc-dev 2021-07-19 13:35:04 +00:00
Edgar Wang
eff77ffd0d Merge "Find the double twist sensor using the type instead of the name" into sc-dev am: 6e972e81ef
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15270335

Change-Id: Ie95f0de5bd7ed35c1e3494e0823dd99a00032c9b
2021-07-19 13:11:44 +00:00
Edgar Wang
6e972e81ef Merge "Find the double twist sensor using the type instead of the name" into sc-dev 2021-07-19 12:58:43 +00:00
Stanley Wang
7756100515 Move the illustrations of System navigation page to AOSP.
- Some devices only build with the aosp version of Settings.
  So move some related illustrations to aosp Settings.

Fix: 193932907
Test: robotest and see the UI
Change-Id: I3cd37fdf0a45fcae71b137cf3eba0f3f0442b0a5
2021-07-19 19:58:05 +08:00
Stanley Wang
8172520329 Merge "Fix the problem that the SIM status and IMEI after the "Build number"." into sc-dev am: 2ea54cc143
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15270337

Change-Id: I32a8dde99dbe338554f3ba9984569886174a290e
2021-07-19 02:30:21 +00:00
Stanley Wang
2ea54cc143 Merge "Fix the problem that the SIM status and IMEI after the "Build number"." into sc-dev 2021-07-19 02:10:21 +00:00
Bill Yi
a57e31da59 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I1b53832418e52ffaf1b6d784d3eac4f77ab1950a
2021-07-17 21:04:17 +00:00
TreeHugger Robot
026fba52e8 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-07-16 14:46:30 +00:00
Stanley Wang
1fcdafbcda 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.

Fix: 193384705
Test: robotest and see the UI

Merged-In: I2de7ee72fc1315eeef01288b386f8756ca366e33
Change-Id: I9472ecd604afe2f2e2eaf08c92ec11e439e8fc1d
2021-07-16 22:03:54 +08: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
c916876cc7 Merge "Update the illustrations of System navigation page." into sc-dev 2021-07-16 11:37:51 +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
Wesley.CW Wang
7e9fdf69a4 Update dark theme battery info error text color
screenshot: https://screenshot.googleplex.com/8UyMj5q7tLJ2uA8.png

Bug: 187611525
Test: make SettingsRoboTests
Change-Id: Iefec51d9ca6d27c9173af0756301f4278e928433
2021-07-16 14:17:46 +08:00
Edgar Wang
8fc818709d Find the double twist sensor using the type instead of the name
Bug: 192565190
Test: manual & robotest
Change-Id: Ib2b4b39f75667700c503b49f114887a61f7603a6
2021-07-16 04:12:41 +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
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
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
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
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
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
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
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
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
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
abf8a9ea63 Merge "Remove learn more from smart-auto-rotate privacy string" into sc-dev am: 2a149d9932
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15237712

Change-Id: I2e0acdcfa86fef13eef290357fe148d3ad1806da
2021-07-09 16:27:03 +00:00
TreeHugger Robot
2a149d9932 Merge "Remove learn more from smart-auto-rotate privacy string" into sc-dev 2021-07-09 16:14:20 +00:00
Bill Yi
42d5aa754b Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ibd6f492b43759b0d6ca66bd0c95b4acb29bbbedb
2021-07-09 06:29:21 +00:00
Abel Tesfaye
3be761fc48 Remove learn more from smart-auto-rotate privacy string
Test: locally with flame

Bug: 192087097
Change-Id: I9dba949571f8c931a839cdf15b0d6e607fa4e6b4
2021-07-08 23:21:38 +00:00
Peter Wang
00c8f25333 Removed nested GlifRecyclerLayout on choose_sim_activity.xml
[Submitting on behalf of beccamilman@]

Bug: 193000379
Test: Build
Change-Id: Ic850f2ee84162fbcf609fa1f9715cec31de73bea
2021-07-08 14:21:45 -07:00
Bill Yi
7c2a910199 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I2045140919e5d3829713eac17d2a3d313f1e3022
2021-07-08 15:35:59 +00:00