Commit Graph

121152 Commits

Author SHA1 Message Date
Automerger Merge Worker
a733c64a58 Merge "Merge "Show Bluetooth dialog in a specific case" am: e1e657dac3 am: 420a8474db am: c6cbe0b6ac" 2023-02-14 02:55:50 +00:00
SongFerng Wang
daea6912b1 Merge "Add two LE audio broadcast pageId" 2023-02-14 02:55:27 +00:00
Hieu Dang
1fa42f8669 Merge "Show Bluetooth dialog in a specific case" am: e1e657dac3 am: 420a8474db am: c6cbe0b6ac
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2424645

Change-Id: I632da7916e4a199880038e610e27219492d5bf8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-14 02:55:06 +00:00
Hieu Dang
c6cbe0b6ac Merge "Show Bluetooth dialog in a specific case" am: e1e657dac3 am: 420a8474db
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2424645

Change-Id: I09e99a75b6509f750d938090ede17c4fe3398a7c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-14 02:45:29 +00:00
TreeHugger Robot
834dda9105 Merge "Add persistent MTE toggle to development options." 2023-02-14 02:40:01 +00:00
Karishma Vakil
d400e6af7b [Safety Labels] Add final strings for Settings app changes
Bug: 261914980
Test: manual
Change-Id: I2a5c04cf59b79836213bd2e8c6789f4cd8124d4c
2023-02-14 02:18:22 +00:00
Jiaming Liu
1c0af48f8c Fix build for jetpack update
Fix build for jetpack update

Bug: 265818545
Test: build

Change-Id: If48e7338ee560d995cb8bff7b5348ab36c457836
Merged-In: If48e7338ee560d995cb8bff7b5348ab36c457836
(cherry picked from commit e65283de6a)
(cherry picked from commit 5a6444776a)
2023-02-14 02:04:33 +00:00
Hieu Dang
420a8474db Merge "Show Bluetooth dialog in a specific case" am: e1e657dac3
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2424645

Change-Id: I9e231ac0e16c8e8217be53cc89335758b14be6a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-14 02:02:08 +00:00
Hieu Dang
e1e657dac3 Merge "Show Bluetooth dialog in a specific case" 2023-02-14 01:55:09 +00:00
Aswin Sankar
ff8f96c0be Attempt cross-SIM enablement when auto data switch enabled
- For devices that have opted in with overlay config, enabling a 2nd SIM
and modifying 'Switch mobile data automatically' will update cross-SIM
calling enablement.
- These updates will be logged as settings events.

Bug: 260266794
Test: Live tests for cross-SIM calling across both subs.
Change-Id: I64d25ca406877ca5f061064e0a3b23f54c125638
2023-02-14 00:42:58 +00:00
menghanli
dd2ec775c8 Add a done button to vision setting pages in setup flow
Root cause: User feels confused because the particular screen doesn't have a back button but at that moment of the setup flow the regular UI gestures didn't even work.
Solution: Add a done button to the vision settings pages for clearer navigation.

Bug: 262995569
Test: make RunSettingsRoboTests ROBOTEST_FILTER=FragmentForSetupWizardTest
Change-Id: Id3a0d78389e0e6c11b5b5cf016b37673fde7f286
2023-02-14 08:41:46 +08:00
Diego Vela
d2dfc4285e Update ActivityEmbedding usage.
Bug: 259592300
Test: build.
Change-Id: I8e4aa8daf51cb9c669d06b152cc5a2fc69a06571
Merged-In: I8e4aa8daf51cb9c669d06b152cc5a2fc69a06571
(cherry picked from commit a9394d1796)
(cherry picked from commit 65bb5a09f4)
2023-02-14 00:36:20 +00:00
Ioana Alexandru
65785048a6 Merge "Remove method to change allowed NAS adjustments." 2023-02-13 22:19:32 +00:00
TreeHugger Robot
bb481f5115 Merge "Suppress emergency page search when needed." 2023-02-13 21:39:26 +00:00
Fan Zhang
f901a72fe2 Suppress emergency page search when needed.
When controller#shouldSuppressFromSearch returns true, suppresses page
search.

Fix: 268664782
Test: manual
Change-Id: Ida543ae47aed36380200d938ea31fe80195b7186
2023-02-13 12:26:54 -08:00
Xinyi Zhou
19e792ae4b Merge "Revert "Revert "Delete Fast Pair Settings""" 2023-02-13 19:58:23 +00:00
TreeHugger Robot
e2380a2b7a Merge "Add back dialog when disabling provider" 2023-02-13 19:13:28 +00:00
Prabal Singh
a644a64fe9 Redirect AdvancedSecuritySettings to MoreSettings
When safety center is enabled, AdvancedSecuritySettings page will be
merged into MoreSettings.

