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
TreeHugger Robot
b3efaa654e
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: a18ff15076
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16986293
Change-Id: I8850b59a5b02dd11a1f8ffaeeb8bb2ef0fabca90
2022-02-24 18:26:27 +00:00
Bill Yi
3d349c1688
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fc83e2a05a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16986293
Change-Id: Ia0f31cd384cdea4944f63a73a0ec8793a21b11f9
2022-02-24 18:26:24 +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
Bill Yi
31a5b89eef
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: b07f4eca84
am: 3913e56dd9
-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: Id72c779f290a0e76622bc5dda67dca65c5c63998
2022-02-24 18:26:06 +00:00
TreeHugger Robot
a18ff15076
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev
2022-02-24 18:05:30 +00:00
TreeHugger Robot
24bd47eda7
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod
2022-02-24 18:00:29 +00:00
Lucas Silva
c8c07f4ac7
[automerge] Allow other layouts to be passed into the dream view adatper. 2p: 5e91b7eab3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17002670
Bug: 221227402
Change-Id: I694e056d8c599ab75729513bbdbb556919011161
2022-02-24 16:45:28 +00:00
Lucas Silva
5e91b7eab3
Allow other layouts to be passed into the dream view adatper.
...
This will let the OOBE flow use a different layout than the regular
Settings view.
Bug: 221227402
Test: locally on device
Change-Id: I27545b7dad1d789adcae8589480d29bc5231c98c
2022-02-24 16:45:03 +00:00
Lucas Silva
c7709aebb3
Add dream descriptions to dream settings UI.
...
The dream descriptions will now be shown underneath the title, if the
dream has provided one.
We also cleaned up the icon view, instead merging it with the title view
to ensure proper alignment between the icon and title.
Bug: 221078654
Test: locally on device
Test: atest DreamPickerControllerTest
Change-Id: I00fd69c294f1a5fbcbc5392eba342f2896f6d9ed
2022-02-24 16:25:24 +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
Jan Tomljanovic
51b6eb3260
Trigger SafetyCenter update on each Fingerprint settting change.
...
Test: atest SettingsUnitTests
Bug: 215518850
Change-Id: I44f9e6dbdffa128d57a23fbe97ee875a549c3cd2
2022-02-24 14:19:12 +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
menghanli
bc67cf5102
Polish humanize strings for one-handed mode page
...
- Add an intro for purpose or behavior
- Update footer description on usage, availability, or limitations
Bug: 218408813
Test: manual testing
Change-Id: I1712a3dcc08bf71ca8caf4097a23d465156bec22
2022-02-24 16:44:32 +08:00
Peter_Liang
f93bb8c7e8
Override the text size attribute of "Preview" in the text and reading options.
...
Fix: 220265332
Test: manual test
Change-Id: Ic06e3dd8b7464b1c09745b10c063a4cafbaf0e2d
2022-02-24 15:49:10 +08: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
Mill Chen
0607c5116c
Cache mechanism for Storage page with work profile
...
Apply a cache mechanism to prevent the flicker problem from entering
Storage page.
Bug: 191117970
Test: manual test
1) Create a work profile with TestDPC
2) The loading spinner will be shown when entering Storage page after
the first boot.
3) Back to Settings homepage and switch back to Storage page, the
loading spinner shouldn't be shown.
4) The preference order shouldn't be updated after changing the storage
size.
Change-Id: I518679f90c63e12f61f08d08d5ed3f3900825be2
Merged-In: I518679f90c63e12f61f08d08d5ed3f3900825be2
(cherry picked from commit cda892df85
)
2022-02-24 06:25:42 +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
Aaron Liu
e0f4e795ce
Home Controls: Add Device Controls settings
...
Add a setting that would not require authorization for device controls.
Fixes: 216102581
Test: manual
Change-Id: I1fd98a2fbc1cea44d0b2c3612dd1616a053af394
2022-02-23 21:13:06 +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