Commit Graph

11203 Commits

Author SHA1 Message Date
Yining Liu
923cdcae41 Fix text in notification settings for apps that do not send notifications am: e899b4c96c am: 7f6b3cc7ca
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20283152

Change-Id: I3b63362fab7d5c532d231b7db82553fc9a7bde4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-28 00:23:19 +00:00
Yining Liu
7f6b3cc7ca Fix text in notification settings for apps that do not send notifications am: e899b4c96c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20283152

Change-Id: Ic748f560f9a4767b6c75349506ae569cde1473af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-27 23:29:27 +00:00
Yining Liu
e899b4c96c Fix text in notification settings for apps that do not send notifications
Added a new string to show for apps apps that target T, but do not declare the POST_NOTIFICATIONS permission in notification settings.

Bug: 229108007
Test: `croot` `make -j64 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.notification.app.NotificationsOffPreferenceControllerTest"` and manual: open Settings-Notifications-App Settings, check the text for apps that does not post notifications with toggle disabled. Text should be: "This app does not send notifications" when system language is English.
Change-Id: I9822b6f983e00c5982522099e339d86fae45aefe
2022-10-27 20:19:44 +00:00
George Chan
7e11a11ac1 Merge "Revert "Added transparency-metadata display."" 2022-10-27 18:19:58 +00:00
George Chan
f9b20b0fe9 Revert "Added transparency-metadata display."
Revert "Added new transparency metadata enum."

Revert submission 19943929-mba_ui

Reason for revert: Feature cancelled due to product direction change.
Reverted Changes:
I7b3e296c3:Added transparency metadata feature flag.
Ia4b2f294b:Added new transparency metadata enum.
If7822100a:Added transparency-metadata display.

Change-Id: If50179b4a485587dcf49a2c9e2ae18a69b173794
2022-10-26 20:54:02 +00:00
Chaohui Wang
8c1af5a992 Clean up unused strings for Settings
Bug: 234570979
Test: m Settings
Change-Id: I078b55b02292ef3659b78cae91a80fa77ff35de2
2022-10-26 17:00:30 +00:00
TreeHugger Robot
da0c687949 Merge "Add Ethernet tethering subtext for tablet project" into tm-qpr-dev am: 7ead0a4133 am: 6c70e8d179
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20271260

Change-Id: I310abe836531ffa8e099d82eb981fae713a24461
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-26 07:20:25 +00:00
TreeHugger Robot
6c70e8d179 Merge "Add Ethernet tethering subtext for tablet project" into tm-qpr-dev am: 7ead0a4133
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20271260

Change-Id: Ia294bc5ff2cc7cbb0df9975edb754eddb1552a32
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-26 06:42:00 +00:00
TreeHugger Robot
7ead0a4133 Merge "Add Ethernet tethering subtext for tablet project" into tm-qpr-dev 2022-10-26 06:00:19 +00:00
Ling Ma
1cbf8c786a Merge "Convert dataDuringCall to autoDataSWitch" 2022-10-25 23:36:43 +00:00
Diya Bera
f15f443ce5 Merge "Remove flicker during fingerprint enrollment" into tm-qpr-dev am: d66e0c4c75 am: da8c78f093
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20249709

Change-Id: I78baceb039e99545ae5abf9f0c54606188d621b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-25 21:46:44 +00:00
Diya Bera
da8c78f093 Merge "Remove flicker during fingerprint enrollment" into tm-qpr-dev am: d66e0c4c75
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20249709

Change-Id: If6de61542beed2a43d775a0b3706b11a95b5160b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-25 21:07:53 +00:00
Diya Bera
d66e0c4c75 Merge "Remove flicker during fingerprint enrollment" into tm-qpr-dev 2022-10-25 20:29:24 +00:00
TreeHugger Robot
e3e6b7e76f Merge "Remove string "snoop" from UI" 2022-10-25 11:21:17 +00:00
Weng Su
32a66a67f3 Add Ethernet tethering subtext for tablet project
- Add "Share tablet's internet connection via Ethernet"