Test: manually tested
Bug: b/269079559
Change-Id: I4f22befa915c78e1ca4e73e16cda05b50e890deb
2023-02-13 18:03:51 +00:00
Prabal Singh
dff3e4ed74 Merge "Remove biometrics for work from more settings" 2023-02-13 17:55:32 +00:00
Prabal Singh
9afbd458d7 Remove Advanced Privacy Settings screen
This page will no longer be there in U, all these entries will be in
More Security Privacy page.
Removes the xml, and redirects the intent to the new More Security
Privacy page.
Bug: 263038547
Test: manually tested

Change-Id: Ib6dad47f79cdaadeff94c640e2001c59a0d8e233
2023-02-13 17:52:15 +00:00
tom hsu
d3f9d7d843 Fix textview overlap after font size modify to maximum
Bug: b/267268456
Test: Manual test passed
Change-Id: Ib9baf42c5ea07e6530e604a8e22fe0b6b6d5ca82
2023-02-14 00:55:47 +08:00
Prabal Singh
390d683a3b Remove biometrics for work from more settings
Biometrics, Face, and Fingerprint for work has been moved to the Privacy
subpage in safety center. This removes them from More Settings to avoid duplication.

Also fixes the ordering of the sections.

Test: manually tested
Bug: b/269079559
Change-Id: Ic8780e03e13c6d87a00f206507805963ba52bd71
2023-02-13 15:44:59 +00:00
Neil Fuller
37996acd7c Further status logic tweaks
Change the SettingsUI logic slightly: All other things being equal, pick
the "worst" location dependency status to show. Some renaming and
annotations for clarity.

Also fixes the mocking behavior in the tests around resources, which
were accidentally using the real strings and therefore dependent on real
resource string values. Tests are made more explicit.

Bug: 266921482
Test: atest tests/robotests/src/com/android/settings/datetime/LocationProviderStatusPreferenceControllerTest.java
Change-Id: Ifd96c543dad692884be23bf94e3f1294eed291d5
2023-02-13 15:03:32 +00:00
Neil Fuller
fc4f2ce81d Tweak status display logic and tests
The existing logic and tests looks incorrect. Tests have been tidied up
to reflect real cases. For example, it's not really possible for the
provider to report being "blocked", but for it to report it is "certain"
at the same time.

Bug: 266921482
Test: atest tests/robotests/src/com/android/settings/datetime/LocationProviderStatusPreferenceControllerTest.java
Change-Id: I1a0faa44ed7dd09828ff758db9e40f5d5e010ab0
2023-02-13 15:03:15 +00:00
Behnam Heydarshahi
236bbcb8bc Propagate mute event to both ring volume slices
Fix a bug where introduction of a separate_ring_volume slice meant that
the original ring_volume slice would not get notified of ring stream
muting event.

Bug: b/266855922

Test: make DEBUG_ROBOLECTRIC=1 ROBOTEST_FILTER=VolumeSliceHelperTest RunSettingsRoboTests -j40
Change-Id: Ifb5ebe4e7d9bde3d14336891cce3fbee167a5911
2023-02-13 14:50:27 +00:00
Arc Wang
5ccbb3ee4d Merge "Allow save by AddNetworkFragment itself" 2023-02-13 14:23:19 +00:00
Jakub Rotkiewicz
88ae511843 [automerger skipped] Merge "SnoopLogger: Debug enhancements added settings" am: cfde422f91 am: bd2f353f8b am: 2a82a4f3b1 -s ours
am skip reason: Merged-In I132a1558ea67400d9c10dda523456f99eb815b92 with SHA-1 934b0bb739 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2362495

Change-Id: I9255de33985fa77d8a1b9727495439d1f41a2e5a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-13 14:22:15 +00:00
Jakub Rotkiewicz
2a82a4f3b1 Merge "SnoopLogger: Debug enhancements added settings" am: cfde422f91 am: bd2f353f8b
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2362495

Change-Id: I948bc2e08e3044d20a9d3ce5b081c940bea54811
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-13 14:19:30 +00:00
Jakub Rotkiewicz
bd2f353f8b Merge "SnoopLogger: Debug enhancements added settings" am: cfde422f91
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2362495

Change-Id: I3c138106ebdaaf6b5597c6a79054915a04098117
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-13 13:35:37 +00:00
Jakub Rotkiewicz
cfde422f91 Merge "SnoopLogger: Debug enhancements added settings" 2023-02-13 13:01:01 +00:00
Bonian Chen
0996decc69 Merge "[Settings] User restriction should be applied" 2023-02-13 12:38:41 +00:00
Bonian Chen
6d225b22f1 Merge "[Settings] Unified the source of phone number" 2023-02-13 12:38:14 +00:00
Bonian Chen
dc82f0a0ee Merge "[Settings] Avoid from Guest user to access UI which requires permission for changing mobile networi configurations" 2023-02-13 12:37:45 +00:00
Jakub Rotkiewicz
5a1b8a11a6 SnoopLogger: Debug enhancements added settings
Bug: 247859568
Tag: #feature
Test: make RunSettingsRoboTests3
Test: make RunSettingsRoboTests4

