Commit Graph

10437 Commits

Author SHA1 Message Date
Matt Pietal
eecacebf5d Merge "Allow a settings override for double-line clock" 2021-11-18 15:14:33 +00:00
Betty Chang
38874a5fd7 Merge "Remove the string for wifi toggle summary" into sc-v2-dev am: 34ff040431 am: 023e325653
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16279915

Change-Id: I73b425791f6f81dcd0538399d8449aa8ca29dd38
2021-11-18 06:47:11 +00:00
Betty Chang
023e325653 Merge "Remove the string for wifi toggle summary" into sc-v2-dev am: 34ff040431
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16279915

Change-Id: Id0a6f3124c0df3332f4b808ba7251a181f0bb483
2021-11-18 06:30:05 +00:00
Betty Chang
34ff040431 Merge "Remove the string for wifi toggle summary" into sc-v2-dev 2021-11-18 06:17:52 +00:00
Matt Pietal
a5415907ea Allow a settings override for double-line clock
This setting allows users to always show a single-line format clock,
regardless of notification status.

Fixes: 194905512
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.display
Change-Id: I94ade1b2d968e5783750e7a98a9a5d28cc22b659
2021-11-17 19:29:19 +00:00
Matt Pietal
d8ca5298ec [DO NOT MERGE] Allow a settings override for double-line clock am: cb4836b486
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16276359

Change-Id: Ic95e5a3863b64a2fda813500335ac04db8d6ae56
2021-11-17 17:41:24 +00:00
changbetty
14d1b41464 Remove the string for wifi toggle summary
Bug: 204124091
Test: Manual test
Change-Id: I0d1d7d6061b756a09942ce7cb0f66a1b1c962eb1
2021-11-17 15:18:22 +00:00
ykhung
3c1da6b2af Update "Mobile network standby" attribute label into "Mobile network" am: 13a52a081e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16279909

Change-Id: I7588c48981e0a4f351302fd1b38f8c943509375a
2021-11-17 14:19:22 +00:00
Matt Pietal
cb4836b486 [DO NOT MERGE] Allow a settings override for double-line clock
This setting allows users to always show a single-line format clock,
regardless of notification status.

Fixes: 194905512
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.display
Change-Id: I94ade1b2d968e5783750e7a98a9a5d28cc22b659
2021-11-17 13:34:36 +00:00
ykhung
13a52a081e Update "Mobile network standby" attribute label into "Mobile network"
Bug: 205051643
Test: make SettingsRoboTests
Change-Id: Ia8f5c3e76d72ffa6fd0601c58b1b3d157b711b30
(cherry picked from commit 22dc875ba7)
2021-11-17 12:35:23 +00:00
Tsung-Mao Fang
98b9b3438d USB: move help config flag to FW
Note: This cl is copied from aosp/1785174 since
merge conflict issue.

Move the flag for the indication of the validity of help links
to framework because it is also needed for SystemUI.

config_has_help will be replaced by config_settingsHelpLinksEnabled
in frameworks.

Test: $ adb shell dumpsys usb add-port "matrix" ufp
$ adb shell dumpsys usb set-contaminant-status "matrix" true
Bug: 195448626

Change-Id: Id9b0c196c9a07085c790d5f4366bb1fec635d6b1
2021-11-17 06:47:39 +00:00
Ronish Kalia
0b30679a2c Merge changes from topic "qr-code-and"
* changes:
  Add tests for QRCodeScannerPreferenceController
  Add a new setting for QR Code Scanner button on lockscreen
2021-11-15 16:35:45 +00:00
TreeHugger Robot
59f749e112 Merge "Revert "Revert "Update styling of NLS dialog""" 2021-11-12 14:01:31 +00:00
Julia Reynolds
617a562660 Revert "Revert "Update styling of NLS dialog""
This reverts commit 6d37fdc546.

Reason for revert: The Android Auto test has been disabled

Change-Id: Iddbe3098d79fbe33c16c2a9c06c8df4a22b49afb
Bug: 205920324
Fixes: 191331361
2021-11-12 11:46:37 +00:00
Shaowei Shen
1f41bae30f Merge "[Sound panel] Use localized string for button text" into sc-v2-dev am: 2874b6442e am: da06c920b9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16236322

Change-Id: I39cf8181840d77c828183f3e11b8996ea5bb7551
2021-11-12 09:49:52 +00:00
Shaowei Shen
da06c920b9 Merge "[Sound panel] Use localized string for button text" into sc-v2-dev am: 2874b6442e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16236322

Change-Id: I7b413717713090f236d5dcddd8978927dc4da02b
2021-11-12 09:32:16 +00:00
Shaowei Shen
2874b6442e Merge "[Sound panel] Use localized string for button text" into sc-v2-dev 2021-11-12 09:14:19 +00:00
Julia Reynolds
6d37fdc546 Revert "Update styling of NLS dialog"
This reverts commit 358fe8e508.

