Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
116,931 Commits 1 Branch 0 Tags
3eaadf598f583fdd56e635d01b85b5c68898ee79
Commit Graph

11183 Commits

Author SHA1 Message Date
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
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
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
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
Jake Weinstein
bfa7606ee6 Change Peak Refresh Rate string from 90 Hz to config_defaultPeakRefreshRate 
This should not be static, devices can launch with various
max refresh rates. Without this commit, you would need
to manually change the string for the summary
to be accurate.

Test: mm
Change-Id: I6f06fd5ebd57d7069a3d76e555950558a3edc48e
 2022-09-30 17:47:31 +00:00
Tom Hsu
f0635482c7 Merge "Revert "[Languages] Add new information to system language page."" into tm-qpr-dev am: 43ceaa85ee 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20064133

Change-Id: Ie4a6ec648a8a524d25f44dca22cbc145884c664b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-29 16:27:06 +00:00
Tom Hsu
43ceaa85ee Merge "Revert "[Languages] Add new information to system language page."" into tm-qpr-dev 2022-09-29 15:52:32 +00:00
Tom Hsu
6dbf883bd8 Merge "Revert "[Languages] Add new information to system language page."" 2022-09-29 09:08:09 +00:00
Tom Hsu
a4c78e3820 Revert "[Languages] Add new information to system language page." 
This reverts commit 3cbb6f8680.

Reason for revert: b/248456615

Change-Id: I3bc5088784ed97f69ffadb0ea69078bfcf7dc39d
Merged-In: I3bc5088784ed97f69ffadb0ea69078bfcf7dc39d
 2022-09-29 04:38:30 +00:00
Tom Hsu
2f753c7ba7 Revert "[Languages] Add new information to system language page." 
This reverts commit 3cbb6f8680.

Reason for revert: b/248456615

Bug: b/248456615
Test: Manual test pass

Change-Id: I3bc5088784ed97f69ffadb0ea69078bfcf7dc39d
 2022-09-29 04:01:03 +00:00
TreeHugger Robot
21ae4c48d9 Merge "Allow updating app updater balance increments." 2022-09-27 23:56:15 +00:00
Kweku Adams
f55726842a Allow updating app updater balance increments. 
Bug: 243987091
Test: modify values in UI and confirm settings values changed via adb
Change-Id: I054246cada5200c1ae663ac42117a3f0ba958b61
 2022-09-27 18:20:05 +00:00
TreeHugger Robot
ce71a7bba1 Merge "Separate Tether summary "Off" to dedicated string ID" 2022-09-27 07:44:19 +00:00
Weng Su
d0cd5492e4 Separate Tether summary "Off" to dedicated string ID 
- Separate Tether summary "Off" to dedicated string ID for special language translation

Bug: 228573128
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=TetherPreferenceControllerTest

Change-Id: I0615eb03d6329ef73b714af39e78836ae17ea408
 2022-09-24 23:03:53 +08:00
Treehugger Robot
eff730475e Merge "Settings: Protect sensitive data on the about phone" am: 4d5951c6ef am: 61d8dee2a0 am: 41e0e6fea7 am: 984e74a32e am: 5d95b855dc 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2146259

Change-Id: I147a3065c4b214508b325c02e95da68ad22fec0f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-24 10:57:12 +00:00
Treehugger Robot
5d95b855dc Merge "Settings: Protect sensitive data on the about phone" am: 4d5951c6ef am: 61d8dee2a0 am: 41e0e6fea7 am: 984e74a32e 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2146259

Change-Id: Ib32baeda6471ed9a8a2e5aa2cd84088505c1f7ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-24 10:26:46 +00:00
Treehugger Robot
984e74a32e Merge "Settings: Protect sensitive data on the about phone" am: 4d5951c6ef am: 61d8dee2a0 am: 41e0e6fea7 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2146259

Change-Id: I03ee47dea1bfc1ac0f5d6f49e738346571f304e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-24 09:57:27 +00:00
Treehugger Robot
41e0e6fea7 Merge "Settings: Protect sensitive data on the about phone" am: 4d5951c6ef am: 61d8dee2a0 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2146259

Change-Id: Iaeef4967d528aca3e4d66f98952635cb97ed9350
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-24 09:27:24 +00:00
TreeHugger Robot
2342c0feda Merge "Add phone, tablet, device fp deletion strings." 2022-09-22 20:44:30 +00:00
Grace Cheng
59f4b7bdc9 Merge "Fix alignment of finger animation with progress bar" into tm-qpr-dev am: 108b73d972 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19995253

Change-Id: Ifc2d6aeaba2ac559b695fd1084ce6668fcc8c94e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-22 18:38:19 +00:00
Grace Cheng
108b73d972 Merge "Fix alignment of finger animation with progress bar" into tm-qpr-dev 2022-09-22 17:37:13 +00:00
Joshua Mccloskey
eaae33bd7b Add phone, tablet, device fp deletion strings. 
Change-Id: I5b6167f1c755d974db8f73debc6bab4709c136cf
Test: Manual.
Fixes: 245411037
 2022-09-20 19:07:39 +00:00
Grace Cheng
76902f4b7c Fix alignment of finger animation with progress bar 
Makes progress bar opaque and fixes color codes accordingly, and adjusts
values to shift finger animation and progress bar for proper alignment

Test: Enroll finger in light and dark theme and observe alignment of
finger with progress bar
Fixes: 245819077
Change-Id: I26bea8e1870f08b413a4ec2a9e6e83015facd004
Merged-In: I26bea8e1870f08b413a4ec2a9e6e83015facd004
 2022-09-20 16:53:09 +00:00
Grace Cheng
415314113b Fix alignment of finger animation with progress bar 
Makes progress bar opaque and fixes color codes accordingly, and adjusts
values to shift finger animation and progress bar for proper alignment

Test: Enroll finger in light and dark theme and observe alignment of
finger with progress bar
Fixes: 245819077
Change-Id: I26bea8e1870f08b413a4ec2a9e6e83015facd004
 2022-09-20 16:13:14 +00:00