Guojing Yuan
e28bdeaf85
Merge "[CDM] Remove CDM companion apps from Connected Devices detail Settings" into sc-dev am: 40dc9d519f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15191229
Change-Id: I5881acc04a189a0fe2de7dcf2532a706fa0966b2
2021-07-07 17:00:45 +00:00
Guojing Yuan
40dc9d519f
Merge "[CDM] Remove CDM companion apps from Connected Devices detail Settings" into sc-dev
2021-07-07 16:50:01 +00:00
Marie Matheson
8b8ddb89e6
Merge "Move work profile security settings to bottom of list" into sc-dev am: 67c5c5a58e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15216010
Change-Id: Ibb671b4ef501681f80aa9fafee7b02716b269179
2021-07-07 11:39:21 +00:00
Marie Matheson
67c5c5a58e
Merge "Move work profile security settings to bottom of list" into sc-dev
2021-07-07 11:29:22 +00:00
Marie Matheson
aeafb02074
Move work profile security settings to bottom of list
...
Bug: 192540530
Test: atest SettingsUnitTests
Test: make -j80 RunSettingsRoboTests
Test: Tested manually with and without work profile
Change-Id: I29f43202f71388c991948953c3d2c955fd32627e
2021-07-07 09:02:32 +00:00
Rubin Xu
841a92e9dc
Merge "Delay gargabe collection during onDestroy()" into sc-dev am: 3e84dd2783
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15178137
Change-Id: I7d5f0798ef53751be363f2d8df44b14a8c7a3d7c
2021-07-07 07:49:42 +00:00
Rubin Xu
3e84dd2783
Merge "Delay gargabe collection during onDestroy()" into sc-dev
2021-07-07 07:29:06 +00:00
Bonian Chen
5c297fa5c8
Merge "[Settings] fix for Wifi calling settings page crash" into sc-dev am: a415ecb608
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15125472
Change-Id: I7e4610579899c20c741a6c5d40440378a968e148
2021-07-06 15:58:29 +00:00
Bonian Chen
a415ecb608
Merge "[Settings] fix for Wifi calling settings page crash" into sc-dev
2021-07-06 15:46:37 +00:00
Bonian Chen
e530d93382
[Settings] fix for Wifi calling settings page crash
...
UI crash reported due to accessing telephony framework API with invalid
subscription ID from SIM. Which comes with multiple reason.
Besides of avoidance of crash, following updates are also required:
1. Close wifi calling settings UI when pSIM or eSIM not available or
inserted.
2. Keep the selection of tab (under multi-SIM) when screen rotate
3. Only show 1 SIM when multi-SIM are grouped together
Bug: 149190278
Test: local
Change-Id: Ied9a088b6ee5da66972f27649cc07f4a31304f17
(cherry picked from commit fbe1293a54
)
(cherry picked from commit 05f29efe34
)
2021-07-06 12:38:45 +00:00
Menghan Li
1609504fa3
Merge "Fix toggle display and preferen style old style and barely seen in “Vision Settings”" into sc-dev am: 5f0fe5e6c1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15207793
Change-Id: I5b0f257d4d7b5b77f1fad721795809d482beaee1
2021-07-06 10:24:20 +00:00
Menghan Li
5f0fe5e6c1
Merge "Fix toggle display and preferen style old style and barely seen in “Vision Settings”" into sc-dev
2021-07-06 10:07:52 +00:00
TreeHugger Robot
86928d4f6a
Merge "Add comment to AndroidManifest" into sc-dev am: 3bd14d2433
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15210536
Change-Id: I0b4d14d974425196ab2870e7d3159f85a2c74586
2021-07-06 07:52:23 +00:00
TreeHugger Robot
3bd14d2433
Merge "Add comment to AndroidManifest" into sc-dev
2021-07-06 07:34:29 +00:00
menghanli
e18c419f94
Fix toggle display and preferen style old style and barely seen in “Vision Settings”
...
Root cause: Apply ThemeHelper.trySetDynamicColor would overlay the
settings style.
Solution: Create SudDynamicColorThemeSettings.SetupWizard to support
dynamicColor and settings style.
Bug: 192410829
Test: manual test
Change-Id: Ic196dfe417e7f804c68ed4ea7bc05b4716999bcf
2021-07-06 15:32:34 +08:00
Jason Hsu
336cfe271f
Merge "Fix accessibility button footer preference did not announced correct by TalkBack" into sc-dev am: bf6af8ac92
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15204641
Change-Id: I85699714907df0027c81542ea89c60a02335fb06
2021-07-06 07:17:20 +00:00
Jason Hsu
bf6af8ac92
Merge "Fix accessibility button footer preference did not announced correct by TalkBack" into sc-dev
2021-07-06 06:57:30 +00:00
jasonwshsu
3cb889fc78
Fix accessibility button footer preference did not announced correct by TalkBack
...
Root Cause: Description would be altered after displayPreference(), but getSummary() would be called after it.
Solution: Update title before displayPreference(), then it could be set correctly.
Fix: 192738520
Test: atest AccessibilityButtonFooterPreferenceControllerTest
Change-Id: I068994fca8202b166fedf43f9d9657b0c1a64c4e
2021-07-06 06:57:22 +00:00
Weng Su
56a88885cc
Add comment to AndroidManifest
...
- Wi-Fi result data will only be returned from WifiDialogActivity if the
calling package has location permission.
Test: add comment only, no test required.
Bug: 185126813
Change-Id: I81c4d801c4ee211f43a1688a62daaff3b47eae1a
2021-07-06 11:30:17 +08:00
Weng Su
7066e8a96c
Add SafetyNet logging am: 199528d460
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15206403
Change-Id: Ie550f3a2f8f7f3d458a70b8219fb8177198f003a
2021-07-05 10:02:56 +00:00
Weng Su
199528d460
Add SafetyNet logging
...
- Add SafetyNet log if the calling package is no the permission for
result
Test: checked eventlog in the bugreport
Bug: 185126813
Change-Id: I1535f6f2ded2445702df0d723518b773cd094164
2021-07-05 16:02:40 +08:00
TreeHugger Robot
48ddec81c9
Merge "Add permission checking to WifiDialogActivity" into sc-dev am: 27c928856e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15187819
Change-Id: I32f8e09f3578efd99529a1ffbace11bba5beeda3
2021-07-05 03:06:36 +00:00
TreeHugger Robot
27c928856e
Merge "Add permission checking to WifiDialogActivity" into sc-dev
2021-07-05 02:54:05 +00:00
Bill Yi
de8561cb59
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cdb5f60c02
-s ours am: 7a63583890
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15204287
Change-Id: I8d11fa560544e659e280a01433f99cc5f0f096e1
2021-07-05 02:17:08 +00:00
Bill Yi
7a63583890
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cdb5f60c02
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15204287
Change-Id: I52dfa808ef1b1332c896bbf4d56d4b29eb563f0d
2021-07-05 02:06:00 +00:00
Bill Yi
b0b837ee3d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a50ce69307
-s ours am: e31d245b85
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15204285
Change-Id: Ia8db0337967d5ad047a8a2770cb257e9c61c2c0b
2021-07-05 01:38:59 +00:00
TreeHugger Robot
f3afaf5587
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 8b081a94e8
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15204289
Change-Id: I009a3c4342a965350ded79601028141a3c4d3782
2021-07-05 01:38:35 +00:00
Bill Yi
e31d245b85
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a50ce69307
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15204285
Change-Id: I1313fb1cd598dc572865aa1a3a89d33f28b00993
2021-07-05 01:31:01 +00:00
TreeHugger Robot
8b081a94e8
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-07-05 01:21:22 +00:00
TreeHugger Robot
377b335b84
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod
2021-07-05 01:14:32 +00:00
Bill Yi
05728aa3a9
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I60ed13bac2a0c0dc4aa5ef847ba147994a3adc4d
2021-07-04 22:38:10 +00:00
Bill Yi
cdb5f60c02
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I852a10fd9a6a5b85f560bfdbf1d7c962994ed60b
2021-07-04 22:25:35 +00:00
Bill Yi
e601abf9c5
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I41e55cee77fbc3d604b9616f47a66a88e0c3a6e8
2021-07-04 22:18:12 +00:00
Bill Yi
a50ce69307
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I16a5257336b666f8c11fa7900b37a661a53b1b25
2021-07-04 22:14:39 +00:00
Rajeev Kumar
43b16c4704
Merge "Show device admin warning dialog if force stop is not allowed" into sc-dev am: dc07fe1ad1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15179293
Change-Id: I39af0d099e45634c19aa8bad49cf980e883d19a9
2021-07-04 20:23:27 +00:00
Rajeev Kumar
dc07fe1ad1
Merge "Show device admin warning dialog if force stop is not allowed" into sc-dev
2021-07-04 19:14:33 +00:00
TreeHugger Robot
2bf090214c
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: a69ea45cf7
-s ours am: 010ea5488d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15193341
Change-Id: I6d0a894232eaa31a6fda0e36940db92f8eb91448
2021-07-03 04:07:33 +00:00
Bill Yi
11b3faef4a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d1c91f40f0
-s ours am: 42ead3c52e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15193346
Change-Id: I50455e68b7bf3b4f5ab9547168653746d5fd1d82
2021-07-03 04:07:18 +00:00
TreeHugger Robot
010ea5488d
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: a69ea45cf7
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15193341
Change-Id: I9178f7fe03da40f82a9d4a76c8e489d579b23dca
2021-07-03 04:00:18 +00:00
Bill Yi
42ead3c52e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d1c91f40f0
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15193346
Change-Id: Ia26fe52f2e7c8c707bc41238a5943b248bc03ee8
2021-07-03 03:49:59 +00:00
TreeHugger Robot
4be3c66e61
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod
2021-07-03 03:43:16 +00:00
TreeHugger Robot
5a45abf341
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 3dd0be61d1
-s ours am: b9a9b7c6d2
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15193891
Change-Id: Icfa0b5c5128d9b9a4590daee44b44e2405315b8a
2021-07-03 03:43:03 +00:00
Bill Yi
60ee59bfbf
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6542938cff
-s ours am: 5cc1907655
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15193890
Change-Id: I68a5f9dcf6c64b5f3a0506ee29b61d805d469f47
2021-07-03 03:42:47 +00:00
TreeHugger Robot
0bfe89f009
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 2c06b8e320
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15193895
Change-Id: I54ca75dde0453775b34167c67a369223f816230f
2021-07-03 03:41:42 +00:00
TreeHugger Robot
b660f06960
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod
2021-07-03 03:37:07 +00:00
TreeHugger Robot
a69ea45cf7
Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod
2021-07-03 03:32:18 +00:00
TreeHugger Robot
b9a9b7c6d2
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 3dd0be61d1
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15193891
Change-Id: Ibad4f24564961c34636570fc326270f243325db5
2021-07-03 03:29:26 +00:00
Bill Yi
5cc1907655
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6542938cff
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15193890
Change-Id: I84e0049f2174ba96ac88dc1585ab116c44a16dcf
2021-07-03 03:29:20 +00:00
TreeHugger Robot
3dd0be61d1
Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev
2021-07-03 03:22:46 +00:00
TreeHugger Robot
2c06b8e320
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-07-03 03:22:36 +00:00