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
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
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
Kweku Adams
a6693df48d
Reset all TARE constants.
...
Reset all TARE constants, not just the enabled status, when a user
clicks on "Reset to defaults."
Bug: 158300259
Test: manual
Change-Id: I5328c7790729e3358751e703271a6ffd386bb33f
2022-02-23 16:03:10 +00:00
Yuri Ufimtsev
5d69ff508a
Use FakeFeatureFactory in SafetySourceBroadcastReceiverTest
...
Test: atest SettingsUnitTests
Bug: 215517420
Change-Id: I5beefa766440dd86a5b159160699c3bc0ca46e0c
2022-02-23 14:48:14 +00:00
Marie Matheson
d4822fe6b4
Use primary profile lock settings string in Safety Source, not work profile
...
Test: atest CtsSafetyCenterTestCases
Bug: 215518847
Change-Id: I1c7ddbeb05be81fa902fcb4e42868ddd770d2dc0
2022-02-23 13:42:03 +00:00
Marie Matheson
67c0b83f7f
Merge "Merge SafetyCenterStatusHolder into SafetyCenterManagerWrapper" into tm-dev
2022-02-23 13:34:15 +00:00
Marie Matheson
d4553dd10b
Merge changes from topic "b220384387" into tm-mainline-prod
...
* changes:
[automerge] Merge SafetyCenterStatusHolder into SafetyCenterManagerWrapper 2p: ce321f0dd0
Merge SafetyCenterStatusHolder into SafetyCenterManagerWrapper
2022-02-23 13:34:15 +00:00
TreeHugger Robot
d3cb79a127
Merge "Cache mechanism for Storage page" into tm-dev
2022-02-23 12:13:38 +00:00
TreeHugger Robot
e1be038ca8
Merge changes from topic "presubmit-am-29aa077ecb4346d8884ed19e21dc3b3c" into tm-mainline-prod
...
* changes:
[automerge] Cache mechanism for Storage page 2p: c23be3fa16
Cache mechanism for Storage page
2022-02-23 12:13:38 +00:00
TreeHugger Robot
4003526dd5
Merge "Fix incorrect colored bar when task bar is hidden" into tm-dev
2022-02-23 10:43:03 +00:00
Christian Göllner
1a160636b5
Merge "Add support for device state based auto-rotation preferences in Settings." into tm-dev
2022-02-23 10:41:24 +00:00
Presubmit Automerger Backend
c4594d9948
[automerge] Fix incorrect colored bar when task bar is hidden 2p: 39c8905f4c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16972170
Change-Id: Iec184e49d8bcb3ccef49a13f0bb24d048103c759
2022-02-23 10:41:24 +00:00
Tsung-Mao Fang
39c8905f4c
Fix incorrect colored bar when task bar is hidden
...
Set backgorund color on content id view instead of homepage view.
Also setup edge to edge for the homepage.
Fix: 215440529
Test: See correct ui on the two pane mode and regular phone.
Change-Id: I2d5988a489410e9620137bd6cf9607768787d4fc
2022-02-23 10:41:14 +00:00
Mill Chen
068fe1c035
[automerge] Cache mechanism for Storage page 2p: c23be3fa16
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16986444
Bug: 191117970
Change-Id: I3c09e755c1dd3a218be047fb25a751a3931caf42
Merged-In: I75533742a025dc61116207285a894ee728d0af68
2022-02-23 08:16:01 +00:00
Mill Chen
c23be3fa16
Cache mechanism for Storage page
...
- Use SharedPreference to cache the size info
- Improve the flicker problem on Documents & other preference
- The jobs are destroied on onPause to prevent the jobs being
restarting when back to Storage page
- Enable progress bar animation for each storage item
Bug: 191117970
Test: manual test
1) The loading spinner will be shown when entering Storage page
at first time.
2) Back to Settings homepage and switch back to Storage page, the
loading spinner shouldn't be shown.
3) Click each preference in the Storage page and switch between these
pages, the size info should be updated if something removed and the
order of preference shouldn't be changed.
Change-Id: I75533742a025dc61116207285a894ee728d0af68
Merged-In: I75533742a025dc61116207285a894ee728d0af68
(cherry picked from commit 77775a66f2 )
2022-02-23 08:15:14 +00:00
Marie Matheson
26f5dfd966
Rename safety source ids to match format from other apps.
...
Test: atest SettingsUnitTests
Bug: 16979198
Change-Id: I671779281c594ad69b9f4b6aa5473aac5e7854a1
2022-02-22 21:14:46 +00:00
Kweku Adams
e6f24f02fd
Simplifying settings string generation. am: 82b0e1ccdb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16980814
Change-Id: Ic1b46b0e0cc05f6cfbed6e2d672ea4daafa89ad8
2022-02-22 21:14:27 +00:00
Kweku Adams
82b0e1ccdb
Simplifying settings string generation.
...
Remove duplicate code for generating the settings constant strings, and
make sure not to write redundant data (setting a value to its default).
Bug: 158300259
Test: Android builds
Change-Id: Id79bae3685bfecb4858574ee38b67b2a554823fe
2022-02-22 18:52:35 +00:00
Presubmit Automerger Backend
4efab754ce
[automerge] Merge SafetyCenterStatusHolder into SafetyCenterManagerWrapper 2p: ce321f0dd0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16941462
Bug: 220384387
Change-Id: I2bb6eee411ddf17fdca8e0b6fc80050a080c1e14
2022-02-22 16:37:22 +00:00
Marie Matheson
ce321f0dd0
Merge SafetyCenterStatusHolder into SafetyCenterManagerWrapper
...
Test: SettingsUnitTests
Bug: 220384387
Change-Id: I3886d3cf4717b5c7efd99ebd8ffb6a039e3565a4
2022-02-22 16:36:17 +00:00
Yuri Ufimtsev
6a31bfe04b
Merge "Provide data to LockScreenSafetySource" into tm-dev am: 6368af8bdf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16931921
Change-Id: I979e08ada4c8ddd6ddc3bd929d37fa95e7a27ab8
2022-02-22 14:41:25 +00:00