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
Yanli Wan
2445e98020
Merge "Hide Device Lock settings screen if device lock manager is not available" into udc-devicelock-prod am: 2db0f47240
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23684870
Change-Id: Ie16f3870f7e6d5f0939c762f7be2be2b9a8f1f22
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-15 21:09:44 +00:00
Lifu Tang
5ef1e90b53
Update location settings status text to use slash
...
This change is to comply with the new UX guideline that requires the
punctuation used after "On" or "Off" state to be a slash instead of a
dash.
Bug: 259364228
Test: manual.
Change-Id: I0e63fd66aa6f4479a6f0c6e5a58d3e0f9b5b10e9
2023-06-15 13:58:51 -07: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
Yanli Wan
2db0f47240
Merge "Hide Device Lock settings screen if device lock manager is not available" into udc-devicelock-prod
2023-06-15 20:34:59 +00:00
Chun-Ku Lin
802978fd80
Use FakeTimer in test to avoid flakiness.
...
**Root cause**
ScreenFlashNotificationColorDialogFragment creates Timer which spawns
unmanageable threads for tests. Also, the test itself uses Thread.sleep
which makes it non-destermistic.
Bug: 279082331
Test: atest ScreenFlashNotificationColorDialogFragmentTest --iteration
20
Change-Id: Id49c8d402a0578f8297ca12fe49da304c7a988d8
2023-06-15 18:20:23 +00:00
Evan Chen
81893c2b6f
Make sure work profile app cant enable notification listener services
...
Fix: 282934003
Test: Run test app in work profile
Change-Id: I7fed6d1baa1a40e9126493d37e33d63236bb4b3c
2023-06-15 17:03:15 +00:00
Treehugger Robot
deaa92ead5
Merge "[Settings] Fix roboletric test fail and add new test case." into udc-dev am: 08366227b5
am: 44fddb456e
am: 7c55f015d7
am: be22bc072a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23691723
Change-Id: Iabdf408f4223c40af52e1955650ed6a83e11d8b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-15 14:04:01 +00:00
Treehugger Robot
82b931b096
Merge "[Settings] Fix roboletric test fail and add new test case." into udc-dev am: 08366227b5
am: c14daa817b
am: c88e678aa9
am: 6a2327f7fe
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23691723
Change-Id: Icc30eabadc43e4d0435cefc890655d4fdd18f110
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-15 14:02:27 +00:00
Treehugger Robot
0700358e5d
Merge "'Mobile plan' is searchable even if it is unavailable" am: a3f9f42b71
am: 2c73cc8ca8
am: 2010c175a6
am: 2d23561a25
am: c68d307ca8
am: 89639372d5
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2625935
Change-Id: I1075b8cbccae3b80445713e3765307fabeeb12ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-15 13:59:35 +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
e779b8cd3b
Merge "[Settings] Fix roboletric test fail and add new test case." into udc-dev am: 08366227b5
am: 7af858355b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23691723
Change-Id: I47aac6fd82f06468996a677aa9950e23dbf6ff2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-15 13:10:46 +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
a9abf5c13b
Merge "[Settings] Fix roboletric test fail and add new test case." into udc-dev am: 08366227b5
am: 009c112db2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23691723
Change-Id: Idf443816d43a1fe8be77e94062fafdf58d7e92c5
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
7af858355b
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: I2011813365fc2fe39b0d610cd33885126b1ee609
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-15 12:05:55 +00:00
Treehugger Robot
009c112db2
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: Ifc2273400ae00b6add2c4b20fce660b90bcdd886
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-15 12:05:18 +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
5cc530b6d5
Merge "Fix bluetooth settings pairing page stuck" into udc-qpr-dev am: a1fd330fb5
am: 32c150e8ea
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23657645
Change-Id: I049280a8d5c6654098feace48138e424dde8d040
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-15 11:02:53 +00:00
Chaohui Wang
782df5c6bf
Merge "Remove primaryUserOnly param from UsageStats" into udc-qpr-dev am: 9aa7466cf2
am: afab1d4250
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467963
Change-Id: I772a13b9d70d253c3e63b05bb25b0619823d811c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-15 10:39:10 +00:00
Chaohui Wang
04d431cd8e
Fix SettingsRoboTests am: 36dfb5ac0b
am: 5ec794285e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23696638
Change-Id: I7df4baf13f7c275c782b1181383d3a53aaa5e4cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-15 10:38:57 +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
Rhed Jao
07f9d1ccbe
Merge "[Settings] Add a verification flow for exiting repair mode" into udc-qpr-dev am: e1c9d65cda
am: 721a7bacaa
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23629341
Change-Id: If01a1c5c13433e85f9b91790375dc2f297777dd7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-15 07:19:57 +00:00
TreeHugger Robot
784119340b
Merge "[Settings] Avoid NPE when user enter WifiCallingSettings back and forth" into udc-d1-dev am: 1765c1dc6e
am: ee77d651fa
am: f5acc230b3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23695884
Change-Id: Ibfbd74b4c9f2298fe210b22dccf36acb71f3c99c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-15 07:17:44 +00: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
0f2e581635
Merge "[Settings] Imporve MMS message UI state update" into udc-d1-dev am: 8182348d5c
am: d4aa1b65a5
am: 0b25525328
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23669450
Change-Id: I78f6be87145c2320113e6d10733d96a14dec59f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-15 04:47:52 +00:00