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
Bonian Chen
83b2253048
[Settings] Settings within each SIM not been displayed to the user
...
The display of content is in majority depending on the callback result
of SIM card (in order to display the content).
However, to reduce the number of access of SubscriptionManager and
improve performance, a proxy has been design in between to reduce the
traffic and the latency required.
Within this situation, content didn't get displayed when Activity get
restarted since Proxy avoid to reduce the traffic through reducing the
callback to the Activity and even not generating request for update when
Activity resume.
Bug: 188982508
Test: local & unit test
Change-Id: Ia3b946a853f87a469ce07a398f3811f605d38f1d
2021-07-13 06:58:10 +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
Bonian Chen
9e0bb47c86
Merge "[Settings] Hide subscriptions not existed within device" into sc-dev am: 9c1e8b7ccd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15220210
Change-Id: I90429c24c519e2a73ef9213e7126146a4b895d93
2021-07-13 06:17:32 +00:00
Bonian Chen
9c1e8b7ccd
Merge "[Settings] Hide subscriptions not existed within device" into sc-dev
2021-07-13 06:08:17 +00:00
Rajeev Kumar
a0065f01d6
Merge "Enable hibernation by default for Settings" into sc-dev am: 6311d1fe0d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15167350
Change-Id: Ib830cfd437b998050c63f693cf824b9071097df9
2021-07-13 05:49:10 +00:00
Rajeev Kumar
6311d1fe0d
Merge "Enable hibernation by default for Settings" into sc-dev
2021-07-13 05:35:34 +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
1faaefee9c
Merge "[Settings] Correct some typo" into sc-dev am: 5ab7e41f02
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15227881
Change-Id: I50899d08d1e6ed99987adaa6f21f65f0d0f198c6
2021-07-12 10:48:12 +00:00
TreeHugger Robot
5ab7e41f02
Merge "[Settings] Correct some typo" into sc-dev
2021-07-12 10:39:07 +00:00
Bonian Chen
a239a6c53a
[Settings] Hide subscriptions not existed within device
...
For non-active subscriptions, the one inserted in slot
but turned off need to be visible to the user. However,
the one un-plugged need to be invisble.
Since SubscriptionUtil#getSelectableSubscriptionInfoList() didn't cover all the cases required. Create this one to fit into the criteria required here.
Note: subscriptions with same group UUID will be displayed seperately.
Bug: 191228344
Test: local
Change-Id: Ia68c23b007164b7520456cb6c7427ca142558b59
(cherry picked from commit 75f1450bbf
)
(cherry picked from commit 0726f263a8
)
2021-07-12 17:32:59 +08:00
Bill Yi
4a0edbcc55
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8dfc6a13ba
-s ours am: 2fe6e382d7
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15256205
Change-Id: I7b8bc9227bdce08c94ac23d0cced402add66f5b2
2021-07-12 07:54:24 +00:00
Bill Yi
2fe6e382d7
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8dfc6a13ba
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15256205
Change-Id: I2091d9fbae8ee41c013401190e11c877c7fba447
2021-07-12 07:41:29 +00:00
Bill Yi
f9116afdf5
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ea3600ce39
-s ours am: bf4b93129f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15256323
Change-Id: I1d193d027c16067fdf8b569110c74dbd016a0c2b
2021-07-12 07:15:47 +00:00
Bill Yi
bf4b93129f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ea3600ce39
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15256323
Change-Id: I877fc8715242c4056cdf45a955bbc5f8cf68b93a
2021-07-12 07:00:51 +00:00
TreeHugger Robot
06facc35cf
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod
2021-07-12 06:57:13 +00:00
Bill Yi
a48977aee1
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f360fb7f80
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15256574
Change-Id: I1e65ed96b1b558c86934c6d90594f31d7199d238
2021-07-12 06:55:54 +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
ea3600ce39
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I85d570cd2d2c9e6f80672d0692ad385ffa2b3a89
2021-07-12 01:08:49 +00:00
Bill Yi
fc4e91569b
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I0d67ba9fa6d73187fdb02387c9baa3c60da43da4
2021-07-12 01:01:09 +00:00
Bill Yi
8dfc6a13ba
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I3c71882147ae08775b5dbc074e91bd1df6eb33b6
2021-07-12 00:57:20 +00:00
Bill Yi
37c7ac096c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 80494f3b36
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15251936
Change-Id: I7a42f33a7d97c2aaded6a258c8e921cb1b4e74c1
2021-07-11 02:09:45 +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
d7a21b370c
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 0543cd0231
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15246379
Change-Id: I0a1f411b2fe78731f1ca8cd4794b5e18cf007941
2021-07-10 02:14:45 +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
b92327498b
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: Idde13d6b4331e422967d99610912c5cec323cf33
2021-07-09 22:44:10 +00:00
Meng Wang
d43986fa96
Merge "Refine WFC location notice text." into sc-dev
2021-07-09 22:30:44 +00:00
SongFerng Wang
b360e1aec3
Merge "Fix internet panel doesn't show data rat after dds changed" into sc-dev am: cf327ae5ba
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15222851
Change-Id: I5fe20b28718cb999edc9d5e6c2fecd429e461ed8
2021-07-09 18:00:08 +00:00
SongFerng Wang
cf327ae5ba
Merge "Fix internet panel doesn't show data rat after dds changed" into sc-dev
2021-07-09 17:47:13 +00:00
Becca Milman
aeb4301efa
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: Ifc2f68714b00657f345716311541d3585b78ba1f
2021-07-09 17:07:48 +00:00