Bill Yi
dd6ea5b765
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 29e59fbd3a
-s ours am: c7d760438a
-s ours am: a8cf863944
-s ours am: bb152d28e4
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664033
Change-Id: I046deb79e885c6627556090812ef5edab6cc6cec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-15 21:40:10 +00:00
Bill Yi
6b986ff68c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5e54379b8a
-s ours am: c52befa925
-s ours am: 60f3e2d53d
-s ours am: 3250bc36b7
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664037
Change-Id: I7fca1f629f8e67cc250d13e3b0b2cfebf6bee9b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-15 21:11:49 +00:00
Grace Cheng
71a57d8cec
Merge "Fix NPE in updateAddPreference" into udc-d1-dev am: 8ba960014c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23672674
Change-Id: Ibde63cfed809364db4fdebdc97b45b7dadce5912
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-15 20:50:58 +00:00
Bill Yi
bb152d28e4
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 29e59fbd3a
-s ours am: c7d760438a
-s ours am: a8cf863944
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664033
Change-Id: I686bf55ab0a9dca892457afefa7ae42643ededb6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-15 20:50:17 +00:00
Bill Yi
3250bc36b7
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5e54379b8a
-s ours am: c52befa925
-s ours am: 60f3e2d53d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664037
Change-Id: If29f8749438f3e280674746a7c910698b992973b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-15 20:46:52 +00:00
Tetiana Meronyk
4899e50224
Add padding to dialog
...
Bug: 287265141
Test: on device with multiple admins enabled (default for HSUM) create a new
user and open User details view. Toggle Make this user an admin on/off.
Observe increased padding.
Change-Id: I216a91c4685eb12986cc4c61ae7be439358f55b2
2023-06-15 13:20:17 +00:00
Treehugger Robot
be22bc072a
Merge "[Settings] Fix roboletric test fail and add new test case." into udc-dev am: 08366227b5
am: 44fddb456e
am: 7c55f015d7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23691723
Change-Id: Ifc9247f9ff867c36471a6535ed0d9bdac9993882
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-15 13:11:14 +00:00
Treehugger Robot
6a2327f7fe
Merge "[Settings] Fix roboletric test fail and add new test case." into udc-dev am: 08366227b5
am: c14daa817b
am: c88e678aa9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23691723
Change-Id: I5a33631c2e7ea1030061e997df4eba1af9e8ecbd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-15 13:11:06 +00:00
Treehugger Robot
7c55f015d7
Merge "[Settings] Fix roboletric test fail and add new test case." into udc-dev am: 08366227b5
am: 44fddb456e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23691723
Change-Id: I1123311512c6661013364ccc838b2d7ebb1cc54c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-15 13:09:56 +00:00
Treehugger Robot
89639372d5
Merge "'Mobile plan' is searchable even if it is unavailable" am: a3f9f42b71
am: 2c73cc8ca8
am: 2010c175a6
am: 2d23561a25
am: c68d307ca8
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2625935
Change-Id: I7b52296963a9e838863808db52675f454951ace3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-15 13:09:53 +00:00
Treehugger Robot
c88e678aa9
Merge "[Settings] Fix roboletric test fail and add new test case." into udc-dev am: 08366227b5
am: c14daa817b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23691723
Change-Id: I08ed49fba3fb42bde7c8836666476091cdd1c6f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-15 12:32:02 +00:00
Treehugger Robot
c68d307ca8
Merge "'Mobile plan' is searchable even if it is unavailable" am: a3f9f42b71
am: 2c73cc8ca8
am: 2010c175a6
am: 2d23561a25
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2625935
Change-Id: I7f514c59303087a72787d6c0814ede0ecdf0743d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-15 12:31:02 +00:00
Treehugger Robot
c14daa817b
Merge "[Settings] Fix roboletric test fail and add new test case." into udc-dev am: 08366227b5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23691723
Change-Id: I1e96376f6aec9cce89f71117474bace2d1364505
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-15 12:06:30 +00:00
Treehugger Robot
44fddb456e
Merge "[Settings] Fix roboletric test fail and add new test case." into udc-dev am: 08366227b5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23691723
Change-Id: I2fe19557e53756a2e61071ae530f89756cb32eab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-15 12:05:57 +00:00
Treehugger Robot
2d23561a25
Merge "'Mobile plan' is searchable even if it is unavailable" am: a3f9f42b71
am: 2c73cc8ca8
am: 2010c175a6
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2625935
Change-Id: I575d1fc77fefd4bd5b441403f0bc88cf7ede8b5b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-15 11:44:07 +00:00
Treehugger Robot
08366227b5
Merge "[Settings] Fix roboletric test fail and add new test case." into udc-dev
2023-06-15 11:18:51 +00:00
Treehugger Robot
2010c175a6
Merge "'Mobile plan' is searchable even if it is unavailable" am: a3f9f42b71
am: 2c73cc8ca8
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2625935
Change-Id: I9c423f5290eec4f6a8ac68aca4ece6b6675e7a5f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-15 10:33:50 +00:00
TreeHugger Robot
32c150e8ea
Merge "Fix bluetooth settings pairing page stuck" into udc-qpr-dev am: a1fd330fb5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23657645
Change-Id: I7bb7e5fd8e647e2f99532ef56effcf9b1f10587d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-15 10:18:04 +00:00
Chaohui Wang
afab1d4250
Merge "Remove primaryUserOnly param from UsageStats" into udc-qpr-dev am: 9aa7466cf2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467963
Change-Id: I7d4f1d5299aebc1bc01da4def39703a28d7a5fb3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-15 10:16:53 +00:00
Chaohui Wang
5ec794285e
Fix SettingsRoboTests am: 36dfb5ac0b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23696638
Change-Id: I13783f780c085e99536da114500733b54568227b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-15 10:16:32 +00:00
Treehugger Robot
2c73cc8ca8
Merge "'Mobile plan' is searchable even if it is unavailable" am: a3f9f42b71
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2625935
Change-Id: Id3c8af985ccaaa05e29238bc3c0bcda257fe132e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-15 09:50:45 +00:00
TreeHugger Robot
a1fd330fb5
Merge "Fix bluetooth settings pairing page stuck" into udc-qpr-dev
2023-06-15 09:42:19 +00:00
Chaohui Wang
ed6d6c9e0f
Migrate PlatformCompat App List to SPA
...
So hidden modules are not shown in the list.
This will also improve the developer experience.
Bug: 273913035
Test: Manually with App Compatibility Changes
Test: Unit test
Change-Id: Ic78a51819159a0f848db6173f751b1be8c6b1e70
2023-06-15 09:37:11 +00:00
Chaohui Wang
9aa7466cf2
Merge "Remove primaryUserOnly param from UsageStats" into udc-qpr-dev
2023-06-15 09:29:39 +00:00
Treehugger Robot
a3f9f42b71
Merge "'Mobile plan' is searchable even if it is unavailable"
2023-06-15 08:57:32 +00:00
Chaohui Wang
bb47f32011
Fix bluetooth settings pairing page stuck
...
There is heavy work to do when add device to list in the
DeviceListPreferenceFragment, off load these work from main thread
to solve the issue.
Make devicePreferenceMap a ConcurrentHashMap to avoid potential race
condition.
Also no longer use getCachedPreference(key) since we not put anything
into the cache, the fallback flow is always used.
Also in BluetoothDevicePreference.onPreferenceAttributesChanged(), move
more heavy work to background thread.
Using System.currentTimeMillis() to sort devices could cause flaky
because System.currentTimeMillis() could be same for different device,
use AtomicInteger instead.
Fix: 286628533
Test: Following the step in bug
Change-Id: Ia9750adb6b4c1424d084381e9d7c2ca8e7912391
2023-06-15 08:43:17 +00:00
Chaohui Wang
36dfb5ac0b
Fix SettingsRoboTests
...
Mock the getViewLifecycleOwner in test to fix.
Fix: 287387514
Test: m RunSettingsRoboTests
Change-Id: I346930e9655e4f78227276aee4c2a4e5ae6962e0
2023-06-15 16:33:05 +08:00
Wesley Wang
ddbb5bcd5c
Update tablet help article link (1/2)
...
Bug: 287122689
Test: make SettingsRoboTests
Change-Id: If09f7a6aab01f00bdb1675444237698643e6ba93
2023-06-15 14:38:59 +08:00
Rhed Jao
721a7bacaa
Merge "[Settings] Add a verification flow for exiting repair mode" into udc-qpr-dev am: e1c9d65cda
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23629341
Change-Id: I58bc332082495cf4451228aa8179f6d2e6a2c73b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-15 06:34:53 +00:00
TreeHugger Robot
f5acc230b3
Merge "[Settings] Avoid NPE when user enter WifiCallingSettings back and forth" into udc-d1-dev am: 1765c1dc6e
am: ee77d651fa
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23695884
Change-Id: I70bef64fcefc75fc3d3496c76d4af9c85efdd9c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-15 06:31:38 +00:00
Mill Chen
d4eecf6132
Guard slices from being requested by guest user
...
According to patch of A-231987122, AOSP restricts app to modify relevant
mobile settings when user is a guest. This change intends to prevent the
slices related to mobile settings from being requested by guest user.
Bug: 278616139
Bug: 277333776
Bug: 262244832
Bug: 278616520
Bug: 278615120
Test: robotests
Change-Id: I4dc4bbfdb5cf76e188e6f62ebfd74ef6fa2fe33b
2023-06-15 14:29:01 +08:00
TreeHugger Robot
ee77d651fa
Merge "[Settings] Avoid NPE when user enter WifiCallingSettings back and forth" into udc-d1-dev am: 1765c1dc6e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23695884
Change-Id: I8bbc5d48e272ab0a5b7880f1ee3b99043df64665
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-15 05:00:40 +00:00
Rhed Jao
e1c9d65cda
Merge "[Settings] Add a verification flow for exiting repair mode" into udc-qpr-dev
2023-06-15 04:55:45 +00:00
Treehugger Robot
0b25525328
Merge "[Settings] Imporve MMS message UI state update" into udc-d1-dev am: 8182348d5c
am: d4aa1b65a5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23669450
Change-Id: I403765aae030e5b1aea4482fc161a43932148b30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-15 04:38:06 +00:00
TreeHugger Robot
1765c1dc6e
Merge "[Settings] Avoid NPE when user enter WifiCallingSettings back and forth" into udc-d1-dev
2023-06-15 04:07:32 +00:00
Chaohui Wang
5d847e0207
Merge "Call onViewCreated in DashboardFragment" into udc-qpr-dev am: 8617f63823
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23659924
Change-Id: I71e428a2a332e4ed6f3d4719c28cb5408aeaeb51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-15 03:59:56 +00:00
Treehugger Robot
d4aa1b65a5
Merge "[Settings] Imporve MMS message UI state update" into udc-d1-dev am: 8182348d5c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23669450
Change-Id: I159952074306255db4397de180ee4b49eb78613b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-15 03:53:50 +00:00
Treehugger Robot
8182348d5c
Merge "[Settings] Imporve MMS message UI state update" into udc-d1-dev
2023-06-15 03:02:41 +00:00
Chaohui Wang
8617f63823
Merge "Call onViewCreated in DashboardFragment" into udc-qpr-dev
2023-06-15 03:00:52 +00:00
tom hsu
8bb09238bb
[Settings] Avoid NPE when user enter WifiCallingSettings back and forth
...
Bug: 277833102
Test: Manual test
Change-Id: Ifd3272ddf8b8a27fc7772d860653df2c33a3df7b
2023-06-15 02:58:42 +00:00
Rhed Jao
b7a4a7daa4
[Settings] Add a verification flow for exiting repair mode
...
Handles the ACTION_CONFIRM_REPAIR_MODE_DEVICE_CREDENTIAL
intent to launch the confirm device credential activity for
users to exiting repair mode. The activity passes a special
user id USER_REPAIR_MODE to the framework and verify credentials
that the user enrolled in normal mode.
Bug: 277561275
Test: am start -a android.app.action.PREPARE_REPAIR_MODE_DEVICE_CREDENTIAL
settings put global repair_mode_active 1
am start -a android.app.action.CONFIRM_REPAIR_MODE_DEVICE_CREDENTIAL
The credential is verified successfully.
Change-Id: I9ffe32f9925ee2b990c49d5674d27196a4c9edf7
2023-06-15 02:14:41 +00:00
Hao Dong
a9f1ed3501
Merge "Wait for systemui udfps overlay ready to show settings udfps enroll view." into udc-qpr-dev am: 61659799de
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23595181
Change-Id: Ia545f7902df20a47c6dc154cfb3d781541bb25ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-15 01:45:55 +00:00
Hao Dong
61659799de
Merge "Wait for systemui udfps overlay ready to show settings udfps enroll view." into udc-qpr-dev
2023-06-15 01:22:22 +00:00
Matías Hernández
92fa0bcfd7
[automerger skipped] DO NOT MERGE Don't hide approved NLSes in Settings am: 173cc267e0
am: d7608c84b4
-s ours am: 78a4048eac
-s ours am: b971690a4e
-s ours am: d185f3aebf
-s ours am: 897c8321a6
-s ours am: 14ddd8b659
-s ours am: 85cad88256
-s ours am: 2f1883c397
-s ours am: dfef40cb74
-s ours am: becca315c3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23563581
Change-Id: I0f90e18b865ad25ad462bbb2f9695b6531802317
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 19:15:19 +00:00
Matías Hernández
b3654eefc9
[automerger skipped] DO NOT MERGE Don't hide approved NLSes in Settings am: 173cc267e0
am: d7608c84b4
-s ours am: 78a4048eac
-s ours am: b971690a4e
-s ours am: d185f3aebf
-s ours am: 897c8321a6
-s ours am: 14ddd8b659
-s ours am: 85cad88256
-s ours am: 42339b4e56
-s ours am: 5a51d41a4c
-s ours am: d2d1643c2f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23563581
Change-Id: I2ca95a5fca029075a0d940dbd8029d64d957023d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 19:15:11 +00:00
Matías Hernández
26d18d8182
[automerger skipped] DO NOT MERGE Don't hide approved NLSes in Settings am: 173cc267e0
am: d7608c84b4
-s ours am: 78a4048eac
-s ours am: b971690a4e
-s ours am: d185f3aebf
-s ours am: 897c8321a6
-s ours am: 14c85fff7d
-s ours am: 41d3ecca1c
-s ours am: 5a43ab914c
-s ours am: c2d5f12351
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23563581
Change-Id: I34cb68d75e7763e98b606bb37a0d899fc8dffc77
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 19:15:03 +00:00
Matías Hernández
b6140d21f0
[automerger skipped] DO NOT MERGE Don't hide approved NLSes in Settings am: 173cc267e0
am: d7608c84b4
-s ours am: 78a4048eac
-s ours am: b971690a4e
-s ours am: d185f3aebf
-s ours am: 897c8321a6
-s ours am: 14ddd8b659
-s ours am: 85cad88256
-s ours am: 42339b4e56
-s ours am: 95a2f32e7d
-s ours am: 6c6184ef61
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23563581
Change-Id: I690f62901457f6fc7d0c4b530781aa88dcc710ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 19:14:55 +00:00
Matías Hernández
f87c8ea544
[automerger skipped] DO NOT MERGE Don't hide approved NLSes in Settings am: 173cc267e0
am: d7608c84b4
-s ours am: 78a4048eac
-s ours am: b971690a4e
-s ours am: d185f3aebf
-s ours am: 897c8321a6
-s ours am: 14c85fff7d
-s ours am: 41d3ecca1c
-s ours am: 4226b5bb24
-s ours am: cdca315c80
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23563581
Change-Id: I90a3075baefd09d10da5e13dc4bf22a493525a97
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 19:14:47 +00:00
Matías Hernández
2c36be4494
Don't hide approved NLSes in Settings am: ff255c6eda
am: 50df60c93c
am: a49e14f8ff
am: 0aa241be99
am: 0166bcc776
am: 46cdbed02e
am: bbfe425326
am: ed1b91ffdc
am: c39ab727ab
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23563580
Change-Id: Iadbb767394a51f256643eeaafee0f71f1a62487c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 19:14:39 +00:00
Matías Hernández
7df9182d8c
Don't hide approved NLSes in Settings am: ff255c6eda
am: 50df60c93c
am: a49e14f8ff
am: 0aa241be99
am: 0166bcc776
am: 46cdbed02e
am: a820fd4bce
am: 68a0fc9469
am: 209fe19e63
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23563580
Change-Id: Ia06a25c6ba863003118c65f5141b5e11bd7991d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 19:14:30 +00:00