Bug: 243876722
Test: manual test
Change-Id: I9fc50b9f4bc4ada30a033f4ccd95dd7159b967b1
2022-10-25 16:26:16 +08:00
Jack Yu
60eda146c6 Remove string "snoop" from UI
Based on the suggestion from privacy team, remove the string "snoop"
from UI.

Bug: 204397062
Test: build pass
Change-Id: I5af03f5160c8d81aab0f731bc105848588403318
2022-10-25 15:08:58 +08:00
Diya Bera
9e1649273f Remove flicker during fingerprint enrollment
Test: m RunSettingsRoboTests -j30 ROBOTEST_FILTER=FingerprintEnrollEnrollingTest
Bug: 247581748
Change-Id: I7e456670fa0a8527f47bd8057fb755c0c2c1eeeb
2022-10-24 22:21:58 +00:00
Roman Kalukiewicz
009945a337 Merge "Change the "Blocked by IT admin" to use family related dialog for children." 2022-10-24 15:23:51 +00:00
TreeHugger Robot
dda18d1d8c Merge "Add config for Wi-Fi Hotspot Settings hidden" into tm-qpr-dev am: 87d2f6d3cb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20244146

Change-Id: I7b3275ffad2af79bb81c3761b691ab793a61168a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-24 03:26:46 +00:00
Bonian Chen
5dae24208b [Settings] configuration for hidding SIM related UI
Add overriable configuration for hidding SIM related UI.

Bug: 240515161
Test: test cases and local testing
Change-Id: I8d7ddd18861a696830da39f040dfb14b9ed46726
2022-10-21 09:21:59 +00:00
Weng Su
f9b5e046a8 Add config for Wi-Fi Hotspot Settings hidden
- Add config_show_wifi_hotspot_settings for Settings customization

- Hide Wi-Fi Hotspot preference in Hotspot & tethering Settings

- Don't launch Wi-Fi Hotspot Settings (e.g long press on Hotspot in QS-tile)

Bug: 213426762
Test: manual test
atest -c com.android.settings.wifi.WifiUtilsTest
make RunSettingsRoboTests ROBOTEST_FILTER=WifiTetherPreferenceControllerTest
make RunSettingsRoboTests ROBOTEST_FILTER=WifiTetherSettingsTest

Merged-In: I11f88d0d15d6d5c2766b64b5847ac31ed0f34c25
Change-Id: I11f88d0d15d6d5c2766b64b5847ac31ed0f34c25
(cherry picked from commit 160b5078ed)
2022-10-20 09:50:22 +00:00
TreeHugger Robot
c757a12a4e Merge "Add config for Wi-Fi Hotspot Settings hidden" 2022-10-20 06:08:55 +00:00
Weng Su
160b5078ed Add config for Wi-Fi Hotspot Settings hidden
- Add config_show_wifi_hotspot_settings for Settings customization

- Hide Wi-Fi Hotspot preference in Hotspot & tethering Settings

- Don't launch Wi-Fi Hotspot Settings (e.g long press on Hotspot in QS-tile)

Bug: 213426762
Test: manual test
atest -c com.android.settings.wifi.WifiUtilsTest
make RunSettingsRoboTests ROBOTEST_FILTER=WifiTetherPreferenceControllerTest
make RunSettingsRoboTests ROBOTEST_FILTER=WifiTetherSettingsTest

Change-Id: I11f88d0d15d6d5c2766b64b5847ac31ed0f34c25
2022-10-19 20:13:21 +08:00
Julia Reynolds
b495103ca7 Merge "Add link to more app settings" 2022-10-18 19:32:27 +00:00
Lucas Silva
947bf37e31 Merge "Update dream summary when dream suppressed by bedtime mode" into tm-qpr-dev am: 6a8e193fad am: 5067d29ba4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20216381

Change-Id: Id7b947a04e655fe5d6e8b98c2fb8857be4cfb256
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-18 18:15:24 +00:00
Lucas Silva
5067d29ba4 Merge "Update dream summary when dream suppressed by bedtime mode" into tm-qpr-dev am: 6a8e193fad
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20216381

