TreeHugger Robot
7d941f3e34
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: Ic8c4d4ddb031a1d47ac359b78ba50b33048fab1b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-17 07:05:59 +00:00
Treehugger Robot
d9c0cf79e8
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: Ic3a17c6731869827bfff43d8a5de227ea0f9a657
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-17 07:05:29 +00:00
Matías Hernández
097f9ce7b1
[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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23563581
Change-Id: Ifbf04a100776ccbb6bb627652064584a94e65eac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-17 07:05:06 +00:00
Matías Hernández
7b36addbb2
[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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23563581
Change-Id: Idbfb483da8370a173c35b20c9c61563913455e6f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-17 07:04:38 +00:00
Matías Hernández
6ca31b9630
Don't hide approved NLSes in Settings am: ff255c6eda
am: 50df60c93c
am: a49e14f8ff
am: 0aa241be99
am: 0166bcc776
am: 46cdbed02e
am: a820fd4bce
am: 0bdda899d3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23563580
Change-Id: Ia4171da942ba43cb37e6540a3e484e86a445684f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-17 07:04:19 +00:00
Matías Hernández
f5355dbb51
Don't hide approved NLSes in Settings am: ff255c6eda
am: 50df60c93c
am: a49e14f8ff
am: 0aa241be99
am: 2b1faa0aea
am: dcbe38baa9
am: e8cfc9cb3d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23563580
Change-Id: I152c75f7bde652a89db3780858914d31751b2ddd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-17 07:04:00 +00:00
Treehugger Robot
7abcb94693
Merge "Fix Hotspot & tethering settings crash" into udc-d1-dev am: 3494d09de4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23691725
Change-Id: I2cc82b781919c303a70bcdb39c162d5a68fa7e34
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-17 07:01:44 +00:00
TreeHugger Robot
1bc160c342
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 90cf6e8a3c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664848
Change-Id: I7a65d2d7176fa864f1133165680d64c6424f3747
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-17 06:03:03 +00:00
Bill Yi
48534e61a8
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: db8e6f51ff
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664848
Change-Id: I2ab2b12c9e803664792e848a06c706255df36362
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-17 06:02:58 +00:00
TreeHugger Robot
636c7ba7c1
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 9d38813d4b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664845
Change-Id: I2d790bcc16451d6774c135fa36c99a79a7304313
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-17 06:02:52 +00:00
Bill Yi
133e504b7e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b47c44e4dd
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664845
Change-Id: I589fbeeaf83e149aea616634f01d0c81e2321826
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-17 06:02:20 +00:00
TreeHugger Robot
9d9a674b40
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: c937ce7a22
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664036
Change-Id: I937087f8bd1fd457a00ade60bf0734aad317e2a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-17 06:02:01 +00:00
Bill Yi
f859b36ddb
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 948e9dd4e3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664036
Change-Id: I136aeaefefff80d8a6ee29236d0f5b623d50a446
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-17 06:01:45 +00:00
Yi-Ling Chuang
2a9b9cfd4c
Update BatterySettingsFeatureProvider interface
...
Added context to each method for more flexibility.
Bug: 276399056
Test: robotests
Change-Id: I0bbf8841775bc2f584d66c59c2c78ed4e5c951c2
2023-06-17 12:49:46 +08:00
Julia Tuttle
b23136041d
Fix colors in importance and conversation priority preferences
...
This would have been simpler and faster, but the ChannelPanelActivity
was giving me a context where Material colors always inflated in light
theme even if the device was in dark theme, so I had to work around it.
On the plus side, whoever next needs to change these colors will find
them neatly organized in themes.xml!
Bug: 284380876
Test: manual
Change-Id: I2eee877fe44d307a96d60168d0317444ff002669
2023-06-16 19:17:09 +00:00
Chaohui Wang
c91d017080
[LE Broadcast] Fix crash when scan QR code
...
Crash happens when rotated screen.
QrCodeScanModeFragment should only have default constructor.
Remove unused params to fix.
To start this page,
adb shell am start \
-a android.settings.BLUETOOTH_LE_AUDIO_QR_CODE_SCANNER
Fix: 287363885
Test: Manually
Change-Id: I3c4bcfdb8ae6ddf750e16d8e7565cb9d45d11788
2023-06-16 16:10:53 +00:00
Tetiana Meronyk
e992927655
Merge "Add padding to dialog" into udc-qpr-dev
2023-06-16 11:56:04 +00:00
Chaohui Wang
879ff5f271
Merge "Migrate PlatformCompat App List to SPA" into udc-qpr-dev
2023-06-16 07:59:01 +00:00
Treehugger Robot
9718f0e04f
Merge "Guard slices from being requested by guest user" into udc-qpr-dev
2023-06-16 01:14:40 +00:00
Treehugger Robot
474a9393c8
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: b8ddf4126c
-s ours am: ee8cd42af0
-s ours am: 2f6b7bea9b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664034
Change-Id: I001e19d72c81ff2faf24d79ac7ade1899fc11b89
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-15 22:19:25 +00:00
Bill Yi
042c7ca3f3
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 49d00437a6
-s ours am: 4368d3a79a
-s ours am: 39dbfc2e78
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664034
Change-Id: I5b7fbb5b2a749ac243a6265fffed30f849558836
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-15 22:19:22 +00:00
Treehugger Robot
36f6b1720a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: a505517090
-s ours am: a7bcd85abc
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664847
Change-Id: I607b78b45ccb32ca971b04188c5ed836bc9fa636
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-15 22:18:35 +00:00
Bill Yi
51f878871b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 58628e0170
-s ours am: ee15b19128
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664847
Change-Id: I8ab2d0e2129f29e69cdb17dd831cc9166328002e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-15 22:18:28 +00:00
Treehugger Robot
a68566dd5c
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: c706f8544d
-s ours am: 3ea3bb83ae
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664844
Change-Id: I79c3c5d81db0e72bd300366bf04d8b961fae88cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-15 22:18:23 +00:00
Bill Yi
f8cbacdd78
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 23819646e2
-s ours am: 0138ef4a5e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664844
Change-Id: Ic97ca29b205004829be56d57c0eaadc45d1252d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-15 22:18:04 +00:00
Treehugger Robot
2760803621
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 958690e3a5
-s ours am: 41bd0f8ae1
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664035
Change-Id: I49ce84ffd4d81a8565543003b70d09d31dee653f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-15 22:17:45 +00:00
Bill Yi
b7628ea90a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b86bd3cfe3
-s ours am: bd6c412717
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664035
Change-Id: I2897e553e4340f193135c4c0660b0d2ea834356d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-15 22:17:28 +00:00
Zaiyue Xue
a6c104de54
[automerger skipped] Merge "Don't load battery entry names and icons in offline job to improve memory usage." into udc-dev am: 8c25fe4c60
-s ours am: 8cbeaf6a74
-s ours
...
am skip reason: Merged-In I86f50e953ffd4910acbf9f318e1cc1caa3a7a232 with SHA-1 65cb6ef230
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23596963
Change-Id: I8849da1171750b8ee2b00bc4c02dba5c64f69609
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-15 22:16:09 +00:00
Zaiyue Xue
fb9bc753fe
[automerger skipped] Don't load battery entry names and icons in offline job to improve memory usage. am: ec032710dc
-s ours am: d593cb5284
-s ours
...
am skip reason: Merged-In I86f50e953ffd4910acbf9f318e1cc1caa3a7a232 with SHA-1 65cb6ef230
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23596963
Change-Id: I894a72c3547a75c500ba60a4a07fbd8bb445b7b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-15 22:16:06 +00:00
Treehugger Robot
2f87be66ce
Merge "Shutdown secondary SAP automatically" into udc-d1-dev am: 57522f0fcc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23680143
Change-Id: I6b737218b4bec1500ea31218c0b7d13fb0a57f42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-15 22:15:59 +00:00
Wenhui Yang
8513da9a31
Merge "Fix face model delete message" into udc-d1-dev am: d56f96aaba
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23677227
Change-Id: Ie7dc4d98079153d48dbbf0f82e380ef744abe49d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-15 22:15:44 +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
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
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
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
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
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
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
1765c1dc6e
Merge "[Settings] Avoid NPE when user enter WifiCallingSettings back and forth" into udc-d1-dev
2023-06-15 04:07:32 +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