Thiebaud Weksteen
439c9ecaf3
Merge "Add summary for 2G toggle option" into sc-dev am: c1110efc19
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13740891
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I7a2e4e005432f45a383f3be33e4468b3514e19c2
2021-03-03 10:53:52 +00:00
Thiebaud Weksteen
c1110efc19
Merge "Add summary for 2G toggle option" into sc-dev
2021-03-03 09:23:49 +00:00
Sally Yuen
dd48ce173c
Merge "[Reduce Bright Colors] Add labels to intensity slider" into sc-dev am: aaff760df0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13501303
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I3c02ac6ac922f5e61c49c3ac4c5814f60891e38a
2021-03-03 03:23:36 +00:00
Sally Yuen
aaff760df0
Merge "[Reduce Bright Colors] Add labels to intensity slider" into sc-dev
2021-03-03 03:03:35 +00:00
Minche Li
ec6b737ddc
Merge "Hides the settings entry in Magnification Settings if device is not supported" into sc-dev am: ecf1c07e63
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13732407
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id8c364416c0fe5ba23043c9bd225edbe14a36311
2021-03-03 02:59:23 +00:00
Minche Li
ecf1c07e63
Merge "Hides the settings entry in Magnification Settings if device is not supported" into sc-dev
2021-03-03 02:24:09 +00:00
Sudheer Shanka
a817daf16c
Merge "Update DataSaverBackend to use NetworkPolicyManager.Listener." am: 90f59be59a am: bf29c73cb7 am: 1e04fd7a05 am: 521bf40280
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1612821
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib005b5a94a2731c90985cc9d4242174be58fb150
2021-03-03 00:59:05 +00:00
Sudheer Shanka
521bf40280
Merge "Update DataSaverBackend to use NetworkPolicyManager.Listener." am: 90f59be59a am: bf29c73cb7 am: 1e04fd7a05
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1612821
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I2aac37f3686f6d46e3cace0dcbd0c4a4886e1cfb
2021-03-03 00:36:23 +00:00
Bonian Chen
a309158d59
Merge "[Settings] Only display backup calling when more than 1 SIM" into sc-dev am: 3f211d4c64
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13715532
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iba59a757851e285cdb00c5bd4ed8a869f450f515
2021-03-03 00:24:15 +00:00
Sudheer Shanka
1e04fd7a05
Merge "Update DataSaverBackend to use NetworkPolicyManager.Listener." am: 90f59be59a am: bf29c73cb7
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1612821
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I1959ff61fdc91f0006d9eda91ccde6917025e07c
2021-03-02 23:54:36 +00:00
Bonian Chen
3f211d4c64
Merge "[Settings] Only display backup calling when more than 1 SIM" into sc-dev
2021-03-02 23:19:24 +00:00
Sudheer Shanka
bf29c73cb7
Merge "Update DataSaverBackend to use NetworkPolicyManager.Listener." am: 90f59be59a
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1612821
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iac6d23d86624419bc716c70a4150090e907928b7
2021-03-02 23:01:32 +00:00
Sudheer Shanka
90f59be59a
Merge "Update DataSaverBackend to use NetworkPolicyManager.Listener."
2021-03-02 21:55:30 +00:00
Treehugger Robot
e385fbb0c9
Merge "Wellbeing Package needs to be enabled by default" am: b6dc427c50 am: 9059706e7b am: bfa57a33ee am: 2a6d2e4a2d
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1587086
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib498737de924d759ac87d91b61560bb61a9588b0
2021-03-02 21:05:59 +00:00
Jordan Liu
b888db21bc
Turn off translations for string am: 00f07cf138
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13679745
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic957702730322293460b43f80dabaa575d562a10
2021-03-02 21:05:16 +00:00
Treehugger Robot
2a6d2e4a2d
Merge "Wellbeing Package needs to be enabled by default" am: b6dc427c50 am: 9059706e7b am: bfa57a33ee
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1587086
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ibe6db36fc0039d10f352756b2c8d398a225c6a55
2021-03-02 20:38:41 +00:00
Treehugger Robot
bfa57a33ee
Merge "Wellbeing Package needs to be enabled by default" am: b6dc427c50 am: 9059706e7b
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1587086
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ibd1aa5ea04aa3ff22ece59fe04bc69c7e15385bd
2021-03-02 19:47:20 +00:00
Treehugger Robot
9059706e7b
Merge "Wellbeing Package needs to be enabled by default" am: b6dc427c50
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1587086
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I12e20519ac29f802f9983dcf27f313388b33829c
2021-03-02 19:05:16 +00:00
Sally Yuen
dc47aabf43
Merge "Call into ColorDisplayManager for RBC slider range" into sc-dev am: 4d5a03da7e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13688354
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic823a917fd58d3ade0bd9e4f8bcb910ca398bcf2
2021-03-02 18:39:34 +00:00
Sally Yuen
ad03e652ac
Merge "[Reduce Bright Colors] reorder preferences" into sc-dev am: 18923596c4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13501300
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I96f557138c3aeda3b4cfd93d5de8297ae5d5bba3
2021-03-02 18:39:24 +00:00
Jordan Liu
00f07cf138
Turn off translations for string
...
Also move to config.xml and rename config_*.
Bug: 178490564
Test: no behavior change, follow up with testers to make sure manual
test is fixed
Change-Id: Idc1828c936121928e13ecf11f5437c3488f87565
2021-03-02 18:09:47 +00:00
sallyyuen
6a22201c7c
[Reduce Bright Colors] Add labels to intensity slider
...
Test: Manual
Bug: b/128465252
Change-Id: I278aed9a7da552d787c7b5426504f6f429d4d6ab
2021-03-02 09:46:45 -08:00
Sally Yuen
4d5a03da7e
Merge "Call into ColorDisplayManager for RBC slider range" into sc-dev
2021-03-02 17:38:30 +00:00
Sally Yuen
18923596c4
Merge "[Reduce Bright Colors] reorder preferences" into sc-dev
2021-03-02 17:31:15 +00:00
Thiébaud Weksteen
fc593b92c2
Add summary for 2G toggle option
...
Bug: 181667681
Test: build & manually verify toggle text
Change-Id: Ie086b2e3e277b4bfd612bf2a4437e48fa931c1c0
2021-03-02 17:59:17 +01:00
Bonian Chen
a9a411e3df
[Settings] Only display backup calling when more than 1 SIM
...
Backup calling only available when more than 1 SIM available.
Bug: 179802059
Test: on device
Change-Id: I24e5eb9e1a7064c3ea65389fbb00c0ff2a5852ed
2021-03-02 21:14:53 +08:00
Sudheer Shanka
0a476f5f53
Update DataSaverBackend to use NetworkPolicyManager.Listener.
...
This will avoid having to update this every time we
add a new callback.
Test: treehugger
Change-Id: Ic34e3eac87d207eb2ffff7430fdf3b77871ae812
2021-03-02 13:05:43 +00:00
TreeHugger Robot
cb554d2d67
Merge "Avoid double-badging application icon in the dialog" into sc-dev am: c752d2e25b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13698226
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I17470e9a33ff8a35bc7cf6b8dce6a938a437c1ff
2021-03-02 09:02:43 +00:00
TreeHugger Robot
c752d2e25b
Merge "Avoid double-badging application icon in the dialog" into sc-dev
2021-03-02 07:57:25 +00:00
TreeHugger Robot
18ec16897b
Merge "Make sucUsePartnerResource configurable" into sc-dev am: 22c45731f5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13710507
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I25724e6f6edf6d54b52f077fa768603bd5cf06be
2021-03-02 07:20:59 +00:00
TreeHugger Robot
bff4bf3fae
Merge "Make Reset Wi-Fi, mobile & bluetooth scrollable" into sc-dev am: 637eeefb53
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13710511
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ibb8c6b614d465ab2b18086cd10172eea2c46a3cb
2021-03-02 07:20:40 +00:00
mincheli
3d41fe560b
Hides the settings entry in Magnification Settings if device is not supported
...
If the device doesn't support magnification area, we should hide the
settings entry in mangification settings
Bug: 177371954
Test: atest ToggleScreenMagnificationPreferenceFragmentTest
Change-Id: I41fc3177f86c6a19e3ef0d2fbe5e052d77c1cb47
2021-03-02 06:56:59 +00:00
TreeHugger Robot
22c45731f5
Merge "Make sucUsePartnerResource configurable" into sc-dev
2021-03-02 06:45:46 +00:00
TreeHugger Robot
637eeefb53
Merge "Make Reset Wi-Fi, mobile & bluetooth scrollable" into sc-dev
2021-03-02 06:17:55 +00:00
Treehugger Robot
b6dc427c50
Merge "Wellbeing Package needs to be enabled by default"
2021-03-02 06:09:37 +00:00
Yanting Yang
2b9eccc511
Merge "Clean up RestrictedHomepagePreference" into sc-dev am: 082de8bfd9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13694187
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I6dc86e67d8340749fc7483bb6e9441de35fbf984
2021-03-02 05:19:50 +00:00
Yanting Yang
082de8bfd9
Merge "Clean up RestrictedHomepagePreference" into sc-dev
2021-03-02 04:15:54 +00:00
TreeHugger Robot
3b5c6574c3
Merge "Update UI for factory reset flow" into sc-dev am: 0994940af2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13693503
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I7bd3dc05d2e6e6f7c96200f223116ee0c1ad9679
2021-03-02 02:23:06 +00:00
TreeHugger Robot
2daa747de7
Merge "[Provider Model] Show connected networks in APM/APM networks" into sc-dev am: 9531fb8ffb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13664265
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id10872fe92a4393336da081c5d170932e2f94ac1
2021-03-02 02:22:27 +00:00
TreeHugger Robot
0994940af2
Merge "Update UI for factory reset flow" into sc-dev
2021-03-02 02:04:43 +00:00
TreeHugger Robot
9531fb8ffb
Merge "[Provider Model] Show connected networks in APM/APM networks" into sc-dev
2021-03-02 01:53:04 +00:00
Janis Danisevskis
d8f534576f
Merge "Address nits from ag/13702356" into sc-dev am: 5e57390696
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13711305
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I484e0a9402d14e213201820b489053d0178551c8
2021-03-01 23:20:07 +00:00
Janis Danisevskis
5e57390696
Merge "Address nits from ag/13702356" into sc-dev
2021-03-01 22:33:46 +00:00
Weng Su
f1489b51a3
[Provider Model] Show connected networks in APM/APM networks
...
- Separate APM and APM network types from other Internet types because
they can coexist at the same time.
- Show no internet icon in airplane-mode networks.
- Show connected non-carrier(Wi-Fi) network in airplane-mode networks.
- Show connected Ethernet network when airplane mode on.
- Screenshot:
https://screenshot.googleplex.com/cr3eWNLMEuJ8zvP
https://screenshot.googleplex.com/6DiMqKBBnBoxxhN
Bug: 180778141
Bug: 180778839
Bug: 179106406
Test: manual test
atest -c ConnectedEthernetNetworkControllerTest \
InternetConnectivityPanelTest \
InternetPreferenceControllerTest \
InternetUpdaterTest
Change-Id: I861d5ce879facbb61dfdc5b7be943662d55bdcca
2021-03-02 02:59:11 +08:00
sallyyuen
9f5080599c
[Reduce Bright Colors] reorder preferences
...
Test: Manual
Bug: 128465252
Change-Id: I76b0b0c510a438a05c77cd77b64281882e553124
2021-03-01 09:44:18 -08:00
TreeHugger Robot
0d60f4ae0a
Merge "Include 1xRTT when updating set of RATs via "Allow 2G" toggle." into sc-dev am: fd510f5b67
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13715406
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I5f84227011e263c6cf381bfde37c545b8e719ae2
2021-03-01 10:35:47 +00:00
TreeHugger Robot
fd510f5b67
Merge "Include 1xRTT when updating set of RATs via "Allow 2G" toggle." into sc-dev
2021-03-01 09:35:13 +00:00
TreeHugger Robot
12e47fcfae
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 3d4dc769bd -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13718742
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I752000e9c31d017a8cfed810134a5852121f9c41
2021-02-28 00:56:48 +00:00
TreeHugger Robot
3d4dc769bd
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-02-28 00:13:12 +00:00
Bill Yi
2561a06e4b
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I6e208297835b5f69450476e17c35426362480c41
2021-02-27 12:40:54 -08:00