Change-Id: I72ec38de9b99e704d909ddf9e21e7ac825b00abf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-18 17:43:35 +00:00
Lucas Silva
51f838ba4b Update dream summary when dream suppressed by bedtime mode
Bug: 246472225
Test: enabled bedtime mode, verified settings summary updated
Test: make -j64 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.dream.WhenToDreamPreferenceControllerTest"
Change-Id: I4de12f636975b1bdf36898f7a530fde2f55644d4
2022-10-18 13:23:49 +00:00
Julia Reynolds
9ef3cf2572 Add link to more app settings
Test: MoreSettingsPreferenceControllerTest
Test: test app that can handle the settings intent
Bug: 236932102
Change-Id: Iae778c93057e47aa0f664d3faab21640b2cd5193
2022-10-17 13:59:31 -04:00
Chaohui Wang
507e5f8c90 Fix some errors for Settings project
Attrs could not have same name, so create a common parent for the
messageText. And BiometricEnrollCheckbox is not in use.

Replace some com.android.settingslib.R with com.android.settings.R,
because these are files in settings instead of settingslib.

Bug: 253772249
Test: TAP
Change-Id: Ifa796e923bf26facf4935be4968637affdb4b48b
2022-10-16 14:14:02 +08:00
Ling Ma
4e7f783906 Convert dataDuringCall to autoDataSWitch
The feature is enabled via
TelephonyManager.MOBILE_DATA_POLICY_AUTO_DATA_SWITCH. The feature only
applies to non-DDS. If enabled, we automatically switch to the non-DDS for data traffic when it has better availability than the DDS.

The UI change are(as required by b/247880971):
1. data during call is replaced by auto data switch, and moved under
   mobile data toggle.
2. Network & internet and Internet page now show the currently active
   subscription, instead of the defalut subscription. If the currently
   active sub is not the default, it's reflected in summary as
   "temporarily".

Test: manual
Bug: 244064524
Change-Id: Ica1eba99cee0d4af528d58f1c7bd1439400bfa66
2022-10-14 13:23:08 -07:00
Anay Wadhera
17231a4375 Merge "Change Peak Refresh Rate string from 90 Hz to config_defaultPeakRefreshRate" 2022-10-13 18:02:22 +00:00
Jackson Michael Moreira Miranda
f81ae05d26 Merge "Adding the sections "Allow multiple users" and "Delete guest activity" on the search result" 2022-10-13 17:00:19 +00:00
Jackson Michael
898421bd0c Adding the sections "Allow multiple users" and "Delete guest activity" on the search result
Also added new keywords strings for the both items.

Bug: 245261104
Test: Manual test and unit test
Change-Id: I3ddc1204c6dbdcd6a82ffaa55f4ca7f4bcb3783d
2022-10-13 12:31:03 +00:00
Behnam Heydarshahi
ee4d902410 Merge "Add notification volume controller in settings" into tm-qpr-dev am: 7f6c833b89 am: 8b2496eb9e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19940409

Change-Id: Ia1b13bf425da2ef90c287b3aaee6231891c67bd2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-12 20:38:18 +00:00
Behnam Heydarshahi
8b2496eb9e Merge "Add notification volume controller in settings" into tm-qpr-dev am: 7f6c833b89
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19940409

Change-Id: Iffd5dcd7eb9ad645807d9529f352582457dc3f0e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-12 20:07:05 +00:00
Behnam Heydarshahi
7f6c833b89 Merge "Add notification volume controller in settings" into tm-qpr-dev 2022-10-12 19:37:26 +00:00
Edgar Wang
a307fa1371 Merge "Update the strings of Admin-Support Dialog" 2022-10-12 16:39:21 +00:00
Hugh Chen
b1fac0fb92 RESTRICT AUTOMERGE Refactoring settings UI am: f891f7ba86
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20034710

Change-Id: I2e6bb7660f690b2aa2db5a2ef4c628e406d674c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-12 06:35:46 +00:00
Edgar Wang
0b7944d38e Update the strings of Admin-Support Dialog
Bug: 252967902
Test: manual
Change-Id: I1c196aef3bea0771e99487b583c7d29fe9264a98
2022-10-12 13:08:24 +08:00
Lauren Winston
246597c1ac Merge "Revert "Add a cursor preference to Accessibility Settings"" 2022-10-11 23:00:34 +00:00
Lauren Winston
4f493778a6 Revert "Add a cursor preference to Accessibility Settings"
This reverts commit 205018a854.

