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
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
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
Bill Yi
2962edd9b0
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I601456c1a376a98531d455c0c292bf57fb696dbd
2021-07-16 09:01:39 +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
Bill Yi
1f660bf994
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I7e85df20c7b2befdee0d43ecbabaac82452c0249
2021-07-16 08:46:43 +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
Curtis Belmonte
b61478c30c
Ensure fingerprint setup is shown once after face
...
Adds an activity result extra during multi-biometric enroll that
ensures fingerprint setup will not be repeated multiple times if
explicitly finished or skipped by the user. Also updates various
activities in the stack to ensure that they handle all possible result
codes correctly and pass along result data.
Test: Manually skip and complete at each stage of multi-biometric enroll
Test: Manually test single-biometric enroll flows for SUW and Settings
Fixes: 193601823
Change-Id: Ic5a8306068eb4c32009f146ad6fff824fde25a11
2021-07-15 17:00:43 -07: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
20e57d33ff
Merge "Remove lockdown toggle" into sc-dev
2021-07-15 22:44:24 +00:00
TreeHugger Robot
4d37f8d642
[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: Ia41620c6e235e7030da0669758fb30d72c80c4f8
2021-07-15 21:56:19 +00:00
TreeHugger Robot
bcccb92239
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-07-15 21:41:51 +00:00
Curtis Belmonte
3bc99cf4b4
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: I033b3ef19d707b2c3f9767cc3459349b94a21697
2021-07-15 20:34:43 +00:00
Curtis Belmonte
4aa06d7639
Merge "Use correct choose lock password/pattern subtitles" into sc-dev
2021-07-15 20:14:32 +00:00
TreeHugger Robot
4c20c4de7f
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: I92e645137e5251d6635f6edb9a69165fe626271c
2021-07-15 20:06:03 +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
TreeHugger Robot
0f7ba3399f
Merge "Limit searchability of combined biometric Settings" into sc-dev am: cf1f67e54f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15302136
Change-Id: I3740cb6b2e9759046c1b91637b2e6b72d36216db
2021-07-15 19:42:59 +00:00
TreeHugger Robot
48d124bd74
Merge "Don't also skip fingerprint in SUW when skipping face" into sc-dev am: b1ba3c57af
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15289659
Change-Id: I902d512426449773c3870114237bc3c0c054a2d4
2021-07-15 19:42:44 +00:00
TreeHugger Robot
cf1f67e54f
Merge "Limit searchability of combined biometric Settings" into sc-dev
2021-07-15 19:21:56 +00:00
TreeHugger Robot
b1ba3c57af
Merge "Don't also skip fingerprint in SUW when skipping face" into sc-dev
2021-07-15 19:17:07 +00:00
Curtis Belmonte
a8d7fb68ca
Use correct choose lock password/pattern subtitles
...
Ensures that the existing subtitle strings for the choose lock
password/pattern screens are shown during SUW and from Settings.
Test: Manually tested PIN/pattern/password in SUW and Settings
Fixes: 193802664
Change-Id: Ibbb5f0c7bcd3885e63c02d8b68cd3205ffb529fd
2021-07-15 11:35:07 -07:00
Curtis Belmonte
effa67a8bb
Limit searchability of combined biometric Settings
...
Ensures that the combined biometric settings pages shown in Settings are
not indexed for search on devices without multiple biometric sensors.
Test: Manually tested on devices with and without multiple biometrics
Fixes: 193704179
Change-Id: I007b5d2a0191cb61454e5ae0f411d4c594536fc5
2021-07-15 10:51:35 -07:00
Curtis Belmonte
1b69dece94
Don't also skip fingerprint in SUW when skipping face
...
Ensures that each biometric enroll intro activity handles an activity
result of RESULT_SKIP by calling the appropriate skip handler, rather
than just finishing. This fixes an issue where skipping face setup from
some Setup Wizard states would skip fingerprint setup as well.
Test: Manually skipped face setup from each screen during SUW
Bug: 193367620
Change-Id: If9ef9f19f8e967093f17dde98093a506400d7c09
2021-07-15 09:24:23 -07:00
SongFerng Wang
1ddb70fec9
Merge "Let network mode UI refresh when network type with carrier group changed" into sc-dev am: 685fedd6c2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15283582
Change-Id: I8771eea133e8d4608ab607b049f506e7a96a960c
2021-07-15 12:10:00 +00:00
SongFerng Wang
685fedd6c2
Merge "Let network mode UI refresh when network type with carrier group changed" into sc-dev
2021-07-15 11:58:45 +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
TreeHugger Robot
c80050cede
Merge "Fix the NPE issue in the Internet Settings" into sc-dev am: 381bbbda8d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15269083
Change-Id: I8140bf98906941a0ada1910dacc8bbe6123bd17f
2021-07-15 09:00:31 +00:00
SongFerngWang
74a6ffaa91
Let network mode UI refresh when network type with carrier group changed
...
Bug: 193432269
Test: atest AllowedNetworkTypesListenerTest (pass)
atest EnabledNetworkModePreferenceControllerTest (pass)
Change-Id: Icae727887b2e913479a241bb9f014607b8ec826c
2021-07-15 16:14:41 +08:00
TreeHugger Robot
381bbbda8d
Merge "Fix the NPE issue in the Internet Settings" into sc-dev
2021-07-15 06:06:56 +00:00
Bill Yi
61c84d5ba1
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4dc320540d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15288729
Change-Id: I635ab4766529b602f4d52c3c3cd005862837e4e4
2021-07-15 01:14:48 +00: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
TreeHugger Robot
3a294b375f
Merge "Fix switch listener on app notif page" into sc-dev am: bef076df47
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15273047
Change-Id: Idd7223ab56853f2b8965efd654f04b9278adb212
2021-07-14 15:53:42 +00:00
TreeHugger Robot
bef076df47
Merge "Fix switch listener on app notif page" into sc-dev
2021-07-14 15:41:04 +00:00
SongFerng Wang
7a6887cf44
Merge "Change the condition for showing "no connection"" into sc-dev am: 7429fd1315
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15270340
Change-Id: Ib3b4b90349c1fa270bba473a39f0099e2c8b95f6
2021-07-14 14:54:13 +00:00
SongFerng Wang
7429fd1315
Merge "Change the condition for showing "no connection"" into sc-dev
2021-07-14 14:38:00 +00:00
Julia Reynolds
e41c89da2a
Fix switch listener on app notif page
...
Test: RoboTests, manually change setting
Fixes: 193442605
Change-Id: Ie93469479e252811921a6451853b073dadb0d0a1
2021-07-14 10:31:30 -04:00
Weng Su
5a916eaaf9
Fix the NPE issue in the Internet Settings
...
- Missing to remove the mRemoveLoadingRunnable in the onStop() function, which will cause the callback to run after the fragment is destroyed and encounter this NPE issue.
Bug: 193405782
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=NetworkProviderSettingsTest
Change-Id: I48b85173db1e6689dd056ba71f2fac776ffabbc9
2021-07-14 14:27:39 +00:00
Bill Yi
1d8a23dabd
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: bc7e4bcd46
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15280026
Change-Id: I50280f333781f0206e22d145bbef7d62a4b8f02a
2021-07-14 06:14:27 +00:00
SongFerngWang
5f8f44c720
Change the condition for showing "no connection"
...
The "no connection" should be shown in no data cell connection.
Bug: 193273081
Test: atest passed
- SubscriptionsPreferenceControllerTest.java
- ProviderModelSliceHelperTest.java
- ProviderModelSliceTest.java
- NetworkProviderWorkerTest.java
Change-Id: Ied8a34d13d4bfc81e9136e05ba41cbb4233c9ad8
2021-07-14 02:49:36 +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
cfe62d534c
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: I37772fb054bfc4e3a15cc25131ea7bda6d05d0a5
2021-07-13 16:45:47 +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
Bonian Chen
542990e48f
Merge "[Settings] Settings within each SIM not been displayed to the user" into sc-dev am: 92e82aa07e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15076790
Change-Id: I217446475d2cad0f5748e0cc739893fec69e22c6
2021-07-13 14:57:34 +00:00
Bonian Chen
92e82aa07e
Merge "[Settings] Settings within each SIM not been displayed to the user" into sc-dev
2021-07-13 14:40:39 +00:00
TreeHugger Robot
2df398e7ac
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 31a2875c24
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15267198
Change-Id: Id5ca02a9309ca0fbca55295026086756939da6aa
2021-07-13 08:33:25 +00:00
TreeHugger Robot
31a2875c24
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-07-13 08:13:45 +00:00