Commit Graph

41268 Commits

Author SHA1 Message Date
Joe Bolinger
9b6402b1f2 Merge "Persist state of no thanks button." into tm-dev am: 72f84a96d8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17016922

Change-Id: I1727426ef3b8533ee72290120cc529016345f43a
2022-02-28 18:20:41 +00:00
Joe Bolinger
72f84a96d8 Merge "Persist state of no thanks button." into tm-dev 2022-02-28 18:02:28 +00:00
Evan Laird
38770319fd Merge "Add setting for showing the vibrate icon in status bar" into tm-dev am: 969625bc8e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16986239

Change-Id: I6b8767252a2de9a3b07bac16ea1b18379fd01eb4
2022-02-28 15:35:39 +00:00
Evan Laird
969625bc8e Merge "Add setting for showing the vibrate icon in status bar" into tm-dev 2022-02-28 15:10:23 +00:00
Joe Bolinger
017545c6d1 Persist state of no thanks button.
Fix: 207724636
Test: manual (scroll to bottom and rotate device)
Change-Id: I5ef486dc49abd22387b5f6edf67eedaacc9ded4a
2022-02-25 21:42:36 +00:00
TreeHugger Robot
39697f86e7 Merge "[Panlingual] Fix duplicated locale show on suggested group" into tm-dev am: cfd4c68d94
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17005475

Change-Id: Ie3dda91506593620e0de659793924d9669536813
2022-02-25 19:42:06 +00:00
Menghan Li
2e35afa0ba Merge "Refine A11y Tile Service javadoc" into tm-dev am: d3a7ec88a0 am: 8743339526
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16932278

Change-Id: I3512b51a95237859f131921233dcc2709fc0eefe
2022-02-25 19:14:40 +00:00
Aaron Liu
7e24127f12 Merge "Home Controls: Add Device Controls settings" into tm-dev 2022-02-25 16:19:30 +00:00
Lucas Silva
4d8565dfa9 Merge changes from topic "dreams-oobe"
* changes:
  [automerge] Allow other layouts to be passed into the dream view adatper. 2p: 5e91b7eab3 2p: c8c07f4ac7
  [automerge] Allow other layouts to be passed into the dream view adatper. 2p: 5e91b7eab3
  Allow other layouts to be passed into the dream view adatper.
2022-02-25 15:07:20 +00:00
Lucas Silva
7565dfb999 Merge "Allow other layouts to be passed into the dream view adatper." into tm-dev 2022-02-25 15:07:20 +00:00
tom hsu
62a8514d1b [Panlingual] Fix duplicated locale show on suggested group
- When User select 2 same locale but different region, current logic
   will also check 2 times and add these same results into cache.
 - Use hashSet to resolve this problem

Bug: 220804297
Test: local
Test: atest pass
Change-Id: I60c63a1eb570373fd714cf9b29ed926d15b2daa7
2022-02-25 09:35:51 +00:00
Menghan Li
d3a7ec88a0 Merge "Refine A11y Tile Service javadoc" into tm-dev 2022-02-24 21:22:18 +00:00
Lucas Silva
bafbbf4fdc Merge "Add dream descriptions to dream settings UI." into tm-dev am: 4b6efee1a3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16989262

Change-Id: I2dac154f7a7b45dd1c7843193c4a22880a596b7a
2022-02-24 20:39:52 +00:00
Lucas Silva
4b6efee1a3 Merge "Add dream descriptions to dream settings UI." into tm-dev 2022-02-24 19:34:55 +00:00
TreeHugger Robot
139331e47f Merge "[Panlingual] Adds log and have small refactor." 2022-02-24 17:08:44 +00:00
Lucas Silva
9e8c86c763 [automerge] Allow other layouts to be passed into the dream view adatper. 2p: 5e91b7eab3 2p: c8c07f4ac7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17002670

Bug: 221227402
Change-Id: Ia78d9e429ffd3aa1078af803a9c23da3683a3906
2022-02-24 16:45:36 +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
Julia Reynolds
6a663c3dff Merge "Remove unnecessary async" into tm-dev am: 1d15b24da2 am: 9d01ed5377
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16990592

Change-Id: Ia62d904084968418387dd231bbd58430afb98977
2022-02-24 16:43:23 +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
1d15b24da2 Merge "Remove unnecessary async" into tm-dev 2022-02-24 15:30:02 +00:00
tom hsu
f2613fc56b [Panlingual] Adds log and have small refactor.
Bug: 218660171
Test: local
Change-Id: Icedc6808c9115afc996f435bfd4ca59e20c781ab
2022-02-24 22:34:10 +08:00
Marie Matheson
b44774b3af 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: I2a0dbc58ee5eafa8ded57a83e96af1d1fa686cb9
2022-02-24 13:56:09 +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
SongFerng Wang
be494d6cb6 Merge "Fix the settings crash when SimDialogActivity is null" 2022-02-24 10:38:37 +00:00
SongFerngWang
70bf76a436 Fix the settings crash when SimDialogActivity is null
The PreferredSimDialogFragment did updateDialog after SimDialogActivity
was finished. It caused the settings crash. This is similar to b/184899699

Bug: 220803944
Test: build pass
Change-Id: I9a5964400a63053e362632944b9e7aa8ec1bbea8
2022-02-24 15:50:39 +08:00
Xiao Ma
07cbeebbf8 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: I9e8354211cf47c460ab282f555e8e3224519226f
2022-02-24 07:06:49 +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
TreeHugger Robot
37cd69b941 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: I176dcf67f12f05cc2f2f7678908cd4f1692bf5ea
2022-02-24 02:08:01 +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
e7d4525902 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: I7a4bae895aeff3ea80baa655e4fa549ee84b4394
2022-02-23 23:12:32 +00:00
TreeHugger Robot
c8400ace91 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: I067574378b6cd576e57826a52f78ba33f07bf862
2022-02-23 22:54:17 +00:00
TreeHugger Robot
42156e7ba9 Merge "Reset all TARE constants." into tm-dev 2022-02-23 21:34:34 +00:00
TreeHugger Robot
c45a71140a 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: I590199eb3f2bb3d679899a1a13752a53d0cfce61
2022-02-23 21:32:42 +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
Aaron Liu
aace0391a0 Merge "Home Controls: Add Device Controls settings" 2022-02-23 21:12:26 +00:00
Kweku Adams
d672c4017d Switch from androidx to android. am: ba685c0be0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16987397

Change-Id: Iee69adeb08fa0f678689807a88d8dc4c3d9c5359
2022-02-23 20:49:50 +00:00
Marie Matheson
4bc48cd068 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: I38e920f39285fe9b55c70ccf84e468af7631fbeb
2022-02-23 20:42:48 +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
78d917cc14 Merge "Clean up code." into tm-dev 2022-02-23 19:16:39 +00:00
Christian Göllner
918ff26ece 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: Ic82fbebfa269be55037553ae911198794f9dd81a
2022-02-23 18:55:33 +00:00
Aaron Liu
78cae7f28e 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 18:18:54 +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
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
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