TreeHugger Robot
f2b4dbf29e
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: b65883e22f
-s ours am: 798d6c5df4
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15222770
Change-Id: I662fd17708384107c65a2402f9ad0c65c5ac10c6
2021-07-07 17:56:42 +00:00
TreeHugger Robot
798d6c5df4
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: b65883e22f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15222770
Change-Id: I51f5acdf164503eb543183299dc235e26a9e5c8e
2021-07-07 17:36:56 +00:00
TreeHugger Robot
b65883e22f
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-07-07 17:25:11 +00:00
Guojing Yuan
0cf54d33f2
Merge "[CDM] Remove CDM companion apps from Connected Devices detail Settings" into sc-dev am: 40dc9d519f
am: fbce4ec0e8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15191229
Change-Id: Id7b35be4f8a8713afa551723302fb35a097bebf9
2021-07-07 17:24:05 +00:00
Guojing Yuan
785acda6d8
Merge "[CDM] Remove CDM companion apps from Connected Devices detail Settings" into sc-dev am: 40dc9d519f
am: e4b60e48de
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15191229
Change-Id: I966d7f664c72a5ce5234bcf7426afe38fa3d7795
2021-07-07 17:15:08 +00:00
Guojing Yuan
fbce4ec0e8
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: Ic31e9b879e36f0a84c0b735015f8dd93207549ff
2021-07-07 17:01:30 +00:00
Guojing Yuan
e4b60e48de
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: Ia1d8ab6f0fd5e71545bccb67985a9186adb29ef0
2021-07-07 17:00:39 +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
Bill Yi
a9f95702cd
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I1f1183b81613d68b64ae7069a571150a634ceead
2021-07-07 15:24:28 +00:00
Marie Matheson
1d0ed65b74
Merge "Move work profile security settings to bottom of list" into sc-dev am: 67c5c5a58e
am: 7ec590a5a1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15216010
Change-Id: I3be513c16a88c1cdfaa596f9963bdbcabac27f92
2021-07-07 11:57:09 +00:00
Marie Matheson
701bd282da
Merge "Move work profile security settings to bottom of list" into sc-dev am: 67c5c5a58e
am: 5023e5613b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15216010
Change-Id: Ie1750933714536ce74a3ad79ed4c40e6268d6650
2021-07-07 11:56:45 +00:00
Marie Matheson
5023e5613b
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: If2147c505c13263f6799d250d70cc437ff0a1c95
2021-07-07 11:40:14 +00:00
Marie Matheson
7ec590a5a1
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: I2a5163c23c36b1a6804e3953f505d6f86c0fb5ac
2021-07-07 11:39:18 +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
84dda30120
Merge "Delay gargabe collection during onDestroy()" into sc-dev am: 3e84dd2783
am: 91f11c9733
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15178137
Change-Id: I9583444f4c94d25e28185179fd008c8db41f35f7
2021-07-07 08:07:07 +00:00
Rubin Xu
efe2e53ba4
Merge "Delay gargabe collection during onDestroy()" into sc-dev am: 3e84dd2783
am: 973b5cf127
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15178137
Change-Id: I31e4dbb192e3a78a9deb137700979b5a78ddc8cf
2021-07-07 07:58:55 +00:00
Rubin Xu
91f11c9733
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: I3da274cfa41a19528df5f736093abf1f17995e8d
2021-07-07 07:50:37 +00:00
Rubin Xu
973b5cf127
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: I7dba6fecb8246296a02d38e27316e9256a9cd8c1
2021-07-07 07:49:43 +00:00
Rubin Xu
3e84dd2783
Merge "Delay gargabe collection during onDestroy()" into sc-dev
2021-07-07 07:29:06 +00:00
Bonian Chen
be67d3ca67
Merge "[Settings] fix for Wifi calling settings page crash" into sc-dev am: a415ecb608
am: faf07387ef
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15125472
Change-Id: If7af800edc45e6d189dca9b1b1494c40f76b3fdf
2021-07-06 16:13:43 +00:00
Bonian Chen
2f2691216a
Merge "[Settings] fix for Wifi calling settings page crash" into sc-dev am: a415ecb608
am: 601ee61c43
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15125472
Change-Id: I109cc8d35611b2bd08e359dee38cc74f5abb7aa0
2021-07-06 16:13:19 +00:00
Bonian Chen
601ee61c43
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: If818cd6fc162dc60c341f37299d4b13fb4dbb816
2021-07-06 15:59:19 +00:00
Bonian Chen
faf07387ef
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: I9ed2d99f853eb1bfe5382b3addc50bc5d56354f7
2021-07-06 15:58:25 +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
c1dd1db8c6
Merge "Fix toggle display and preferen style old style and barely seen in “Vision Settings”" into sc-dev am: 5f0fe5e6c1
am: c3213928cd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15207793
Change-Id: Icf520849463dd447775d3d8e96c8a92a8157548b
2021-07-06 10:37:21 +00:00
Menghan Li
f10b91a731
Merge "Fix toggle display and preferen style old style and barely seen in “Vision Settings”" into sc-dev am: 5f0fe5e6c1
am: 99145e9e34
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15207793
Change-Id: Iad06e7f8fda4f287dd70855cdb7cafb71cb43a31
2021-07-06 10:36:59 +00:00
Menghan Li
99145e9e34
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: If3d364cee22fbaf7d0c42bae05044add58bece8e
2021-07-06 10:25:11 +00:00
Menghan Li
c3213928cd
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: I5a770f682e6c8e48f854fb54c5e06dce1e7d931e
2021-07-06 10:24:19 +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
957ece6934
Merge "Add a developer option to increase nfc stack log level" am: 9d7b0beb87
am: 4909b81006
am: b6e44d16ac
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1733952
Change-Id: Id4648f0fffbb40b8f854cf93dae300f2f923802e
2021-07-06 09:03:59 +00:00
Treehugger Robot
b6e44d16ac
Merge "Add a developer option to increase nfc stack log level" am: 9d7b0beb87
am: 4909b81006
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1733952
Change-Id: I257c6806afcef6211eedc8cf60829f90930a0d32
2021-07-06 08:52:25 +00:00
Treehugger Robot
4909b81006
Merge "Add a developer option to increase nfc stack log level" am: 9d7b0beb87
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1733952
Change-Id: Ie37d07ed9cbce12b9dcd39b332ed2ae66f3edf6c
2021-07-06 08:24:55 +00:00
TreeHugger Robot
b9ac200ab8
Merge "Add comment to AndroidManifest" into sc-dev am: 3bd14d2433
am: dd5fe5e89c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15210536
Change-Id: I629d38e5b50f9e862fcb1d97b02ebca0cc3d5c41
2021-07-06 08:10:15 +00:00
TreeHugger Robot
5e0fd8b811
Merge "Add comment to AndroidManifest" into sc-dev am: 3bd14d2433
am: de5afa63af
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15210536
Change-Id: I39dc33b765c666c3dc62d3c7514fe1d37a45f427
2021-07-06 08:09:48 +00:00
Treehugger Robot
9d7b0beb87
Merge "Add a developer option to increase nfc stack log level"
2021-07-06 08:05:47 +00:00
TreeHugger Robot
de5afa63af
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: I8f4f46a8e6a52d9f27eca8541578d4a58f383b8c
2021-07-06 07:53:11 +00:00
TreeHugger Robot
dd5fe5e89c
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: I39557712f2605a614fd8f916f3a709f7feaa6e79
2021-07-06 07:52:20 +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
c5288c79dc
Merge "Fix accessibility button footer preference did not announced correct by TalkBack" into sc-dev am: bf6af8ac92
am: bd9ed49b1d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15204641
Change-Id: Id609ca21dc9b628496f597c72ade8034fd197c10
2021-07-06 07:28:16 +00:00
Jason Hsu
9761894631
Merge "Fix accessibility button footer preference did not announced correct by TalkBack" into sc-dev am: bf6af8ac92
am: e1a3e74d1e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15204641
Change-Id: I9fab0aa7d11c7607bd9bf73078b958ee9304ace4
2021-07-06 07:27:53 +00:00
Jason Hsu
e1a3e74d1e
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: Ifeb48d6363c5d1186ad6134bba05e6ba319f52bd
2021-07-06 07:18:08 +00:00
Jason Hsu
bd9ed49b1d
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: I1320acb0410f5314f2c9b3aee71706d16927acc7
2021-07-06 07:17:18 +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
5900ac372b
Add SafetyNet logging am: 199528d460
am: b1450e0d75
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15206403
Change-Id: I35d819c51aea99ef46aba56f859b91d4a95c0d7e
2021-07-05 10:16:09 +00:00
Weng Su
b3cc71e75a
Add SafetyNet logging am: 199528d460
am: 7af04e71fa
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15206403
Change-Id: I517aa1ed78efac8a8f916169463e7b9d6ca32b23
2021-07-05 10:15:51 +00:00