Change-Id: I132a1558ea67400d9c10dda523456f99eb815b92
Merged-In: I132a1558ea67400d9c10dda523456f99eb815b92
2023-02-13 11:35:55 +00:00
Jakub Rotkiewicz
dce72966fb Merge "SnoopLogger: Debug enhancements added settings" 2023-02-13 11:29:16 +00:00
Nikhil Kumar
6c3f1df8ff Merge "SettingsActivity: Get profile parent using UserManager.getProfileParent" 2023-02-13 09:59:01 +00:00
Nikhil Kumar
71214f0457 Merge "SettingsHomepageActivity: Get profile parent using UM.getProfileParent" 2023-02-13 09:58:44 +00:00
Arc Wang
da01d199c1 Allow save by AddNetworkFragment itself
Before this change, the calling Activity needs to
check result and get WifiConfiguration to save
data by WifiManager API.

This change allows callings app to specify an auto
save extra to save WifiConfiguration by
AddNetworkFragment itself.

Bug: 268411305
Test: manual
Change-Id: I83002c3de3d6726e9be363d5ac057b4ae9e1707e
2023-02-13 17:24:02 +08:00
TreeHugger Robot
7c7e235730 Merge "Update battery usage app list filter logic:" 2023-02-13 09:05:01 +00:00
Bonian Chen
ceaa5cd7ae [Settings] User restriction should be applied
Simply verify isAdminUser() could be insufficient, since there're some
other use cases (such as managed device).

Bug: 228079419
Test: local

Change-Id: Ic9f27deafada31dacef03e27bf02ecbc9a8b3231
2023-02-13 09:04:04 +00:00
Bonian Chen
b6aae6cc3e Merge "[Settings] Avoid from accessing deprecated API getLine1Number()" 2023-02-13 07:36:12 +00:00
Zaiyue Xue
7fad47a8d7 Update battery usage app list filter logic:
(1) Add app screen on time thrshold 100 ms.
(2) Change app battery comsuption threshold from 0.1 mA to 1 mA.
Apps meet one of above conditions will be shown.

Bug: 264840285
Test: manual
Change-Id: Icfb304f09c49248397350ebe55bf06f3eb82d639
2023-02-13 15:30:03 +08:00
Angela Wang
96968c3dc5 Merge "Fix fail test case in FlashNotificationsUtilTest" 2023-02-13 05:13:39 +00:00
Bonian Chen
c9ace54b03 [Settings] Unified the source of phone number
Route UI access to phone number into a unified util class within
Settings app.

Bug: 265940535
Test: local

Change-Id: Ic747b0044217101d9a6a1e2cd6e59bbdbcd88021
2023-02-13 04:57:18 +00:00
Bonian Chen
8f4e1ace9d [Settings] Avoid from accessing deprecated API getLine1Number()
Migrate to new APIs.

Bug: 269052593
Test: build pass

Change-Id: I76705ec303fa9a593dd3a63d5cac3bdf65258315
2023-02-13 04:42:57 +00:00
Lili Zou
1da516bc2c Merge "Support search for work profile settings page." 2023-02-13 03:32:27 +00:00
jasonwshsu
642380410d Fix fail test case in FlashNotificationsUtilTest
* Update correct code for ScreenFlashNotificationColor.AZURE

Bug: 237628564
Test: make RunSettingsRoboTests ROBOTEST_FILTER=FlashNotificationsUtilTest
Change-Id: I10a3106ab140192841a703b50763a1d2e6b1c0d0
2023-02-13 01:52:37 +08:00
Bonian Chen
6fa898d709 [Settings] Avoid from Guest user to access UI which requires permission
for changing mobile networi configurations

1. Confirm eSIM deletion should not be accessible by the end user
2. Erase eSIMs UI should should not be accessible by the end user

Bug: 260726944
Test: local

Change-Id: I45792fd451dbdc8a0788922480a7fa51f1267a68
2023-02-12 14:19:06 +00:00
TreeHugger Robot
5a2088e232 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 3773ae0d9f -s ours am: 507631c4f5 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21362005

Change-Id: I90f8bc98cdc6f3c5daea7f04ad1d9ea9e37b400a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-11 22:06:53 +00:00
Bill Yi
a7a96f7f0f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9bd553ab9c -s ours am: 9dcc1f9bed -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21362005

Change-Id: I3ba8bf5cf983acc79ed2a8a3f4459457066d3e29
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-11 22:06:36 +00:00