Reason for revert: Android Auto has a test depending on the old layout of the dialog, and we need to revert until that test is updated

Change-Id: I47095be8c89d5bea27de835ea3fa700e3b90b49d
Bug: 205920324
Bug: 191331361
2021-11-11 18:55:35 +00:00
shaoweishen
dbc08a2178 [Sound panel] Use localized string for button text
use localized string "Settings" as button text in Sound panel.
revert text change in ag/15926634

Bug: 204326209
Test: Verified on device
Change-Id: Ibe99369d3c9f9f2131a33b7831f93a5d1554db3f
2021-11-11 08:24:04 +00:00
Julia Reynolds
358fe8e508 Update styling of NLS dialog
To make the content easier to parse

Test: manual
Fixes: 191331361
Change-Id: I1a86b761a09fd29a9581abfd9c4b313feb19394a
2021-11-08 20:54:40 +00:00
Julia Reynolds
98cc4f1302 Some updates for better localization
Test: manual
Fixes: 190021494
Fixes: 185203196
Fixes: 190088372
Change-Id: Ia2871814870a1f0e5c5f2deed06dcbef7b2bd967
2021-11-05 20:05:41 +00:00
Joe Bolinger
c0906cfee7 Merge "Set a min height for pattern setup." into sc-v2-dev am: 774c2181ea am: ba9f4f66a8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16194774

Change-Id: Ib94e00609e0b29d7e9480152883870fabb58e327
2021-11-05 03:13:50 +00:00
Joe Bolinger
ba9f4f66a8 Merge "Set a min height for pattern setup." into sc-v2-dev am: 774c2181ea
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16194774

Change-Id: I18756d98be500c0337278161909766ad157aec81
2021-11-05 03:01:18 +00:00
Joe Bolinger
e55568a7ba Set a min height for pattern setup.
Fix: 194022156
Test: manual (set pattern in SUW with largest font/display size)
Change-Id: I82a0bb5aec122e9d65e4b17ea45166091deea02a
2021-11-05 00:24:36 +00:00
TreeHugger Robot
d1f20d673e Merge "Update "Mobile network standby" attribute label into "Mobile network"" into sc-v2-dev am: c425a4ae93 am: 8e9b44ea7d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16182698

Change-Id: I2b01076c97aad16df7ed6576a1b13cbfc6c23bd1
2021-11-04 10:28:06 +00:00
TreeHugger Robot
8e9b44ea7d Merge "Update "Mobile network standby" attribute label into "Mobile network"" into sc-v2-dev am: c425a4ae93
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16182698

Change-Id: I729cd092754422afd7c44cef0d5873336b070f80
2021-11-04 10:09:24 +00:00
TreeHugger Robot
c425a4ae93 Merge "Update "Mobile network standby" attribute label into "Mobile network"" into sc-v2-dev 2021-11-04 09:11:04 +00:00
ykhung
22dc875ba7 Update "Mobile network standby" attribute label into "Mobile network"
Bug: 205051643
Test: make SettingsRoboTests
Change-Id: Ia8f5c3e76d72ffa6fd0601c58b1b3d157b711b30
2021-11-04 15:55:23 +08:00
TreeHugger Robot
a6566fe3d7 Merge "Remove the text for untethered bt device" into sc-v2-dev am: 8118b9ff29 am: ac476ff63b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16170316

Change-Id: Icf3de5a331dc58c0a815e8a0602b8fc69ccd3615
2021-11-04 04:48:27 +00:00
TreeHugger Robot
ac476ff63b Merge "Remove the text for untethered bt device" into sc-v2-dev am: 8118b9ff29
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16170316

Change-Id: I89ae3ac6b59ff776e745c5885f03ff529f9c7677
2021-11-04 04:25:46 +00:00
TreeHugger Robot
8118b9ff29 Merge "Remove the text for untethered bt device" into sc-v2-dev 2021-11-04 04:08:45 +00:00
Hugh Chen
ab3a70cf1e Remove the text for untethered bt device
Bug: 204066796
Test: make -j64 RunSettingsRoboTests
Change-Id: I35fec4ff998332e6937fc9c360ea488b35b477f8
2021-11-04 02:52:37 +00:00
TreeHugger Robot
a6c7b5e0f1 Merge "Rephrase dialog message of clear storage dialog for security concern" into sc-dev am: 3e23903ff8 am: 0fd394db07
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16101565

Change-Id: I40b5bb4b7be8960cea11ab5521aa36aacf81e7ce
2021-11-03 20:00:55 +00:00
TreeHugger Robot
6cbf225a24 Merge "Rephrase dialog message of clear storage dialog for security concern" into sc-dev am: 3e23903ff8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16101565

Change-Id: I84c50d2857869b9b2303467ef465dc29bc1e9119
2021-11-03 19:49:31 +00:00
TreeHugger Robot
0fd394db07 Merge "Rephrase dialog message of clear storage dialog for security concern" into sc-dev am: 3e23903ff8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16101565

