Bill Yi
95cc19bcdc
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 674c4b2104
-s ours am: 8bcdd557ad
-s ours am: b4fb92af4b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16986294
Change-Id: Ic3562f9803108f9cda6532ef76d1cbabbb79d7ff
2022-02-24 19:31:32 +00:00
Bill Yi
b4fb92af4b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 674c4b2104
-s ours am: 8bcdd557ad
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16986294
Change-Id: Ic09273a1108e7c9942dea93c8b8800d4d3c7417a
2022-02-24 19:01:27 +00:00
TreeHugger Robot
a56f67de96
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 24bd47eda7
-s ours am: 7b4af603b6
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16985985
Change-Id: Ie4594afe0eb4a0585fc8ee9cb44e2f4cebbf9c9e
2022-02-24 18:50:49 +00:00
Bill Yi
5d831202b5
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f3ce34203a
-s ours am: 4c23b861ce
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16985985
Change-Id: I40a67e26671680aa33c5f48c48f16c5025067ee9
2022-02-24 18:50:47 +00:00
Bill Yi
49b531be9c
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: b07f4eca84
am: 85de1c63a0
-s ours am: 1f54a37763
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16986289
Change-Id: I047034a51ff408c903e9932170f468d635a81094
2022-02-24 18:49:05 +00:00
Bill Yi
8bcdd557ad
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 674c4b2104
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16986294
Change-Id: Ica0ed6810627f1fd0d72ca966f1096285ef2e40e
2022-02-24 18:37:13 +00:00
TreeHugger Robot
7b4af603b6
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 24bd47eda7
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16985985
Change-Id: I08953b72649f22b940aa71035fd74d5f168143c9
2022-02-24 18:26:32 +00:00
Bill Yi
4c23b861ce
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f3ce34203a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16985985
Change-Id: Idec4de9dc19f222445eb564a4ddaf75425f96f14
2022-02-24 18:26:30 +00:00
Bill Yi
1f54a37763
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: b07f4eca84
am: 85de1c63a0
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16986289
Change-Id: I7933a10f4846837ef65d4cb98a0e896bef9db840
2022-02-24 18:26:06 +00:00
TreeHugger Robot
24bd47eda7
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod
2022-02-24 18:00:29 +00:00
Julia Reynolds
9d01ed5377
Merge "Remove unnecessary async" into tm-dev am: 1d15b24da2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16990592
Change-Id: I748563c902ee32443596e6e95a5784dfdcbd6b9d
2022-02-24 15:46:23 +00:00
Julia Reynolds
1d15b24da2
Merge "Remove unnecessary async" into tm-dev
2022-02-24 15:30:02 +00:00
TreeHugger Robot
606488fea8
Merge changes from topic "presubmit-am-517a2e2cb73c439791517b439db33212" into sc-mainline-prod am: 2555e0d2e3
am: fd9774a633
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16934955
Change-Id: I3aa3946eb83e2f47bf155d3a147d04390ec91234
2022-02-24 13:57:29 +00:00
Bill Yi
548359ddf9
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: bfb1c0090c
am: 8e58f10261
-s ours am: 23bac2fa39
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16934955
Change-Id: Id021f7b3061fc2b31c5d7c5d52f6cd1e3b571a58
2022-02-24 13:57:25 +00:00
Bill Yi
a6182064cb
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 41068978bb
-s ours am: fd463afb87
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16934952
Change-Id: I5dc2b64ab281b5f5a47654b6e0d7953b852871e8
2022-02-24 13:57:18 +00:00
TreeHugger Robot
fd9774a633
Merge changes from topic "presubmit-am-517a2e2cb73c439791517b439db33212" into sc-mainline-prod am: 2555e0d2e3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16934955
Change-Id: I6c5a360d12c0b093f960a4916173d6e58549cfbd
2022-02-24 13:56:58 +00:00
Bill Yi
23bac2fa39
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: bfb1c0090c
am: 8e58f10261
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16934955
Change-Id: Ic540fe2f3bf75422c829fb89b022e69cc9535fad
2022-02-24 13:56:47 +00:00
PETER LIANG
713208f556
Merge "Polish and humanize the summary for Display/Font size." into tm-dev am: 78310383b0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16996808
Change-Id: Iaa997f919b2ba28d352de910d53f0bb78316c906
2022-02-24 13:54:51 +00:00
Bill Yi
fd463afb87
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 41068978bb
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16934952
Change-Id: Iad43b14f466e956f7d7df3e6ff3cbff9b195d448
2022-02-24 13:52:48 +00:00
PETER LIANG
78310383b0
Merge "Polish and humanize the summary for Display/Font size." into tm-dev
2022-02-24 13:28:17 +00:00
Peter_Liang
e9b6679971
Polish and humanize the summary for Display/Font size.
...
Fix: 220071533
Test: manual test
Change-Id: Id09e97f23263bd118c461b6570165f55d62f9881
2022-02-24 13:26:13 +00:00
Marie Matheson
079d7f45e4
Merge "Rename safety source ids to match format from other apps." into tm-dev am: aa43d6f06b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16981670
Change-Id: I3e0a3006dd8227b71367378d47792b35ffdd6c49
2022-02-24 13:16:53 +00:00
Marie Matheson
aa43d6f06b
Merge "Rename safety source ids to match format from other apps." into tm-dev
2022-02-24 12:56:23 +00:00
Yuri Ufimtsev
181326d5d8
Merge "Use FakeFeatureFactory in SafetySourceBroadcastReceiverTest" into tm-dev am: d27a463baf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16987665
Change-Id: Ifbed99b2e62e3eafe1b32c8b80134aa22fb27d5c
2022-02-24 09:42:41 +00:00
Yuri Ufimtsev
d27a463baf
Merge "Use FakeFeatureFactory in SafetySourceBroadcastReceiverTest" into tm-dev
2022-02-24 08:54:01 +00:00
Xiao Ma
498c9a8da0
Merge "Adapt new EthernetManager APIs in Settings." am: 3340b8e3c3
am: b3fedd0633
am: 397b3fe978
am: 2771fcaa8e
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1968461
Change-Id: I7d261fdbdbdd53ede11916398e136d54687a2bd0
2022-02-24 06:30:16 +00:00
Xiao Ma
2771fcaa8e
Merge "Adapt new EthernetManager APIs in Settings." am: 3340b8e3c3
am: b3fedd0633
am: 397b3fe978
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1968461
Change-Id: Ie5150b1987653c52d922af1a057df39553ccf7b4
2022-02-24 06:07:48 +00:00
Xiao Ma
397b3fe978
Merge "Adapt new EthernetManager APIs in Settings." am: 3340b8e3c3
am: b3fedd0633
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1968461
Change-Id: Ifd244bd60e65937c510a5447c9642225be400e3f
2022-02-24 05:46:28 +00:00
Xiao Ma
b3fedd0633
Merge "Adapt new EthernetManager APIs in Settings." am: 3340b8e3c3
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1968461
Change-Id: Icc3b8d9fd42ee9712cfc81c74ae886576695ee2a
2022-02-24 05:22:10 +00:00
Xiao Ma
3340b8e3c3
Merge "Adapt new EthernetManager APIs in Settings."
2022-02-24 04:58:26 +00:00
TreeHugger Robot
17df4d8268
Merge "Update TARE UI." into tm-dev am: 2164070f4a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16987400
Change-Id: I57221836d484ad0a3719747b8606d7ce1c0db122
2022-02-24 01:56:05 +00:00
Xiao Ma
db7d7de3b4
Adapt new EthernetManager APIs in Settings.
...
EthernetManager is going to be moved to Connectivity mainline module and
new EthernetManager management APIs have been exposed. This CL adapts
new APIs in the settings in advance, the changes include:
1. use addInterfaceStateListener and removeInterfaceStateListener.
2. rely on the onInterfaceStateChanged callback to receive the Ethernet
interface state update, to replace the getAvailableInterfaces and
getConfiguration.
3. after the Ethernet mainline migration completes, Settings cannot
access the platform resource such as config_ethernet_iface_regex,
instead, check the availability of Ethernet interface by checking
if either any of FEATURE_ETHERNET and FEATURE_USB_HOST is supported.
Bug: 210586283
Bug: 218798003
Test: m
Test: manually verify that device can access the Internet via Ethernet
Test: manually verify that device can share the Internet via Ethernet
tethering
Test: make RunSettingsRoboTests ROBOTEST_FILTER=<modified test cases>
EthernetTetherPreferenceControllerTest
AllInOneTetherSettingsTest
Change-Id: I9e10481e1751975772a24db29568aa26bb85cd70
2022-02-24 01:49:57 +00:00
TreeHugger Robot
2164070f4a
Merge "Update TARE UI." into tm-dev
2022-02-24 01:27:56 +00:00
TreeHugger Robot
747eed42fc
Merge "Reset all TARE constants." into tm-dev am: 42156e7ba9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16989250
Change-Id: I7bc23b11fcdf6608bf888def2532a58b60c8d447
2022-02-23 21:55:18 +00:00
TreeHugger Robot
42156e7ba9
Merge "Reset all TARE constants." into tm-dev
2022-02-23 21:34:34 +00:00
Kweku Adams
2d12b846d4
Update TARE UI.
...
1. Connect the UI and controller components so that users can make
changes and the changes will be written to settings and properly read
back.
2. Update string constants to reflect changes from TIP1.
3. Refactor components slightly to reduce duplicate code.
4. Hide unsupported factors for now. They'll be added back later.
Bug: 158300259
Test: Manually change factors and check settings constant via adb
Change-Id: I2b70e7013c4766ea50f1f013da582eca74015c6b
2022-02-23 21:20:25 +00:00
TreeHugger Robot
0b603a3d4e
Merge "Ensure icons on app filtering page" into tm-dev am: ad1a789a86
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16990584
Change-Id: I1c1405244855e9cc1ad5cd4026f2abf8a16a3413
2022-02-23 20:33:01 +00:00
TreeHugger Robot
ad1a789a86
Merge "Ensure icons on app filtering page" into tm-dev
2022-02-23 20:05:34 +00:00
TreeHugger Robot
9703570e85
Merge "Clean up code." into tm-dev am: 78d917cc14
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16987398
Change-Id: I340569de72f7aea4e450dd33eaf816d05e50783c
2022-02-23 19:32:49 +00:00
TreeHugger Robot
78d917cc14
Merge "Clean up code." into tm-dev
2022-02-23 19:16:39 +00:00
Kweku Adams
3a7caf1f13
Switch from androidx to android. am: ba685c0be0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16987397
Change-Id: I35660efb0e4d5fff4936c1735a227a2c587c2d77
2022-02-23 18:20:47 +00:00
Julia Reynolds
6fd71484b5
Remove unnecessary async
...
Because if the work wasn't scheduled by the time the main page was
shown, the switch would be shown in the wrong state. And these
calls are fast, and can be done on the main thread
Test: turn off DND access for apps with DND rules
Fixes: 207058117
Change-Id: I186413f4237ef754bdfa5cc469e1b7be4ff71f2c
2022-02-23 12:51:45 -05:00
Marie Matheson
cf3d09834e
Use primary profile lock settings string in Safety Source, not work profile am: d4822fe6b4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16979281
Change-Id: I1a57ff9d5edbed4be2052ac69344b9132f157ba8
2022-02-23 17:34:53 +00:00
Marie Matheson
4dd6d11064
Merge "Merge SafetyCenterStatusHolder into SafetyCenterManagerWrapper" into tm-dev am: 67c0b83f7f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16941462
Change-Id: I921e869609b29a209071500e0e6681b3283d0d1f
2022-02-23 17:30:23 +00:00
TreeHugger Robot
bb45fcc0fd
[automerger skipped] Merge "Cache mechanism for Storage page" into tm-dev am: d3cb79a127
-s ours
...
am skip reason: Merged-In I75533742a025dc61116207285a894ee728d0af68 with SHA-1 c23be3fa16
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16986444
Change-Id: I554c87ea6ca60bc9721a1c6629ec6ef1cbb805be
2022-02-23 17:28:31 +00:00
Julia Reynolds
de08d984ef
Ensure icons on app filtering page
...
Test: BridgedAppsPreferenceControllerTest.java, manually look at screen
Fixes: 218724983
Change-Id: I6ee4bb6c39efacecff5c4219dbe9fdb066c49368
2022-02-23 12:25:49 -05:00
TreeHugger Robot
71ea2ec3b1
Merge "Fix incorrect colored bar when task bar is hidden" into tm-dev am: 4003526dd5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16972170
Change-Id: I23fa2457814f9791efaa82901dde9012f99fce58
2022-02-23 17:19:01 +00:00
Christian Göllner
91486e2823
Merge "Add support for device state based auto-rotation preferences in Settings." into tm-dev am: 1a160636b5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16967923
Change-Id: I51b72ed64c9b6023a096ac040261b09951c77375
2022-02-23 16:58:36 +00:00
Kweku Adams
bc3304b6a2
Clean up code.
...
1. Create a method for duplicate code.
2. Address style/lint issues.
3. Properly parse settings constant string. The original iteration
wouldn't reset values to their default if the constant string didn't
have a value set.
Bug: 158300259
Test: manual
Change-Id: I994b872ba16f12c8e06ce85aedc526b84e5fa31b
2022-02-23 16:30:08 +00:00
Kweku Adams
ba685c0be0
Switch from androidx to android.
...
The rest of the TARE classes use pure Android Fragments and will have an
issue trying to create an androidx Fragment, so switch from using an
androidx Fragment to an android Fragment.
Bug: 158300259
Test: manual
Change-Id: I4c27198a66bd51b3822421116b46ae3d80d589ff
2022-02-23 16:04:45 +00:00