Commit Graph

1195 Commits

Author SHA1 Message Date
Treehugger Robot
9ee42fc623 Merge "Add biometric OWNERS to unit tests." am: 9689490c22 am: 2fbbcd3d9d
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1795029

Change-Id: I56890f77bf79e84953a0ce01f2cec4089682fbf4
2021-08-17 09:22:56 +00:00
TreeHugger Robot
80544241db Merge "Prototyping : Demo Image on color setting" into sc-qpr1-dev am: 7efaff8d0f am: f680c9b0b5 am: 85e6aba27f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15531055

Change-Id: I8e6d18b8be6960be4e1557a07405d65412205b70
2021-08-14 07:49:54 +00:00
TreeHugger Robot
f680c9b0b5 Merge "Prototyping : Demo Image on color setting" into sc-qpr1-dev am: 7efaff8d0f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15531055

Change-Id: If4c7ffd19e06965e34f5185e63b22d58d3ca08d8
2021-08-14 07:26:53 +00:00
Alfred Lin
7f8e775754 Prototyping : Demo Image on color setting
Implement prototyping of demo image on color setting

Bug: 182797883
Test: adb shell am instrument -w -e class com.android.settings.display.ColorModePreferenceFragmentTest com.android.settings.tests.unit/androidx.test.runner.AndroidJUnitRunner test pass
Change-Id: Iebaaa6867f2039a25a5e1fd280a89b5bc9297e6b
2021-08-13 15:08:58 +00:00
Zoey Chen
6ce608787b [Provider Model] Redirect Settings Internet panel request to SystemUI.
From QPR, the panel should be launched from SystemUI, so redirect the panel to SystemUI

Test: make
Bug: 187779230
Change-Id: I5b4131c4d986399944c038f8bce0723fcb5ba3b3
(cherry picked from commit ab8a922f77)
Merged-In: I5b4131c4d986399944c038f8bce0723fcb5ba3b3
2021-08-13 14:07:01 +00:00
Joe Bolinger
2296f618cc Add biometric OWNERS to unit tests.
Fix: 196452210
Test: N/A
Change-Id: I6f76bef97dd61130dd546749591338864665352b
2021-08-12 16:17:03 -07:00
Bonian Chen
a5517006b3 Merge "[Settings] eSIM existance detection rule change" into sc-dev am: 68ac2d69c0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15453991

Change-Id: Idb67e48147c633e60c317876abdb19c48fcb90cf
2021-08-06 03:31:26 +00:00
Bonian Chen
35df60f316 [Settings] eSIM existance detection rule change
1. eSIM retrieved from SubscriptionManager#getAvailableSubscriptionInfoList()
should be considered as existed all the time.

2. When SIM are both inactive(or active), sorted the ordering based on ordering provided by telephony framework.

Bug: 195090132
Bug: 195091953
Bug: 194197762
Test: local
Change-Id: I2fe43a35e5b7965bde3b579e2297e9cdd89ec228
(cherry picked from commit 848d097b94)
(cherry picked from commit 824deb0ee3727f23ab68a75176825c4c73f482a9)
2021-08-05 06:31:35 +00:00
Bonian Chen
848d097b94 [Settings] eSIM existance detection rule change
1. eSIM retrieved from SubscriptionManager#getAvailableSubscriptionInfoList()
should be considered as existed all the time.

2. When SIM are both inactive(or active), sorted the ordering based on ordering provided by telephony framework.

Bug: 195090132
Bug: 195091953
Test: local
Change-Id: I2fe43a35e5b7965bde3b579e2297e9cdd89ec228
2021-08-03 11:04:27 +00:00
SongFerngWang
e68517703c Fix the wrong comparison am: 1bcba3d23f am: b34e7441b5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15403429

Change-Id: I795d28464a2aba4b59b1378af0673068bb13d545
2021-07-28 17:20:32 +00:00
SongFerngWang
9d9d06ab24 Fix the wrong comparison am: 1bcba3d23f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15403429

Change-Id: If39ce68a76790912d69dfce084bbf8b9421f8ec0
2021-07-28 17:03:56 +00:00
SongFerngWang
1bcba3d23f Fix the wrong comparison
Bug: 173387374
Test: atest NetworkSelectSettingsTest (PASS)
test on real device (PASS)

Change-Id: Ib1135b0457b4e35db67e671cad142657457d6d75
2021-07-28 14:15:31 +00:00
Zoey Chen
64c5f22c3c Merge "[BackupCall] The toggle doesn't work when try to disable/enable it." into sc-dev am: 1a6982f195 am: e41c038d28
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15372352

Change-Id: I0e2789346ce748db959b0dfd75958bb724840662
2021-07-28 03:55:54 +00:00
Zoey Chen
046c8d4a97 Merge "[BackupCall] The toggle doesn't work when try to disable/enable it." into sc-dev am: 1a6982f195
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15372352

Change-Id: I6e15a328c230cae09f8a980cf86cb9f09a577655
2021-07-28 03:40:11 +00:00
Zoey Chen
9894f347f2 [BackupCall] The toggle doesn't work when try to disable/enable it.
Bug: 192060713
Test: atest NetworkProviderBackupCallingGroupTest
Change-Id: I250c321d682f77e95967824ec033dd3c1ea64b65
2021-07-28 09:11:05 +08:00
SongFerng Wang
9b1493a789 Merge "aggregate the items of network selection list" into sc-dev am: 9e6928ae2e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15340173

Change-Id: I4769f0bcb21bf6b56f8dad38f535472b85437ebe
2021-07-23 09:18:40 +00:00
SongFerngWang
7f5c984655 aggregate the items of network selection list
According to bug comment#44, modem only report one PLMN per RAT
for different cells reported for the same PLMN/RAT combination,
UI affregate those items.
Bug: 173387374
Test: atest NetworkSelectSettingsTest

