Commit Graph

8205 Commits

Author SHA1 Message Date
Amy Hsu
b76fc47ce1 Merge "[ScreenResolutionController] UI string update" into tm-d1-dev am: 19b9978591 am: 8d3a4324e5 am: fdbf57cf09
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17983872

Change-Id: Ice81aa503485c85a071242d2de6d6a5954b3c887
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 22:38:09 +00:00
Amy Hsu
fdbf57cf09 Merge "[ScreenResolutionController] UI string update" into tm-d1-dev am: 19b9978591 am: 8d3a4324e5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17983872

Change-Id: I3c72807e586bf8ce9194ac17f5eda5ccb756f3bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 18:53:38 +00:00
Kweku Adams
3a6186c952 Merge "Make final factors configurable." into tm-dev am: 3663986909 am: d3a367c5a9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17947486

Change-Id: Ifde5ac8c236bd25275ca73e5694e76a52c9fdf31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 18:25:59 +00:00
Xinyi Zhou
aafebb3890 Delete Fast Pair Settings am: 3438e20da1 am: e2db47e9ab am: 4be70892e9 am: 815bbd8c1b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17968888

Change-Id: I878e145a67fd799b5868af4a5e15b196cd6f985a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 05:32:17 +00:00
Amy Hsu
f1dfa76dba [ScreenResolutionController] UI string update
Bug: b/230626771
Test: Check the string manually
Change-Id: Ibe8cde0ef743ef398edbc438ead130215f7294d0
2022-04-28 07:40:44 +00:00
Kweku Adams
5262325601 Merge "Make final factors configurable." into tm-dev am: 3663986909 am: 4c5cbeb882
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17947486

Change-Id: I20dad61683ad461bf3c16e15e3a49a54822cc7e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-28 03:30:50 +00:00
Xinyi Zhou
4be70892e9 Delete Fast Pair Settings am: 3438e20da1 am: e2db47e9ab
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17968888

Change-Id: I44ecf5ea109b9a002a178f42d609a7fbf7bfcf1b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-28 03:27:55 +00:00
Kweku Adams
3663986909 Merge "Make final factors configurable." into tm-dev 2022-04-28 02:59:29 +00:00
Lais Andrade
82a3146c23 Merge "Create separate On/Off string resources for Vibration & haptics" into tm-dev am: 9c8d1e94fb am: c09c49fcf2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17914337

Change-Id: I4a46a73c2901720829056efa3c5d70ad89fb1114
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-28 00:15:40 +00:00
Xinyi Zhou
3438e20da1 Delete Fast Pair Settings
Fast Pair will not be launched in T.

Test: -m
Fix: 228614515
Fix: 229356812
Change-Id: I173453e84f0d1b525ea4796ed875f53f30c20d96
2022-04-27 12:29:59 -07:00
Kweku Adams
d7189cc7ce Make final factors configurable.
1. Add configuration support for the ongoing rewards (that are normally
   less than 1 ARC).
2. Fix key/configuration of instant rewards
3. Fix UI string issue

Bug: 158300259
Bug: 189850067
Bug: 191876714
Bug: 191877052
Test: Use UI to change factors. Check Settings via adb and TARE dumpsys
Change-Id: I571e188faa6915ea74826b725c9883a825ab152a
2022-04-27 17:57:01 +00:00
Lais Andrade
109b181126 Merge "Create separate On/Off string resources for Vibration & haptics" into tm-dev am: 9c8d1e94fb am: 9066672c7d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17914337

Change-Id: I2495f0494ac54bf8b7e034a919e63870c2460b0c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 17:35:05 +00:00
Lais Andrade
9c8d1e94fb Merge "Create separate On/Off string resources for Vibration & haptics" into tm-dev 2022-04-27 13:54:13 +00:00
Lais Andrade
cc8790f7b3 Create separate On/Off string resources for Vibration & haptics
Some translators need to be able to adapt the text for On/Off preference
state to match the preference title "Vibration & haptics", which
requires a different inflection and plural form on some languages.

This change separates this resource string from the more generic one
that was used before to allow this flexible translation.

Fix: 228342641
Fix: 229060423
Test: VibrationPreferenceControllerTest
Change-Id: Ib46b3e0d0a980ff57e91f55c73348c440327bad7
2022-04-25 17:15:39 +01:00
Xiaowen Lei
5d3b0f46e3 Merge "Set "screensaver" as synonym of "Screen saver" for Settings search." into tm-qpr-dev am: d06a66be9f am: 54b996c88b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17890050

Change-Id: I5f07563d7879226c84c8017fa058267d7cee1729
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22 02:26:22 +00:00
Xiaowen Lei
8b6e115629 Set "screensaver" as synonym of "Screen saver" for Settings search.
Also set android:id attribute for Screen saver preference screen.
When the attribute is unset, the search result is removed.

