Bonian Chen
933dbbd5a4
[automerger skipped] [Settings] configuration for hidding SIM notification UI am: 5c595b3789
-s ours
...
am skip reason: Merged-In I0a7e0e9826a301f2aa0ca34f40b5570f0e384b4f with SHA-1 188ccde75b
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2299466
Change-Id: Ib9c1e811a17bc7923467b6f0c846aac7c6e804fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-22 09:19:11 +00:00
Bonian Chen
f901e617c1
Merge "[Settings] configuration for hidding SIM provider UI" am: f7ec7e66c4
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2299465
Change-Id: Ibd2bc810f356beb375870fecafd73116ed0b5593
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-22 09:19:09 +00:00
Bonian Chen
5104a1bee0
[automerger skipped] Merge "[Settings] configuration for hidding SIM related UI" am: d40fd7c597
-s ours
...
am skip reason: Merged-In I45b7898da440c36045aec64a0a86fb804116cd9d with SHA-1 ed95f35423
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2299464
Change-Id: Id886c8f56c33571dcfca29741d50e248babe8218
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-22 09:19:08 +00:00
Bonian Chen
5b9e71b0c5
[automerger skipped] [Settings] configuration for hidding SIM related UI am: 7dc161dcc8
-s ours
...
am skip reason: Merged-In I45b7898da440c36045aec64a0a86fb804116cd9d with SHA-1 ed95f35423
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2299464
Change-Id: I39b6582327344a55219b960285add58422f69ca3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-22 09:19:06 +00:00
Bonian Chen
2a98e2a4fe
Merge "[Settings] configuration for hidding SIM lock UI" am: 1ab73b934b
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2299463
Change-Id: If39c1f00449571d803eeeff89bb69ff2a789382c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-22 09:18:59 +00:00
Bonian Chen
769d773997
Merge "[Settings] configuration for hidding SIM settings UI"
2022-11-22 08:51:53 +00:00
Bonian Chen
889c81f77a
Merge "[Settings] configuration for hidding SIM remove UI"
2022-11-22 08:51:53 +00:00
Bonian Chen
56ff3fd99a
Merge "[Settings] configuration for hidding SIM notification UI"
2022-11-22 08:51:53 +00:00
Bonian Chen
f7ec7e66c4
Merge "[Settings] configuration for hidding SIM provider UI"
2022-11-22 08:51:53 +00:00
Bonian Chen
d40fd7c597
Merge "[Settings] configuration for hidding SIM related UI"
2022-11-22 08:51:53 +00:00
Bonian Chen
1ab73b934b
Merge "[Settings] configuration for hidding SIM lock UI"
2022-11-22 08:51:53 +00:00
Zoey Chen
92333907f0
[Settings] Apply the SettingsDataService to the SIM page, MobileDataPreferenceController
...
Bug: 257950125
Test: atest MobileDataPreferenceControllerTest
Change-Id: Ia64a8baf931e9aa7f54cad2b2f5bb264420be9b0
2022-11-22 08:01:27 +00:00
TreeHugger Robot
f137463ddc
Merge "Add biometric2 unit test owner"
2022-11-22 05:48:45 +00:00
Zhenwei Chen
a725bac68c
Clean up useless defender dialog code
...
Test: Unit test passed
Bug: 256523123
Change-Id: If3cbe4072c891f1af6b5aa4fb624e4e486c78ad6
Signed-off-by: Zhenwei Chen <zhenwec@google.com >
2022-11-22 12:22:08 +08:00
TreeHugger Robot
f4b81c8207
Merge "Adds settings item for quick affordances." into tm-qpr-dev am: 6f908bae6f
am: 6c7910557e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20427460
Change-Id: I734695139164190b049052af8456dfb8127202d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-22 03:52:37 +00:00
Milton Wu
f5e631dd77
Add biometric2 unit test owner
...
Bug: 236072782
Test: Build pass
Change-Id: Iea90eb418eb61087c44c037356a4171197f9f6c7
2022-11-22 03:20:52 +00:00
TreeHugger Robot
6c7910557e
Merge "Adds settings item for quick affordances." into tm-qpr-dev am: 6f908bae6f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20427460
Change-Id: Idb43b7a13130da5c2aa84df780d42aeca0771b2a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-22 03:17:16 +00:00
TreeHugger Robot
6f908bae6f
Merge "Adds settings item for quick affordances." into tm-qpr-dev
2022-11-22 02:59:15 +00:00
Chaohui Wang
407560fde4
Merge "Move ComposeContentTestRuleExt to SpaLibTestUtils"
2022-11-22 02:39:36 +00:00
Florian Mayer
adca469147
Remove periods from description strings
...
This is for consistency with the rest of the Developer options
Change-Id: I1450b67edcb2ca927e9b551400dba1e2efb2749d
2022-11-22 01:31:23 +00:00
Alejandro Nijamkin
01df2b4ee2
Adds settings item for quick affordances.
...
This is in Display > Lock screen. It reads "Buttons" and the summary
text below it is a comma delimited list of the names of the
currently-selected quick affordances.
Fix: 256662519
Test: Manual verification that the lock screen and wallet
items are gone and the new item is visible and clicking it opens the
Wallpaper & style settings screen
Change-Id: If3746b5d0eb8c61edb9378cdb217ca248b999944
2022-11-21 16:42:45 -08:00
Florian Mayer
2a1f7cb453
[MTE] fix broken test
...
Bug: 245624194
Test: make RunSettingsRoboTests ROBOTEST_FILTER=MemtagHelperTest
Change-Id: I71ad79270a5f538bf7a447345aa610c514683fec
2022-11-21 11:19:06 -08:00
Florian Mayer
dbc8874386
Merge "[MTE] disable dev option if security setting is on"
2022-11-21 18:57:49 +00:00
Chaohui Wang
3d10bebe06
Move ComposeContentTestRuleExt to SpaLibTestUtils
...
Also fix some failed tests.
Bug: 259520506
Test: Unit test
Change-Id: I0eaf00defdad2b90bf4e67476e33a86751488bc0
2022-11-22 00:30:52 +08:00
Chaohui Wang
d89bb9d7c8
Merge "Set configChanges for Spa Browser Activity"
2022-11-21 15:55:11 +00:00
Steve Elliott
30ccc43ae1
Revert^2 "Add configuration for defaulting notification behavior"
...
Test: go through SUW on affected device, view notification screen
Bug: 240472040
Change-Id: I34dbe28226d830bc5ba633e72cd529d97021de85
2022-11-21 15:16:40 +00:00
Weng Su
b39fb9d21c
Align same wording style with Settings main switch
...
- Update the main swtich title from "Adaptive connectivity" to "Use adaptive connectivity"
Bug: 216730079
Test: manual testing to confirm wording changes
Change-Id: I20004d8ffc6c9484e8aa68b36cc2a9c11ce764b6
2022-11-21 22:23:21 +08:00
Bonian Chen
eb196b64a9
Merge "[Settings] Code Refactor" am: 8ae657bd80
am: f6d9536922
am: f01cea0236
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2308620
Change-Id: I48f913265c1403b9a33ac271a1f36cf3c5a74a8c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-21 11:09:48 +00:00
Chaohui Wang
64baefc848
Merge "Calculate list type first in ManageApplications"
2022-11-21 10:54:51 +00:00
Bonian Chen
f01cea0236
Merge "[Settings] Code Refactor" am: 8ae657bd80
am: f6d9536922
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2308620
Change-Id: I5b90defe3741e720280fe026ab45f57b013fa640
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-21 10:36:53 +00:00
Bonian Chen
f6d9536922
Merge "[Settings] Code Refactor" am: 8ae657bd80
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2308620
Change-Id: I4efad57d509e79938a5558f09b6154d898504b31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-21 10:11:28 +00:00
Chaohui Wang
f67f2addf6
Set configChanges for Spa Browser Activity
...
Spa Browser Activity will handle orientation change itself.
To prevent the activity from being restarted.
Bug: 259520506
Test: Manually with Gallery
Change-Id: I8f379e7ddc69cd4f63c9cf645d0fbb1f789643c5
2022-11-21 17:44:31 +08:00
Bonian Chen
8ae657bd80
Merge "[Settings] Code Refactor"
2022-11-21 09:32:30 +00:00
Zoey Chen
82c216b3a9
Merge "[Settings] Apply the SettingsDataService to the SIM page, calls/smscontroller"
2022-11-21 08:54:55 +00:00
TreeHugger Robot
cd8f6a2b78
Merge "Remove schedule by routine relative tests"
2022-11-21 08:34:04 +00:00
TreeHugger Robot
a822d13638
Merge "b/259865144 Fix the failed unit test BatteryChartPreferenceControllerTest"
2022-11-21 08:07:19 +00:00
Weng Su
d46c3848a9
Keep "Resetting your internet" when screen rotates
...
- The fragment of Internet Settings will be destroyed and recreated when screen rotates
- Move connectivity recovery class into singleton class to avoid service being killed when fragment context is destroyed
- Check if connectivity is recovering when fragment is recreated and show resettings message if necessary
Bug: 202802736
Test: manual test
atest -c InternetResetHelperTest
make RunSettingsRoboTests ROBOTEST_FILTER=NetworkProviderSettingsTest
Merged-In: Iae9585ff8366b8b71b4c39dc0ec7e87a0320fa5a
Change-Id: Iae9585ff8366b8b71b4c39dc0ec7e87a0320fa5a
2022-11-21 07:55:22 +00:00
Weng Su
728a59199b
Keep "Resetting your internet" when screen rotates
...
- The fragment of Internet Settings will be destroyed and recreated when screen rotates
- Move connectivity recovery class into singleton class to avoid service being killed when fragment context is destroyed
- Check if connectivity is recovering when fragment is recreated and show resettings message if necessary
Bug: 202802736
Test: manual test
atest -c InternetResetHelperTest
make RunSettingsRoboTests ROBOTEST_FILTER=NetworkProviderSettingsTest
Change-Id: Iae9585ff8366b8b71b4c39dc0ec7e87a0320fa5a
2022-11-21 07:50:06 +00:00
Zoey Chen
64330a235a
[Settings] Apply the SettingsDataService to the SIM page, calls/smscontroller
...
Calls/SmsDefaultSubscriptionController
Bug: 257197354
Test: atest DefaultSubscriptionControllerTest
Change-Id: I67cb2d3aa5ef3c6751d90b96db27a062071c8113
2022-11-21 06:39:12 +00:00
ykhung
b2f363e5d4
Remove schedule by routine relative tests
...
Fix: 259866871
Test: make test DEBUG_ROBOLECTRIC=1 ROBOTEST_FILTER="com.android.settings.fuelgauge.batterysaver" RunSettingsRoboTests -j40
Change-Id: Icc402c678c4c4b365047c01c499b17f6d5ec3ada
2022-11-21 14:19:03 +08:00
Zaiyue Xue
52f9272cb9
b/259865144 Fix the failed unit test BatteryChartPreferenceControllerTest
...
Bug: 259865144
Fix: 259865144
Test: presubmit
Change-Id: Ie23fef16f4e21bba25f02bc2aa28986a5904188e
2022-11-21 14:05:26 +08:00
Chaohui Wang
5177d070e5
Calculate list type first in ManageApplications
...
Currently, list type is calculated in onCreate(), and will default to
LIST_TYPE_MAIN if the class name is not set to any special activity.
When adding new app list to onCreate(), but not changing
getSpaDestination() could led to issue when spa is on.
Calculate list type first in onAttach() as single source of truth could
solve this issue.
Bug: 235727273
Test: Manually with Settings with / without spa
Change-Id: If8a3d61cfd08d7d67e32253c3ac7266e5e9e7b4c
2022-11-21 13:02:12 +08:00
Chaohui Wang
7292c4a017
Merge "Use isEssentialPackage instead of isSystemPackage"
2022-11-21 04:45:16 +00:00
Zoey Chen
a0608e1e06
Merge "[Settings] Apply the SettingsDataService to the SIM page, roaming controller"
2022-11-21 03:22:21 +00:00
Jack Yu
063a51a7d7
Merge "Add getSubscriptionId API"
2022-11-21 01:49:01 +00:00
Jack Yu
f4982a080b
Add getSubscriptionId API
...
The old getSubId or getSubscriptionIds return multiple sub ids
per slot index, which is not possible in today's implementation
because the slot index here refers to the logical slot index,
which is also known as phone id, or the logical modem index. In
today's telephony, one logical phone can only have one
subscription at one time, so does the modem.
Bug: 239607619
Test: Manual
Change-Id: I0a43d33daf523e6f0bea054c8965281bafbbcaa4
2022-11-20 12:21:05 -08:00
Bill Yi
d8a6a837ad
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 63a3777a98
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20493535
Change-Id: I55b02eab4056719efd98a87ffff956cb82db0f76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-20 02:46:00 +00:00
Arc Wang
bc736f3861
Merge "Should not show loading animation after size loading complete"
2022-11-20 02:25:40 +00:00
Bill Yi
63a3777a98
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod
2022-11-20 02:11:35 +00:00
Bill Yi
8c04fd454b
Merge changes from topic "tc_change_22111610_27"
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 214458021a
Import translations. DO NOT MERGE ANYWHERE
2022-11-20 02:11:35 +00:00