Reason for revert: Software Cursor not launching in Android U

Change-Id: Ieddc6b27a8a28910e7c12328ee6d1b5e0d2e4c17
2022-10-11 18:32:27 +00:00
Treehugger Robot
fcf10fa0a5 Merge "Add fallback summary text if there is no matching screen timeout value" am: 007c215c3e am: 44431c73e7 am: 332183ee4d
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2239486

Change-Id: I3a672bdfab89c1b7048f6501c3444a4b598daaf3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-11 07:29:39 +00:00
Treehugger Robot
332183ee4d Merge "Add fallback summary text if there is no matching screen timeout value" am: 007c215c3e am: 44431c73e7
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2239486

Change-Id: I39f0b958a99e4109b454a2edc66c0dee1c03a7ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-11 06:56:21 +00:00
Hugh Chen
f891f7ba86 RESTRICT AUTOMERGE Refactoring settings UI
Bug: 248174653
Test: build & boot pass
Change-Id: I124a65941349d3338145865cae2c8354678897fa
2022-10-11 04:30:09 +00:00
Behnam Heydarshahi
3ac6aaf796 Add notification volume controller in settings
Separate notification and ring controllers based on the ring/volume
stream alias boolean in config.xml.

For both ring and volume controller: Not show vibrate icon when vibration is not supported on device. Show
silent icon instead.

Known issue: Add the notification volume slider only in Settings, and
not in VolumePanelDialog. When the alias is set to false and the streams
separated, the ring volume slider in VolumePanelDialog keeps its title
of "Ring & notification volume" instead of changing to "Ring volume".

Bug: b/38477228

Test: make DEBUG_ROBOLECTRIC=1 ROBOTEST_FILTER=NotificationVolumePreferenceControllerTest RunSettingsRoboTests -j40
      make DEBUG_ROBOLECTRIC=1 ROBOTEST_FILTER=RingVolumePreferenceControllerTest RunSettingsRoboTests -j40
      make DEBUG_ROBOLECTRIC=1 ROBOTEST_FILTER=SoundSettingsTest RunSettingsRoboTests

Change-Id: Id17523f49b291a5cf612b90f93c3b2ab6486c62f
2022-10-10 14:42:56 +00:00
Chaohui Wang
a947e88c9f Clean up unused AppPermissionsPreferenceController
This one is replaced by AppPermissionPreferenceController.

Bug: 234570979
Test: m Settings
Change-Id: Id9d16caf33cdea626f79a3cd142dfcde2c54769f
2022-10-09 15:42:01 +08:00
Shen Lin
97a61bad7d Add fallback summary text if there is no matching screen timeout value
Screen timeout summary string can be null if there is no matching candidate, so we need a fallback summary here to avoid showing unexpected summary text.

Bug: 252340891
Test: manual

Change-Id: I939ae97a50063b2ffe84029135c3f340aeedf4c7
2022-10-09 01:59:02 +00:00
Lauren Winston
3f8d62fbf1 Revert "Add toggles for two Software Cursor settings: keyboard shift and trigger"
This reverts commit 28b4b34f92.

Reason for revert: Software Cursor is not launching in Android U

Test: manual

Change-Id: I213cf64ca94fce51883a30a9d6b734b4ed874dad
2022-10-06 23:58:50 +00:00
Wesley Wang
c8e077368f Fix battery saver number format issue
- The summary of battery saver scheduler use util to convert the number
   but saver sticky preference use another way to convert it, update
   them to use the same convert method

Bug: 250684701
Test: make SettingsRoboTests
Change-Id: I4f188a2e8e9d4810d187b870e331dc84f50b2b6f
2022-10-06 10:23:28 +00:00
Xin Li
f51d201af3 Merge TP1A.221005.003
Merged-In: Ia825853dde2e966e3d390cecfbe1a99f6439d31e
Change-Id: Ia7b51d3cc694287b930d240c77e5ba0ed9a527f4
2022-10-03 13:17:48 -07:00