Change-Id: Id7b8ba483f8b323c0e658d66a62c4c58f6dc17a0
2021-11-03 19:47:39 +00:00
ronish
2d0ded469e Add a new setting for QR Code Scanner button on lockscreen
This change adds a new setting to enable/disable the lock screen entry
point for QR Code scanner

Bug: 200536509
Test: make RunSettingsRoboTests -j40

Change-Id: Id200499b62f59fd631d837f9ae8e494532c23e13
2021-11-02 16:20:02 +00:00
TreeHugger Robot
3cea3fc075 Merge "Fix alignment issue between Vision Settings and Font/Display" into sc-v2-dev am: 17df1ff01f am: 4ef8d14ed7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16056987

Change-Id: If60cc218966a7bfaa6a466b02d5c3419ddd9f386
2021-11-01 03:01:29 +00:00
TreeHugger Robot
4ef8d14ed7 Merge "Fix alignment issue between Vision Settings and Font/Display" into sc-v2-dev am: 17df1ff01f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16056987

Change-Id: I7b9a5992c671ed304e3ad2cdec7f546d6c77b446
2021-11-01 02:50:16 +00:00
TreeHugger Robot
17df1ff01f Merge "Fix alignment issue between Vision Settings and Font/Display" into sc-v2-dev 2021-11-01 02:41:30 +00:00
Jernej Virag
27850e9e9e Merge "Add setting to allow configuration of long press home gesture" 2021-10-27 09:59:31 +00:00
Joshua Mccloskey
7571e874f7 Merge "Fixed bug causing user to be stuck on face intro" into sc-v2-dev am: fd96fe156c am: 23e3603e69
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16103499

Change-Id: Iea31095d21a01ef5847ae009331251f1e1df10a5
2021-10-26 18:24:43 +00:00
Joshua Mccloskey
23e3603e69 Merge "Fixed bug causing user to be stuck on face intro" into sc-v2-dev am: fd96fe156c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16103499

Change-Id: I46e6989e1e50718b09263d2d24c16105276016a9
2021-10-26 18:05:13 +00:00
Joshua Mccloskey
fd96fe156c Merge "Fixed bug causing user to be stuck on face intro" into sc-v2-dev 2021-10-26 17:49:36 +00:00
Jernej Virag
97ea279c45 Add setting to allow configuration of long press home gesture
This allows configuration of long press home gesture on 2-/3-button navigation configurations. It allows the user to enable and disable the invocation of assistant app using said gesture.

Bug: 191888710
Test: Unit tests and on a physical device.
Change-Id: I18cb290058ac5c2a748d40802b942404f548b868
2021-10-26 13:34:02 +00:00
Joshua Mccloskey
f0a55f7c4e Fixed bug causing user to be stuck on face intro
Test: See below
Fixes: 203375738
Change-Id: I3e59191a8c936c7c7a3d8561e908593dbf9710b5

1. Enrolled a face during SUW
2. Pressed back on fingerprint enroll intro
3. Verified that the next button's text is chnaged to done
4. The done action launches the fingerprint enroll intro flow.

Change-Id: Id5d652257445e40426ade3d396a31ebf936cc348
2021-10-25 15:08:51 -07:00
Ganesh Olekar
5b44127dc6 Merge "Update toggle string for cam and mic access" into sc-v2-dev am: f24702f643 am: cce029599f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16102463

Change-Id: Ibc16462fbaf1cc37d0f059d1661133637d4e1217
2021-10-25 17:37:08 +00:00
Ganesh Olekar
cce029599f Merge "Update toggle string for cam and mic access" into sc-v2-dev am: f24702f643
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16102463

Change-Id: I47bf9211925aaa3341f764db54009c58d9a6ffcf
2021-10-25 17:19:33 +00:00
Yanting Yang
9a0c28d911 Rephrase dialog message of clear storage dialog for security concern
Bug: 193890833
Test: visual
Change-Id: I8f0b066de710169ee8b922c44b6519ca21b9c7ef
(cherry picked from commit 0c359da620)
2021-10-25 05:52:02 +00:00
Sunny Shao
d2704ad4ca Fix alignment issue between Vision Settings and Font/Display
- Use the same approach of Vision page to tweak the padding of the header

Fixes: 202897526
Test: make RunSettingsGoogleRoboTests -j ROBOTEST_FILTER=com.android.settings.accessibility.AccessibilityScreenSizeForSetupWizardActivityTest
Change-Id: I06eb5cb3ea6952b2cfdaa71f15757e415b61f5cc
2021-10-23 11:09:18 +08:00
Ganesh Olekar
444bca2226 Update toggle string for cam and mic access
Test: Screenshot taken reflecting updated text
Bug: 197757242

Change-Id: Ia8f70d27304d20b1b748c80600e75d1de9f17c55
2021-10-21 17:23:31 +00:00