Commit Graph

80346 Commits

Author SHA1 Message Date
Jordan Liu
94ad94e726 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: I7a459119adba2fa177e2a01d635bcc26d15aa470
2021-03-02 21:04:30 +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
b3d9280c3f 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: I8322e261f22e96fd9e05700f6aff0d90a94628e3
2021-03-02 18:39:46 +00:00
Sally Yuen
d10678e2bf 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: Ic68068d76c144c2a622b03aac056a90a42db0140
2021-03-02 18:38:50 +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
845a518a04 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: Ie8c1cbb51fe5e4ef06a851f5efc4809e9bafc77f
2021-03-02 09:03:07 +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
3e6049272e 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: Iba1a0d39ff8c2163c287da29950dda6061b3cc66
2021-03-02 07:20:44 +00:00
TreeHugger Robot
48c2433c49 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: I97df85bdeacdd0d9032bbef7aa7800e1dc9db736
2021-03-02 07:20:21 +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
23b5a53d93 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: Ieddb41929c43bf0c7e1786a2d2d76fb0c5110bb8
2021-03-02 05:19:07 +00:00
Yanting Yang
082de8bfd9 Merge "Clean up RestrictedHomepagePreference" into sc-dev 2021-03-02 04:15:54 +00:00
Janis Danisevskis
e6caf22cac [automerged blank] Keystore 2.0: Update Wifi settings to use mostly public keystore API. 2p: 2c74864579
Blank merge reason: Change-Id Ib794c5f2d904c2b187d7d5fd00b81afc852d0052 with SHA-1 93af3137fc is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13701087

Change-Id: I56d1df2d804b31cb646d4cf2f1175b53edfa9cc6
2021-03-02 04:11:36 +00:00
Janis Danisevskis
2c74864579 Keystore 2.0: Update Wifi settings to use mostly public keystore API.
Test: N/A
Bug: 171305607
Bug: 171305388
Merged-In: Ib794c5f2d904c2b187d7d5fd00b81afc852d0052
Change-Id: Ib794c5f2d904c2b187d7d5fd00b81afc852d0052
2021-03-01 20:09:08 -08:00
paulhu
2a5051e4fd Update Utils#getTetheringLabel usage on Settings
Utils#getTetheringLabel() is using TetheringManger to get
tetherable interface. So update the usage on Settings.

Bug: 180693313
Test: atest SettingsRoboTests
Change-Id: I1907743ed13c333ecbafd25b6dd9276fe692f2ea
2021-03-02 03:57:34 +00:00
TreeHugger Robot
2f0f0db2ec 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: I8ca0f0fd3d652bc44c4cf9308e748565f02dbb78
2021-03-02 02:22:53 +00:00
TreeHugger Robot
4a98bad643 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: I327a90bda998ef4e25974bbf1e3bbc2a0348e1ff
2021-03-02 02:22:11 +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
62637de424 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: I3ed4d080b81d91f6f130c70bc598457c91656431
2021-03-01 23:18:08 +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
f5aac9aca1 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: I09e18fdadf130e00234c6016c24545036455d8c3
2021-03-01 10:36:00 +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
931078a79a Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-02-28 07:50:34 +00:00
TreeHugger Robot
a3080f5f77 [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: I6de62f93c17d1505d1765dfa59a1e39d8ce0a104
2021-02-28 00:56:20 +00:00
TreeHugger Robot
e20070a3fc Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-02-28 00:36:33 +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
Bill Yi
289272c67c Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Iadc8958c5d4459d6e688cfaf5c627b661e0c9340
2021-02-27 11:53:28 -08:00
Bill Yi
e2e686d9cd Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ifca7084ed712f64cf4d1e47d5dbabe39b6e00bf0
2021-02-27 11:06:03 -08:00
Julia Reynolds
fff6dde818 Merge "Updates to NLS notif type filtering" into sc-dev am: 6698d3b2c8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13691340

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id9c1ac17f70d6b1fa4b9185cd7947dcaff8f48e5
2021-02-27 15:54:14 +00:00
Julia Reynolds
6698d3b2c8 Merge "Updates to NLS notif type filtering" into sc-dev 2021-02-27 15:34:35 +00:00
Yomna Nasser
7c7977efae Include 1xRTT when updating set of RATs via "Allow 2G" toggle.
Update BITMASK_2G to include 1xRTT when disabling/enabling 2G
via toggle in Enable2gPreferenceController. This is to align
with TelephonyManager's NETWORK_CLASS_BITMASK_2G.

Bug: b/163168917
Test: m & atest -c Enable2gPreferenceControllerTest
Change-Id: Ia0e099b63a9089be8cd8bfd4211db9eb3c506fc3
2021-02-27 00:11:01 +00:00
Mill Chen
747597c72a Make Reset Wi-Fi, mobile & bluetooth scrollable
After setting both font size and display size to largest and enabling
collapsing toolbar, the content in this page will be out of screen
and be unable to scroll. Updating ScrollView to NestedScrollView can fix
this kind of issue since ScrollView can't work with CoordinatorLayout.

Bug: 178458729
Test: visual verified
1) Set font size and display size to largest
2) Navigate to Settings -> System -> Reset options -> Reset Wi-Fi mobile
& bluetooth
3) Observe and check if the content area is able to scroll.

Change-Id: I63451b99c6caa9283a45499e1374a58ccc224bfb
2021-02-27 04:06:20 +08:00
Julia Reynolds
dc79f1ba99 Updates to NLS notif type filtering
- Allow an app to tell us they will never bridge a notification
type. We will then not let a user select that type
- Checkboxes everywhere.

Test: Settings unit
Bug: 181125165
Bug: 181124973
Change-Id: I73939d3d0e99016456e009b2f104cdded98411c6
2021-02-26 19:27:25 +00:00
Sally Yuen
e034f35cf1 Merge "Fix capitalization error for Reduce brightness" into sc-dev am: 8caf56ee46
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13701591

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3cd51f59a72569d572c74a8745aff9dea5f55dab
2021-02-26 18:16:26 +00:00
Sally Yuen
8caf56ee46 Merge "Fix capitalization error for Reduce brightness" into sc-dev 2021-02-26 17:11:46 +00:00