Bug: 229106045
Fix: 229106045
Test: on device. Forced Settings search re-indexing.

Change-Id: Ibaff9baacb28ecc5b41ac9c1e264b4ab28a83ce9
2022-04-21 16:27:33 +00:00
Abel Tesfaye
cf601f574b Merge "Add accessibility string description for auto rotate" into tm-dev am: 3adc967449 am: 6aa417f742
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17835757

Change-Id: I02147541619d5d5220687ddedf59bf33b2681a86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 21:46:46 +00:00
Abel Tesfaye
3adc967449 Merge "Add accessibility string description for auto rotate" into tm-dev 2022-04-20 21:31:23 +00:00
PETER LIANG
b579c1aa43 Merge "Should popup the confirmation toast after clicking the reset button." into tm-dev am: 8cb0439d9c am: cc4af05607 am: 37fa12e2d6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17822267

Change-Id: I078115b77edc9cd16a8ac4c5eb56f88b2048f2d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 14:07:51 +00:00
PETER LIANG
37fa12e2d6 Merge "Should popup the confirmation toast after clicking the reset button." into tm-dev am: 8cb0439d9c am: cc4af05607
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17822267

Change-Id: I74bb43797299b183a40f9050b6256e768361c7d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 13:20:24 +00:00
Peter_Liang
b833fe1bad Should popup the confirmation toast after clicking the reset button.
Goal: Users may not notice what the change after resetting all settings configs in the Text and reading options. So we will use the toast to give nice feedback for them.

Fix: 220126995
Test: make RunSettingsRoboTests  ROBOTEST_FILTER=TextReadingPreferenceFragmentTest
Change-Id: Ife42b0c9d8a0241d7b8c3e5dbe7f9f1e2a6d759a
2022-04-20 15:39:11 +08:00
TreeHugger Robot
a5d6861390 Merge "Update auto-rotate strings/toggles for better accessibility" into tm-dev am: 07950adad9 am: 3f7f5386c5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17767144

Change-Id: I56f2d65fadf3e9a0143e55532f71501a5d804dcb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 00:32:23 +00:00
Abel Tesfaye
c4c027a89d Add accessibility string description for auto rotate
Bug: 221191444

Change-Id: Id82aed3dd648c2b116e831488a0c23fa3efe3ee3
2022-04-20 00:11:46 +00:00
TreeHugger Robot
07950adad9 Merge "Update auto-rotate strings/toggles for better accessibility" into tm-dev 2022-04-19 23:44:38 +00:00
Abel Tesfaye
238b2cc721 Update auto-rotate strings/toggles for better accessibility
This change will update some strings for smart-auto-rotate and replace
the activity based switchbar with SettingsMainSwitchPreference. The
switchbar had to be replaced to allow the new text to appear above the main toggle.

Test: locally with flame and with resolver service enabled & disabled

Bug: 220182618
Change-Id: I4b60bf006bdde9e47b33a52c7719ec770caf5746
Merged-In: I4b60bf006bdde9e47b33a52c7719ec770caf5746
2022-04-19 21:21:34 +00:00
Yasin Kilicdere
cdc0f7213d Merge "Revert "Revert "Remove the fallback AddSupervisedUserActivity.""" 2022-04-19 15:37:34 +00:00
TreeHugger Robot
647f7e081f Merge "Update dream settings strings with sensible char limits." into tm-qpr-dev am: 455bf0c881
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17802107

Change-Id: Iefd89ab4ac8f439915d6caf5ce87cae63571a671
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-18 22:06:54 +00:00
TreeHugger Robot
455bf0c881 Merge "Update dream settings strings with sensible char limits." into tm-qpr-dev 2022-04-18 21:50:38 +00:00
Peiyong Lin
fa6ecc7857 Merge "Clean up extra app info." into tm-dev am: bd26c3c747 am: fceaaa80a0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17757962

Change-Id: Id490733f3fed747546e80d96031bc71508f32748
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-18 18:44:47 +00:00
Peiyong Lin
9709e05a66 Merge "Clean up extra app info." into tm-dev am: bd26c3c747 am: f71c92bbb6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17757962

Change-Id: Ib6e82ca9a61dd489737f7044bd09c37ddc436861
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-18 18:44:20 +00:00
Lucas Silva
28b4fe2363 Update dream settings strings with sensible char limits.
Also removes some unused strings

Bug: 228790933
Test: n/a
Change-Id: I42fd1954242dc12370982bfbc0e18389e9a7c3dc
2022-04-18 17:00:50 +00:00
Kedar Chitnis
ba15580112 Merge "Guest mode UX flow updates to user settings" into tm-qpr-dev 2022-04-18 05:34:56 +00:00
Peiyong Lin
586bcd69d9 Clean up extra app info.
Bug: b/224595815, b/229336010
Test: manual
Change-Id: I21cda5a4a5f8f378a532ac0fd4e91c2cc011ed95
2022-04-16 00:47:05 +00:00
Abel Tesfaye
26bd5d74ba Merge "Add accessibility string description for auto rotate" 2022-04-14 19:07:05 +00:00
Quang Luong
132e8286cb Merge "Use WifiEntry.getStandardString() for Wi-Fi Type summary" into tm-dev am: 93ae7acbf4 am: 6f7a9b88ba
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17483256

