Bonian Chen
d72cf9a10b
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: I370e04ab8c7ebcda3ef40c3b858b2c24da9d9d10
2021-07-13 14:57:29 +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
e0ce5276d6
[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: I7d2d06291cb5316400c6c2eb6df7f05c7dffe496
2021-07-13 08:33:44 +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
0cce02c985
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: Ic019f1fb87a4f37c547c16aa6fb5189d108b3ff0
2021-07-13 06:17:04 +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
2a5fb15097
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: Ia9fa607e0a9fe4cba4d425a634659676e6af09c6
2021-07-13 05:48:59 +00:00
Rajeev Kumar
6311d1fe0d
Merge "Enable hibernation by default for Settings" into sc-dev
2021-07-13 05:35:34 +00:00
Bill Yi
d32e536a2c
[automerger skipped] Merge "Merge RQ3A.210705.001 to aosp-master - DO NOT MERGE" am: e36e5876d6
-s ours am: 4cc5d4371e
-s ours
...
am skip reason: Merged-In Ie37d07ed9cbce12b9dcd39b332ed2ae66f3edf6c with SHA-1 4909b81006
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1763547
Change-Id: Ib6641264f7b7f664fbbba85207f351e368b014a0
2021-07-13 01:21:32 +00:00
Bill Yi
4cc5d4371e
[automerger skipped] Merge "Merge RQ3A.210705.001 to aosp-master - DO NOT MERGE" am: e36e5876d6
-s ours
...
am skip reason: Merged-In Ie37d07ed9cbce12b9dcd39b332ed2ae66f3edf6c with SHA-1 4909b81006
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1763547
Change-Id: Ib6d3045e956672a1832742b1de90f8d000543c4e
2021-07-13 01:02:57 +00:00
Bill Yi
e36e5876d6
Merge "Merge RQ3A.210705.001 to aosp-master - DO NOT MERGE"
2021-07-13 00:48:38 +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
Bill Yi
7976c5bc51
Merge RQ3A.210705.001 to aosp-master - DO NOT MERGE
...
Merged-In: Ie37d07ed9cbce12b9dcd39b332ed2ae66f3edf6c
Merged-In: I777bae14ea865ecf1607e1d660fe3102a9b8fa6d
Merged-In: I777bae14ea865ecf1607e1d660fe3102a9b8fa6d
Change-Id: I0f793ed1ea64127903c6dc906c5afa1db15fff48
2021-07-12 11:08:29 -07:00
Bill Yi
799b80f9d7
[automerger skipped] Merge "Merge RQ3A.210705.001 to stage-aosp-master - DO NOT MERGE" into stage-aosp-master am: 275dc390bd
-s ours
...
am skip reason: Merged-In I2b0706fc636af827e9a7f76ca00c99653d569dbf with SHA-1 7639158022
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15257241
Change-Id: Ie1b18e903e1246e7020c6d3528f936b582347637
2021-07-12 13:27:14 +00:00
Bill Yi
275dc390bd
Merge "Merge RQ3A.210705.001 to stage-aosp-master - DO NOT MERGE" into stage-aosp-master
2021-07-12 13:14:39 +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
TreeHugger Robot
e39365282c
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: I4f3a2d73374a9e51ea1da147d734b12e96767e0b
2021-07-12 10:48:08 +00:00
TreeHugger Robot
5ab7e41f02
Merge "[Settings] Correct some typo" into sc-dev
2021-07-12 10:39:07 +00:00
Treehugger Robot
8dd6ce02d8
Merge "Revise strings for the NFC developer option"
2021-07-12 10:38:43 +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
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
323420f40d
[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: Ibdc3394f631c21cd9b390d61b657ff89fb53b824
2021-07-12 07:54:16 +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
b91ee37910
[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: I42240b4866647a6430aa32aacc6175b36d7be4c2
2021-07-12 07:15:24 +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
Bill Yi
e6458604bd
[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: Ib6ab20ff1121080219c04e13caa9208e4d23b005
2021-07-12 06:55:49 +00:00
Bill Yi
2c5d2dfc74
Merge RQ3A.210705.001 to stage-aosp-master - DO NOT MERGE
...
Merged-In: I777bae14ea865ecf1607e1d660fe3102a9b8fa6d
Merged-In: I2b0706fc636af827e9a7f76ca00c99653d569dbf
Change-Id: I47f15d872a0adcafe26fa349b3d0ecdcdc061872
2021-07-11 22:43:41 -07: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
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
7639158022
[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: I2b0706fc636af827e9a7f76ca00c99653d569dbf
2021-07-11 02:09:43 +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
2784c41cd8
[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: I1391e3c92d403f0b26aa5c385cd2d4ece29e87ad
2021-07-10 02:14:49 +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
SongFerng Wang
f407616398
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: I886d0112022c82460d3a26b943502ed07f2d0a0c
2021-07-09 18:00:02 +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
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
TreeHugger Robot
92f0c16ab8
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 861d1cc080
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15241523
Change-Id: I86bf36487218467dac8587bbaaa76465bf312644
2021-07-09 14:09:22 +00:00
TreeHugger Robot
861d1cc080
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-07-09 13:57:21 +00:00
SongFerngWang
f7073adf80
Fix internet panel doesn't show data rat after dds changed
...
The internet panel does not listen dds changed.
Bug: 193029917
Test: atest NetworkProviderWorkerTest
Change-Id: I58544ec2fd3f2bba5c6590ce54bcf68d0c83b06b
2021-07-09 20:16:04 +08:00