Bill Yi
9edf806ba6
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: bfde831c44
-s ours am: 41ce899068
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23765258
Change-Id: I70888ee81d9f732e36e26d9973fd41d9b333ad24
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-21 21:17:21 +00:00
Bill Yi
1ab65c1eee
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6072ca10ec
-s ours am: 1e96e76303
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23765258
Change-Id: If91d2debcd0473118ad961acd596c9416429ff24
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-21 21:17:11 +00:00
Bill Yi
afe4c272b1
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b37162ce4a
-s ours am: ea4210eaa2
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23765255
Change-Id: I53f8cd2cbfde565db968258fb19252868068cfc6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-21 21:17:07 +00:00
Bill Yi
41ce899068
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: bfde831c44
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23765258
Change-Id: I8c48ccb9155ac97fb569e13504dcd262970df059
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-21 21:01:26 +00:00
Bill Yi
1e96e76303
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6072ca10ec
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23765258
Change-Id: If55db97addae5d0c38c1434b0b26229bc28a2f31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-21 21:01:21 +00:00
Bill Yi
ea4210eaa2
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b37162ce4a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23765255
Change-Id: I0964084a146f7a227407ba55eaae3c280a7140cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-21 21:01:10 +00:00
Bill Yi
bfde831c44
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev
2023-06-21 19:19:29 +00:00
Bill Yi
6072ca10ec
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I8c5e78d87373a142a4082f9081a28027d239af45
2023-06-21 07:16:56 -07:00
Bill Yi
b37162ce4a
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ia31b10a26fde9ae0f51940ad59e4746ead5fa70b
2023-06-21 07:15:19 -07:00
Treehugger Robot
fa2f6edc55
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 8e3c231438
-s ours am: 3a3d7e41a3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23754633
Change-Id: I3d357610f0a41ff7edc1e8ef567c5240662df040
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-21 06:53:51 +00:00
Bill Yi
450076d57b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dd95a8a7c8
-s ours am: ed188e243f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23754633
Change-Id: I90244747007a95bab7e6ccf62978b8f5a6378919
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-21 06:53:38 +00:00
Bill Yi
d35f04d453
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d0213cd684
-s ours am: 5499c23607
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23754632
Change-Id: I416fd31a3dd136ff958eab36b738d370e582a483
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-21 06:53:23 +00:00
Treehugger Robot
3a3d7e41a3
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 8e3c231438
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23754633
Change-Id: I913ac0acef2a70a9e3619e380e8dcca3764451c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-21 06:37:23 +00:00
Bill Yi
ed188e243f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dd95a8a7c8
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23754633
Change-Id: I06a42857f8ef4d119b5f0fc00a3a2b33e02ce715
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-21 06:37:18 +00:00
Bill Yi
5499c23607
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d0213cd684
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23754632
Change-Id: Ida4fe997bc0b5c67ee638d5ae40ef97d4d9e4428
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-21 06:36:53 +00:00
Treehugger Robot
8e3c231438
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev
2023-06-21 06:19:35 +00:00
TreeHugger Robot
d6ae6f8655
Merge "Remove Wi-Fi hotspot from settings search for non-admin users" into udc-d1-dev am: c548cdc4a9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23753764
Change-Id: I8eb18e0f788a9a26da01222abd17149c350fc4ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-21 05:02:26 +00:00
TreeHugger Robot
c548cdc4a9
Merge "Remove Wi-Fi hotspot from settings search for non-admin users" into udc-d1-dev
2023-06-21 04:25:57 +00:00
Bill Yi
dd95a8a7c8
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I3c3068ef9ae4cfd121798c3247328a8ebaadf22a
2023-06-20 19:30:31 -07:00
Bill Yi
d0213cd684
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I7725eba9eba2160e5a330d92a312f45d677b91a7
2023-06-20 19:28:50 -07:00
Rambo Wang
de5c8613ba
Merge "Fix Settings app ANR due to blocking IDumpstateDevice IPC call" into udc-qpr-dev
2023-06-21 01:48:56 +00:00
Candice Lo
290d241b1b
Merge changes I75d810e4,I50111f0c into udc-qpr-dev
...
* changes:
Doing null check before generating Extra Dim tooltip
Doing null check before generating Font Size tooltip
2023-06-21 00:51:48 +00:00
Weng Su
7bd6646e5f
Remove Wi-Fi hotspot from settings search for non-admin users
...
- Don't use ViewModel if the settings UI is restricted
Bug: 284931681
Test: manual test
atest -c WifiTetherSettingsTest
Change-Id: I3ae23b01b3be821c3560552b39cbd83ab51b2095
2023-06-21 06:58:18 +08:00
Julia Tuttle
87d6681e8b
Merge "Fix colors in importance and conversation priority preferences" into udc-dev am: bd74e47e5e
am: 4d3b967fb8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23690613
Change-Id: I351f38d15518deac4a5fd109b79b9ba6368d001e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-20 17:50:52 +00:00
Julia Tuttle
4d3b967fb8
Merge "Fix colors in importance and conversation priority preferences" into udc-dev am: bd74e47e5e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23690613
Change-Id: Id026252a0ef651a3ef12d1e1fdbf261368f0d18e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-20 17:06:35 +00:00
Julia Tuttle
bd74e47e5e
Merge "Fix colors in importance and conversation priority preferences" into udc-dev
2023-06-20 16:21:01 +00:00
YK Hung
ca2d241193
Merge "Update tablet help article link (1/2)" into udc-dev am: a4f67e02c8
am: a2c73328eb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23695285
Change-Id: I796b185b0dfbb3322289913c87a220a4501fdd1d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-20 07:51:01 +00:00
YK Hung
a2c73328eb
Merge "Update tablet help article link (1/2)" into udc-dev am: a4f67e02c8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23695285
Change-Id: I67be253b5b2560bdbe9869376bfa394772fadf3f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-20 07:05:48 +00:00
YK Hung
a4f67e02c8
Merge "Update tablet help article link (1/2)" into udc-dev
2023-06-20 06:34:46 +00:00
TreeHugger Robot
fcd80ade3b
Merge "Update BatterySettingsFeatureProvider interface" into udc-qpr-dev
2023-06-20 02:08:25 +00:00
Rambo Wang
7d44d3276a
Fix Settings app ANR due to blocking IDumpstateDevice IPC call
...
This CL fixes the ANR by moving possible blocking IDumpstateDevice
IPC call from main thread to background thread.
Settings develop options depends on IDumpstateDevice IPC call to
set and get Vendor Verbose Logging feature. The IPC may occasionally
get blocked in system_server which is extremely busy (e.g. during
bugreport generating). This may cause Settings app crashing with ANR.
Bug: 287126040
Bug: 280015761
Test: atest EnableVerboseVendorLoggingPreferenceControllerTest
Test: Verbose Vendor Logging regression
Test: Stress test (heavily trigger on/off during BR generating)
Merged-In: I0b88ef089097930b62dcb1cb7d6fe9990356ab5d
Change-Id: I0b88ef089097930b62dcb1cb7d6fe9990356ab5d
(cherry picked from commit f7b8d687bf
)
2023-06-19 16:51:01 +00:00
Chaohui Wang
542ef9e5b2
[LE Broadcast] Fix crash when scan QR code am: c91d017080
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23729065
Change-Id: I6e14d7a963c2a81b48111d6103502288b23215b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-19 07:05:44 +00:00
Chaohui Wang
7aaceaa782
[lint] Fix Wrong Resource Type
...
Bug: 285231003
Test: m Settings
Change-Id: I8dfbaf1342f014af35cd08906ac3f498b6c8c11a
2023-06-19 10:17:35 +08:00
Candice Lo
48999d3808
Doing null check before generating Extra Dim tooltip
...
Since the lifecycle of controller is independent of that of preference,
we do null check on the switch to avoid generating tooltip from the
switch when it is not ready. The fix is a temporary solution for the
issue and we would like to move the logic of tooltip to systemUI to
match the general view's lifecycle in the future.
Bug: 286810561
Test: manually - check the tooltip won't be shown and also won't cause exception after rotating the phone. (The switch view has not been created if it is out of screen.)
Test: manually - attach video to the bug
Test: make RunSettingsRoboTests ROBOTEST_FILTER=AccessibilityQuickSettingsPrimarySwitchPreferenceControllerTest
Change-Id: I75d810e4b85baf06d57a3e31797a55daac791b79
2023-06-17 09:37:04 +00:00
Candice Lo
b66f6b67c8
Doing null check before generating Font Size tooltip
...
Since the lifecycle of controller is independent of that of preference,
we do null check on the seekbar to avoid generating tooltip from the
seekbar when it is not ready. The fix is a temporary solution for the
issue and we would like to move the logic of tooltip to systemUI to
match the general view's lifecycle in the future.
Bug: 279549685
Test: manually - check the tooltip won't be shown and also won't cause exception after rotating the phone. (The seekbar view has not been created if it is out of screen.)
Test: manually - attach video to the bug
Test: make RunSettingsRoboTests ROBOTEST_FILTER=PreviewSizeSeekBarControllerTest
Change-Id: I50111f0cc59cad4401ab67b06cd62e9067e8ed76
2023-06-17 09:36:40 +00:00
Treehugger Robot
7d837a745a
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: Ia18d8a3915dbea04de48d6306f12ce81a361dc5e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-17 07:06:17 +00:00
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