Change-Id: I842c62d47fff47de41dcc40a18eca8f777ecc1db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 16:51:21 +00:00
Quang Luong
93ae7acbf4 Merge "Use WifiEntry.getStandardString() for Wi-Fi Type summary" into tm-dev 2022-04-14 16:14:21 +00:00
Tom Hsu
20c1f7b6d4 Merge "[Panlingual] Add a description for per app language." into tm-dev am: b18b106300 am: 0d204eadef
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17742047

Change-Id: Ic2c84b0da4a6546e96ab4bcac760d7dce9c4534c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 10:12:29 +00:00
Kedar Chitnis
a1fbad7dd8 Guest mode UX flow updates to user settings
- Add option in user settings to enable/disable ephemeral
  mode for guest user
- Update user settings to show exit guest and reset guest preferences
- Update user settings to show guest related preferences grouped together

Bug: 214031645, 175795666
Screenshots: go/ephemeral-guest-b-214031645-ux
Test: Manual test on sunfish, atest SystemUITests, atest SettingsRoboTests

Relands ag/16544951 after fixing post submit issues

Revert "Revert "Guest mode UX flow updates to user settings""

This reverts commit ed45e8c56a.

Change-Id: I54583f9021171ae523ff40d4f63835f1cb486e35
Merged-In: I54583f9021171ae523ff40d4f63835f1cb486e35
2022-04-14 09:37:57 +00:00
tom hsu
5281736004 [Panlingual] Add a description for per app language.
- This is to notify some app may not support to user.

Bug: 228415129
Test: local
Change-Id: I6205e0b5fdb3ee42a22ae4995c99e9d8dc5e0a2d
2022-04-14 06:47:13 +00:00
Abel Tesfaye
4d55d0eb41 Add accessibility string description for auto rotate
Bug: 221191444

Change-Id: Id82aed3dd648c2b116e831488a0c23fa3efe3ee3
2022-04-13 23:00:39 +00:00
TreeHugger Robot
18292c4b92 Merge changes from topic "presubmit-am-984c5c7d1be740dead5dcc77f8f1b638" into tm-mainline-prod am: f600db3087
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17742045

Change-Id: Idd47ba7b6d58ff676aa36c3add35a5eb83549894
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-13 13:55:49 +00:00
TreeHugger Robot
ee6d283b82 Merge "[Panlingual] Make error message generic." into tm-dev 2022-04-13 13:26:20 +00:00
TreeHugger Robot
10185f5f6f Merge changes from topic "presubmit-am-1d3c2787da5b4d3c85f04dc64ca85922" into tm-mainline-prod am: fa3a25df06
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17742044

Change-Id: I593ee582db31106a81e8db0bb2b5f408a017654a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-13 11:56:00 +00:00
tom hsu
7bd1fde34d [automerge] [Panlingual] Make error message generic. 2p: ddbff186f3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17742045

Bug: 226032712
Change-Id: I7fe9114d6da4ac26b1dfbbe318311a65faa8d9d5
2022-04-13 11:19:55 +00:00
TreeHugger Robot
e9e6a00814 Merge "Remove subtitle of system default" into tm-dev 2022-04-13 11:17:00 +00:00
tom hsu
ddbff186f3 [Panlingual] Make error message generic.
Bug: 226032712
Test: local
Change-Id: Ibfdc3d5807df4f8e5f1aa3fd37a8f361624c4129
2022-04-13 19:16:03 +08:00
Calvin Pan
9f4b8691e2 [automerge] Remove subtitle of system default 2p: 9ee9787dd3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17742044

Bug: 226894987
Change-Id: I243580150c421ee8291cbddce1aacee150bd82ee
2022-04-13 09:16:21 +00:00
Calvin Pan
9ee9787dd3 Remove subtitle of system default
Bug: 226894987
Test: manual
Change-Id: Iaa5e680567f5bb1d52f9a3ea911f1b573ba5b238
2022-04-13 09:12:16 +00:00
Betty Chang
6ebed73fbe Merge "[LE Audio] Broadcast Sink UI" into tm-dev 2022-04-11 13:57:52 +00:00
Presubmit Automerger Backend
301f134325 [automerge] [LE Audio] Broadcast Sink UI 2p: a56e198c61 2p: 81fe82cadd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17442209

Bug: 228274114
Change-Id: I98c0fe27e795c2115f7dd725eeda315497a724ad
2022-04-11 08:19:04 +00:00