PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
100,495 Commits 1 Branch 0 Tags
9e8c86c763d19dae9569a60f44c784a99eedcc40
Commit Graph

100495 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
4257b0e1e8 Merge changes from topic "presubmit-am-517a2e2cb73c439791517b439db33212" into sc-mainline-prod am: 2555e0d2e3 am: fd9774a633 am: 606488fea8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16934955

Change-Id: I244fdc314d97d6a5ce4a87293689735326ee8af1
 2022-02-24 14:52:48 +00:00
Bill Yi
c6def3b1bf [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: bfb1c0090c am: 8e58f10261 -s ours am: 23bac2fa39 -s ours am: 548359ddf9 -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: I4719d2d642a7d6fc6ea521454c4c2b95b13ae530
 2022-02-24 14:52:46 +00:00
TreeHugger Robot
d8dcff4eac 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: I91779796d31881527854776514ce87e4e6751365
 2022-02-24 14:52:30 +00:00
Bill Yi
efdd5ffb3b [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: I96fbfaef0a0b0d9708aa1b449cde3c513cdaf516
 2022-02-24 14:52:24 +00:00
Bill Yi
16408207f9 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 41068978bb -s ours am: fd463afb87 -s ours am: a6182064cb -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: I3dea6959f89028575d626fa81f1faa84df09d8fe
 2022-02-24 14:41:10 +00:00
Bill Yi
41275380bf [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: I9f5e60d154f979c6e744ee5a0df3d35585efeddc
 2022-02-24 14:31:01 +00:00
PETER LIANG
7ed4f3343e Merge "Polish and humanize the summary for Display/Font size." into tm-dev am: 78310383b0 am: 713208f556 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16996808

Change-Id: Ie015fe844099333b27fd9968931171578a7605d4
 2022-02-24 14:17:45 +00:00
Marie Matheson
15c15ecdad Merge "Rename safety source ids to match format from other apps." into tm-dev am: aa43d6f06b am: 079d7f45e4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16981670

Change-Id: Ibc3df37f6755b12a0f0ac0ca89925d5c8ae8971a
 2022-02-24 14:06:33 +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
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
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
23785a116c Merge "Use FakeFeatureFactory in SafetySourceBroadcastReceiverTest" into tm-dev am: d27a463baf am: 181326d5d8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16987665

Change-Id: I017acaf3e00469cfadf6b30746b3a6d6119d1997
 2022-02-24 11:41:27 +00:00
SongFerng Wang
be494d6cb6 Merge "Fix the settings crash when SimDialogActivity is null" 2022-02-24 10:38:37 +00:00
Yuri Ufimtsev
b2e524bce6 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: I222f80685744c4158775d8ac380d3eda43a7ed01
 2022-02-24 09:44:12 +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
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
170d39dd63 Merge "Adapt new EthernetManager APIs in Settings." am: 3340b8e3c3 am: b3fedd0633 am: 397b3fe978 am: 2771fcaa8e am: 498c9a8da0 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1968461

Change-Id: If8ec8f12b4bf19f04df0fb8dca2e68e1a332d39c
 2022-02-24 07:16:44 +00: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
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
TreeHugger Robot
b25fe95eb4 Merge "Update TARE UI." into tm-dev am: 2164070f4a am: 17df4d8268 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16987400

Change-Id: I2c3177da8be3ac968fc00365189731b178431d56
 2022-02-24 05:11:07 +00:00
Xiao Ma
3340b8e3c3 Merge "Adapt new EthernetManager APIs in Settings." 2022-02-24 04:58:26 +00:00
TreeHugger Robot
d5e3d2e1fe Merge "Reset all TARE constants." into tm-dev am: 42156e7ba9 am: 747eed42fc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16989250

Change-Id: I53206a2d64d904146c00e952b8909d753128816d
 2022-02-24 02:53:04 +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
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
c73c5bdbc6 Merge "Ensure icons on app filtering page" into tm-dev am: ad1a789a86 am: 0b603a3d4e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16990584

Change-Id: I36c8f5521cc29b970910828e244cd6c1d2c33b4d
 2022-02-24 01:45:36 +00:00
TreeHugger Robot
2164070f4a Merge "Update TARE UI." into tm-dev 2022-02-24 01:27:56 +00:00
TreeHugger Robot
452558375b Merge "Clean up code." into tm-dev am: 78d917cc14 am: 9703570e85 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16987398

Change-Id: I1a78a8bf61f1aea5c17fde51773d276d1157d56f
 2022-02-24 00:57:04 +00:00
Kweku Adams
176fd529eb Switch from androidx to android. am: ba685c0be0 am: 3a7caf1f13 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16987397

Change-Id: Iccb0740d39a3dc74f8fa0fae9c63a0f8a05f0de4
 2022-02-24 00:27:50 +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