Commit Graph

22273 Commits

Author SHA1 Message Date
Sally Yuen
dd2f3ef51d Merge "Bold text string update" into sc-dev am: 9edf9597e9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13756893

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4464d48444ca5bc6bc958cabdd7e9640c1882644
2021-03-03 23:30:33 +00:00
Sally Yuen
9edf9597e9 Merge "Bold text string update" into sc-dev 2021-03-03 22:31:17 +00:00
sallyyuen
f7c6390bd2 Bold text string update
Test: manual
Bug: 181789336
Change-Id: I75a622005f7df58ea7ec7954d602b0e2f208619e
2021-03-03 20:16:12 +00:00
Almaz Mingaleev
a0c197346d Update GeoTZ strings. am: 18ae34ec90
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13754180

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6dec7b2928b38120b369bdc86c5a69a49bb87dfd
2021-03-03 19:04:44 +00:00
Almaz Mingaleev
18ae34ec90 Update GeoTZ strings.
Change button title to "Use location to set time zone" and
summary text to "Automatic time zone is off" when
"Set time zone automatically" is off.

Bug: 152746236
Test: checked UI manually
Merged-In: Iab177297e9047ff3b6e9452876061cdaa0740ef1
Change-Id: Iab177297e9047ff3b6e9452876061cdaa0740ef1
(cherry picked from commit fa79ee6727)
2021-03-03 17:20:37 +00:00
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
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
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
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
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
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
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
9531fb8ffb Merge "[Provider Model] Show connected networks in APM/APM networks" into sc-dev 2021-03-02 01:53:04 +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
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
Julia Reynolds
c18b417681 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: I0b228ebe74453e0f0de603abcd72b6fcd2c73851
2021-02-27 15:54:00 +00:00
Julia Reynolds
6698d3b2c8 Merge "Updates to NLS notif type filtering" into sc-dev 2021-02-27 15:34:35 +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
63d5e9a5a4 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: I4c30c5a01c1e6f02938e9972f6d1f42bb55819cc
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
Mill Chen
dc92d9e4c4 Make sucUsePartnerResource configurable
The sucUsePartnerResource attribute should be able to configure
seperately. In order to make it happen, we created a config for
sucUsePartnerResource.

Bug: 179882711
Test: robotests
Change-Id: I755ea30f52d58167ab377277f7181696e72e184c
2021-02-26 23:53:54 +08:00
sallyyuen
c5de80db1c Fix capitalization error for Reduce brightness
Bug: b/181265718
Test: n/a
Change-Id: Iceaac4c701dc382e62764bab42e4f3768fa7d0cf
2021-02-25 15:11:20 -08:00
TreeHugger Robot
06d7a4a13d Merge "[Provider Model] Remove the footer of WFC" into sc-dev am: 18eeaad6e3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13694190

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I03850c15c2765037205c7165ba493c40814f6b17
2021-02-25 08:20:02 +00:00
TreeHugger Robot
18eeaad6e3 Merge "[Provider Model] Remove the footer of WFC" into sc-dev 2021-02-25 08:01:24 +00:00
Zoey Chen
fec2fce744 [Provider Model] Remove the footer of WFC
Reason: Cannot pass the GAR, so UX decides to remove it
https://screenshot.googleplex.com/3Ktq9EBxqUhWivj.png

Bug: 180670301
Test: make
Change-Id: I56d84a45826e14e6cc9093553f1bcfd9c54f70ec
2021-02-25 06:26:49 +00:00
Meng Wang
f73bf9218e Merge "Use string "Carrier settings version"" am: 2161d17f32 am: 0b31d30218 am: 3b19347431 am: 69720d62a3
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1606873

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0260967c990f164a9f4c4e1363b41d19f3a104b8
2021-02-25 02:42:30 +00:00
Meng Wang
69720d62a3 Merge "Use string "Carrier settings version"" am: 2161d17f32 am: 0b31d30218 am: 3b19347431
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1606873

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If84a42f0d51cfa758dd9bca7847d2ca178c86627
2021-02-25 01:41:08 +00:00
Meng Wang
3b19347431 Merge "Use string "Carrier settings version"" am: 2161d17f32 am: 0b31d30218
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1606873

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I03542ee476ebff7bfae2a8f54894f00f69578744
2021-02-25 00:44:42 +00:00
Meng Wang
0b31d30218 Merge "Use string "Carrier settings version"" am: 2161d17f32
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1606873

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0cbb0cd3d4c4726587082ecc4cbbfa2957e60467
2021-02-25 00:10:09 +00:00
Suprabh Shukla
13d548bbe6 Merge "Adding alarms and reminders activity" into sc-dev am: a78849982d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13633051

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0cabfaa2a06c217b9d01333b5464d3d09ec0d2c2
2021-02-24 21:18:28 +00:00
Meng Wang
3f9db799e5 Use string "Carrier settings version"
.. instead of "Settings version".

Bug: 160843335
Change-Id: Ie98b9f2c62627c1e34dfa807357625b483577305
Test: make
2021-02-24 21:15:08 +00:00
Suprabh Shukla
a78849982d Merge "Adding alarms and reminders activity" into sc-dev 2021-02-24 20:06:56 +00:00
TreeHugger Robot
2dd4c3b2fd Merge "Revert "Revert "Use location access for recent location apps.""" into sc-dev am: 69fab4bdaa
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13679462

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5e2058078359d1545bfb6d7ef5ad73e27901de1a
2021-02-24 18:28:52 +00:00
TreeHugger Robot
69fab4bdaa Merge "Revert "Revert "Use location access for recent location apps.""" into sc-dev 2021-02-24 18:06:41 +00:00
Ryan Lin
49e8f66cfa Merge "Add uninstall option in the capabilities confirm dialog" into sc-dev am: 296c42e4ce
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13660508

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic69d644ee3ec46944e61725205eb9bd2c810bbd8
2021-02-24 13:47:00 +00:00
TreeHugger Robot
80efd17dc7 Merge "[Bug] Private DNS shows odd message about Bluetooth" into sc-dev am: 588c4e1508
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13622529

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id7d82d3d6069ea25b90a75c728e8ae02f8c6b7fd
2021-02-24 13:46:26 +00:00
Ryan Lin
296c42e4ce Merge "Add uninstall option in the capabilities confirm dialog" into sc-dev 2021-02-24 13:12:45 +00:00
TreeHugger Robot
588c4e1508 Merge "[Bug] Private DNS shows odd message about Bluetooth" into sc-dev 2021-02-24 13:03:13 +00:00
Menghan Li
80f413f99d Merge "Add general grouping title into accessibility settings" into sc-dev am: 21f790c68e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13675177

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I79130f3ee87929b2ea417fc03196aa1df7ddd9cc
2021-02-24 11:40:21 +00:00
Menghan Li
21f790c68e Merge "Add general grouping title into accessibility settings" into sc-dev 2021-02-24 11:07:17 +00:00
menghanli
da07d7a6c2 Add general grouping title into accessibility settings
Bug: 174829936
Test: atest TextAndDisplayFragmentTest, atest AccessibilitySettingsTest
Change-Id: I7455c3d369c3a28b9c64e9a9498a2d6ce5a0ae08
2021-02-24 17:24:17 +08:00
Wei Wang
22399153dc Revert "Revert "Use location access for recent location apps.""
This reverts commit 5da4f381a6.

Reason for revert: Fixed the crash and roll forward

Test: Manual - tested with work profile.
Change-Id: I8b500b8fddc58cc0d0e5e7f4e54d8bb5cb6b3022
2021-02-24 00:08:04 -08:00