Change-Id: I155abc8dda7c8ec42cf4fd677bd2aa99d1033ad1
Merged-In: I8e05b9f6784bad7f0de4e79cc6e707749745f0c1
2021-07-23 07:27:30 +00:00
SongFerng Wang
89b16b3690 Merge "aggregate the items of network selection list" 2021-07-22 19:54:25 +00:00
SongFerngWang
2868b4af7a aggregate the items of network selection list
According to bug comment#44, modem only report one PLMN per RAT
for different cells reported for the same PLMN/RAT combination,
UI affregate those items.
Bug: 173387374
Test: atest NetworkSelectSettingsTest

Change-Id: I8e05b9f6784bad7f0de4e79cc6e707749745f0c1
2021-07-23 01:07:04 +08:00
Weng Su
3563baee28 Refactor HandlerInjector to SettingsLib
- Plan to share the HandlerInjector class to System UI.

Bug: 194186477
Test: manual test
atest InternetResetHelperTest

Change-Id: I4b1b72ac7742bcfdd89ae61d9f88df1c64224f1f
2021-07-21 13:37:31 +00: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
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
9c63c415ea 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.

Bug: 193384705
Test: robotest and see the UI
Change-Id: I2de7ee72fc1315eeef01288b386f8756ca366e33
2021-07-16 19:44:25 +08:00
SongFerng Wang
80553aa2f1 Merge "Let network mode UI refresh when network type with carrier group changed" into sc-dev am: 685fedd6c2 am: 1ddb70fec9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15283582

Change-Id: I12f64edf962554a803792a74b4722d95e4377d30
2021-07-15 12:24:03 +00:00
SongFerng Wang
747b83b0f7 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: I796d390e022153c77ed5ed2daf935299a9278f16
2021-07-15 12:09:56 +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
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
Zoey Chen
ccb75ab864 Merge "[Provider Model] Redirect Settings Internet panel request to SystemUI." 2021-07-15 06:32:23 +00:00
SongFerng Wang
a6031dd976 Merge "Change the condition for showing "no connection"" into sc-dev am: 7429fd1315 am: 7a6887cf44
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15270340

Change-Id: I639f8fb357aa7d886b311b5082a055e79989fda8
2021-07-14 15:08:02 +00:00
SongFerng Wang
9bfa6c19d0 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: I61b5feed494b241832062d461634fa3f9fefd5e3
2021-07-14 14:53:57 +00:00
SongFerng Wang
7429fd1315 Merge "Change the condition for showing "no connection"" into sc-dev 2021-07-14 14:38:00 +00:00
Zoey Chen
ab8a922f77 [Provider Model] Redirect Settings Internet panel request to SystemUI.
From QPR, the panel should be launched from SystemUI, so redirect the panel to SystemUI

Test: make
Bug: 187779230
Change-Id: I5b4131c4d986399944c038f8bce0723fcb5ba3b3
2021-07-14 09:06:46 +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
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
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
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
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
Bonian Chen
5d57ed1d51 Merge "[Settings] Rollback group UUID merging in SIM settings" 2021-07-12 08:45:58 +00:00
Bonian Chen
0726f263a8 [Settings] Rollback group UUID merging in SIM settings
Within origin design, subscriptions with same group UUID
are not merged together.

This is a fix which changing grouping by UUID part into a configurable
option which allows to be enabled in some other conditions.

Bug: 191228344
Test: local
Change-Id: I0101f4a51ec2342f059762f0e7d38bb4e93554cf
2021-07-12 14:59:28 +08:00
SongFerng Wang
2950401a1c Merge "Network selection add NGRAN when device support SA" into sc-dev am: a73d199d5e am: 0309aad720
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15210394

Change-Id: I48de91db9d09c743421339c3ccaeafbacd742e71
2021-07-08 09:07:56 +00:00
SongFerng Wang
9f06b36b3b Merge "Network selection add NGRAN when device support SA" into sc-dev am: a73d199d5e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15210394

Change-Id: I1dfb9507da126f8e25ba12535581d40801837d89
2021-07-08 08:30:06 +00:00
SongFerng Wang
a73d199d5e Merge "Network selection add NGRAN when device support SA" into sc-dev 2021-07-08 08:17:19 +00:00
Bonian Chen
a229b29737 Merge "[Settings] Settings within each SIM not been displayed to the user" 2021-07-07 09:03:45 +00:00
SongFerngWang
193f97c7ba Network selection add NGRAN when device support SA
Bug: 187148937
Test: build pass.
atest NetworkScanHelperTest (pass)

Change-Id: I1ed3eae3bda39eb702bc135b0c698f8df7c280d7
2021-07-07 15:36:42 +08:00
Bonian Chen
8e3ff612d2 Merge "[Settings] Hide subscriptions not existed within device" 2021-07-07 07:03:10 +00:00
Bonian Chen
75f1450bbf [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.

Bug: 191228344
Test: local
Change-Id: Ia68c23b007164b7520456cb6c7427ca142558b59
2021-07-07 07:02:55 +00:00
Treehugger Robot
5dfa9cde19 Merge "Add a developer option to increase nfc stack log level" am: 9d7b0beb87 am: 4909b81006 am: b6e44d16ac am: 957ece6934
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1733952

Change-Id: I159684580a0f018e7d41dc2982c7d7001e88cf55
2021-07-06 09:15:20 +00:00
Treehugger Robot
b6e44d16ac Merge "Add a developer option to increase nfc stack log level" am: 9d7b0beb87 am: 4909b81006
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1733952

Change-Id: I257c6806afcef6211eedc8cf60829f90930a0d32
2021-07-06 08:52:25 +00:00
Bonian Chen
76bf6ff525 [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-05 15:12:39 +08:00