Commit Graph

17176 Commits

Author SHA1 Message Date
Joshua Mccloskey
8793da4a56 Merge "Added basic SecuritySettingsPref test" into tm-qpr-dev am: b87ada7c93 am: 4006c7e9e8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19658607

Change-Id: Iac0e30237c3b8d0490c94a77f2f18b53fe846bc4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-19 01:15:21 +00:00
Joshua Mccloskey
4006c7e9e8 Merge "Added basic SecuritySettingsPref test" into tm-qpr-dev am: b87ada7c93
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19658607

Change-Id: I70ee59c235d23d1de53ca3eebba4c34e847d332a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-19 00:55:10 +00:00
Joshua Mccloskey
b87ada7c93 Merge "Added basic SecuritySettingsPref test" into tm-qpr-dev 2022-08-19 00:37:16 +00:00
TreeHugger Robot
e48008d287 Merge "Show default data SIM in Wi-Fi details when dual SIMs have the same carrier ID" into tm-qpr-dev 2022-08-18 20:30:20 +00:00
Joshua McCloskey
739ca9cc97 Added basic SecuritySettingsPref test
Test: atest SecuritySettingsTest
Bug: 234309000
Change-Id: I0d54ff17601ed6646c92472f03990a1dd3e4dc4d
2022-08-18 17:36:36 +00:00
TreeHugger Robot
86f436dd0d Merge "Consider usage map valid even if [all][all] is null." 2022-08-17 14:43:48 +00:00
Kuan Wang
508d938bc8 Consider usage map valid even if [all][all] is null.
Bug: 242835128
Fix: 242835128
Test: manual
Change-Id: Icd8e157f08d741604b5769464d74660651eb69df
2022-08-17 19:18:16 +08:00
Julia Reynolds
d1344b38dc Merge "Update Bridged app link when NLS access changes" into tm-qpr-dev am: dbaa419226 am: 80e1ca7c54
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19624197

Change-Id: I80cbd2726cf3609a1f266e46b728b1d632ea8abe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-17 08:35:03 +00:00
Menghan Li
84374522ea Merge "[Captioning preferences] Fix wrong color if default color selected" 2022-08-17 08:20:48 +00:00
Angela Wang
82140a2b73 Merge "Fix wrong visibility of link button in a11y tutorial dialog" 2022-08-17 07:38:46 +00:00
Weng Su
dc4ad09291 Show default data SIM in Wi-Fi details when dual SIMs have the same carrier ID
- Because the wifiConfiguration is only save the carrier ID for EAP-SIM authentication

- If multiple SIMs have the same carrier ID, the Wi-Fi framework will use the default data SIM for EAP-SIM authentication

- Show default data SIM in Wi-Fi details settings, when dual SIMs have the same carrier ID

Bug: 233765468
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=WifiDetailPreferenceController2Test

Change-Id: I350fe637f506134770ccf316e47c0e225661bb6a
Merged-In: I350fe637f506134770ccf316e47c0e225661bb6a
2022-08-17 07:07:17 +00:00
Robert Luo
c6d8ef82c4 Merge "Allow advanced VPN to manage connection status via its UI" into tm-qpr-dev am: 63aca8e131
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19491096

Change-Id: Id56424de408fca4a14807e29560a5694c4a63705
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-17 04:58:02 +00:00
Robert Luo
63aca8e131 Merge "Allow advanced VPN to manage connection status via its UI" into tm-qpr-dev 2022-08-17 04:28:08 +00:00
menghanli
0ed28e9fd0 [Captioning preferences] Fix wrong color if default color selected
Root cause: When the default captioning color was selected, the opacity became 100% and made the opacity preference is disabled. After changing to non-default color, the opacity preference becomes enabled, but it keeps showing cached opacity in opacity preference and the preview still shows the wrong color.

Solution: Cache the latest opacity if default captioning color was selected to show the correct opacity later.

Bug: 241308551
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.accessibility
Change-Id: I7712fb25d622da62d7fb2d017e33f94ef258941b
2022-08-17 12:00:43 +08:00
Jason Hsu
cd76ba8821 Merge "Add pair button in bluetooth details page for hearing aid device" into tm-qpr-dev am: f21593c870
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19569012

Change-Id: Iaa33b5b62f4940559c8fc630022456971f8fae11
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-17 03:32:25 +00:00
Jason Hsu
f21593c870 Merge "Add pair button in bluetooth details page for hearing aid device" into tm-qpr-dev 2022-08-17 02:43:47 +00:00
Julia Reynolds
80e1ca7c54 Merge "Update Bridged app link when NLS access changes" into tm-qpr-dev am: dbaa419226
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19624197

Change-Id: Iffe89254913fab91b02e3e5db18939912204de40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-16 19:55:23 +00:00
Julia Reynolds
dbaa419226 Merge "Update Bridged app link when NLS access changes" into tm-qpr-dev 2022-08-16 17:07:18 +00:00
Hugh Chen
2358afae79 RESTRICT AUTOMERGE Let advanced VPN profile visible immediately before the user consent to use VPN feature am: 1311019b9a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19447622

Change-Id: I3dd165a645a1bb63613d541453e32d7c943df776
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-16 04:37:06 +00:00
TreeHugger Robot
ea3f9f337e Merge "RESTRICT AUTOMERGE Let advanced VPN profile visible immediately before the user consent to use VPN feature" into tm-qpr-dev 2022-08-16 04:03:12 +00:00
Julia Reynolds
2a61b3656b Update Bridged app link when NLS access changes
Test: BridgedAppsLinkPreferenceControllerTest
Test: manual; turn an NLS on/off, verify correct disabled state for fields
Fixes: 240461761
Change-Id: Ib5a5365f7477c2a8d620ced2af96ace364b292e2
2022-08-15 17:50:49 +00:00
Weng Su
911573f2e1 [RESTRICT AUTOMERGE] Show default data SIM in Wi-Fi details when dual SIMs have the same carrier ID
- Because the wifiConfiguration is only save the carrier ID for EAP-SIM authentication

- If multiple SIMs have the same carrier ID, the Wi-Fi framework will use the default data SIM for EAP-SIM authentication

- Show default data SIM in Wi-Fi details settings, when dual SIMs have the same carrier ID

Bug: 233765468
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=WifiDetailPreferenceController2Test

Change-Id: I350fe637f506134770ccf316e47c0e225661bb6a
Merged-In: I350fe637f506134770ccf316e47c0e225661bb6a
(cherry picked from commit 2732be59e5)
2022-08-15 13:31:52 +00:00
Angela Wang
67efcacbc1 Fix wrong visibility of link button in a11y tutorial dialog
Root cause: the visibility of link button is not correctly set due to
the onPageSelected callback isn't called when the first page shows

Solution: Manually set the visibility of link button according to the
first tutirial page type when dialog is shown

Bug: 242141428
Test: make RunSettingsRoboTests ROBOTEST_FILTER=AccessibilityGestureNavigationTutorialTest
Change-Id: I33ed07bc7ae39d96baeeed85771c5f13e00ebf44
2022-08-15 06:01:17 +00:00
TreeHugger Robot
5ab0a976de Merge "Fix import of anyLong in BatteryChartPreferenceControllerTest." into tm-qpr-dev 2022-08-12 10:00:55 +00:00
Zaiyue Xue
2e7957727f Fix import of anyLong in BatteryChartPreferenceControllerTest.
This is to fix the merge conflicts within tm-qpr-dev,
tm-qpr-dev-plus-aosp and master.

Bug: 236101166
Test: manual
Change-Id: I2f4531ccc7c59b279d14bc5c0bd6c1fe51dd475d
Merged-In: I52547d10f0579fddb21091b641925910db17ef38
2022-08-12 13:57:53 +08:00
TreeHugger Robot
9178137457 Merge "Show default data SIM in Wi-Fi details when dual SIMs have the same carrier ID" 2022-08-12 05:31:38 +00:00
Treehugger Robot
25ffab4db6 Merge "Fix permissions for internal links." am: 24f45fbd63 am: e194aa42eb am: 2aa8cd1d1a am: 62fa667b26 am: bf0cb88417
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2182455

Change-Id: I342a1e0a403e8971eb69ae518a6b1aef125e6661
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-12 04:22:48 +00:00
Treehugger Robot
bf0cb88417 Merge "Fix permissions for internal links." am: 24f45fbd63 am: e194aa42eb am: 2aa8cd1d1a am: 62fa667b26
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2182455

Change-Id: If86acd9982d50238c1ed31f78735ef805857bc9f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-12 04:02:56 +00:00
Treehugger Robot
62fa667b26 Merge "Fix permissions for internal links." am: 24f45fbd63 am: e194aa42eb am: 2aa8cd1d1a
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2182455

Change-Id: I49eb01dd9ecf0f6bb606c778bbd0acbc99b11a4f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-12 03:47:12 +00:00
Treehugger Robot
e194aa42eb Merge "Fix permissions for internal links." am: 24f45fbd63
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2182455

Change-Id: I633c22a73b0d160c0fbf662768a92e4f0dfac85c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-12 03:03:53 +00:00
TreeHugger Robot
79bdae659c Merge "Wi-Fi panel doesn't need to check permission" into tm-qpr-dev am: 0077129094
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19590401

Change-Id: Ic53e1282db41bf8c8c66e8d750179189b3b1af1c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-12 02:46:52 +00:00
TreeHugger Robot
0077129094 Merge "Wi-Fi panel doesn't need to check permission" into tm-qpr-dev 2022-08-12 02:27:36 +00:00
Betty Chang
b9abc156c8 Merge "[LE Audio] To fix the condition of the broadcast icon display" into tm-qpr-dev am: 9c0904acde am: 0c2a3ead2b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19459987

Change-Id: I85e2d5a8589cf775ca2da2d79081eddbd9b59378
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-12 02:24:02 +00:00
TreeHugger Robot
044887da8e Merge "Add FLAG_SECURE for ChooseLockPassword and Pattern" into tm-qpr-dev am: 2cd733dcdb am: d208da6546
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19553474

Change-Id: I815b5f1af564e64e73cbc352b7b1cd233bd64537
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-12 02:23:35 +00:00
Betty Chang
0c2a3ead2b Merge "[LE Audio] To fix the condition of the broadcast icon display" into tm-qpr-dev am: 9c0904acde
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19459987

Change-Id: Ia2f4ab79a90b7733d0ad23b3573b55a527da84df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-12 01:40:05 +00:00
TreeHugger Robot
d208da6546 Merge "Add FLAG_SECURE for ChooseLockPassword and Pattern" into tm-qpr-dev am: 2cd733dcdb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19553474

Change-Id: Ib8bb80d10095f4de2d14bbe4facd1534977e0b79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-12 01:39:40 +00:00
Betty Chang
9c0904acde Merge "[LE Audio] To fix the condition of the broadcast icon display" into tm-qpr-dev 2022-08-12 01:29:01 +00:00
TreeHugger Robot
2cd733dcdb Merge "Add FLAG_SECURE for ChooseLockPassword and Pattern" into tm-qpr-dev 2022-08-12 01:19:01 +00:00
Prabal Singh
8a932c81be Merge "Hide work policy info if safety center is enabled" into tm-qpr-dev am: aaa6f7ef31 am: 94e073ce33
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19562169

Change-Id: Id246345cc0366630a2e8a83b3b3e717e347cbd8d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-11 22:44:37 +00:00
Prabal Singh
94e073ce33 Merge "Hide work policy info if safety center is enabled" into tm-qpr-dev am: aaa6f7ef31
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19562169

Change-Id: I54cb53c03d3b56aef294f64d32d5666e671b4e19
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-11 22:18:31 +00:00
Robert Luo
36d320a8de Allow advanced VPN to manage connection status via its UI
Bug: 238641532
Test: atest -c VpnSettingsTest
Change-Id: Ia6f1d84bba38bab7f13f46dc8a4fdb4eb0505f8f
Merged-In: Ia6f1d84bba38bab7f13f46dc8a4fdb4eb0505f8f
2022-08-12 05:47:44 +08:00
Lauren Winston
89be5b0d46 Merge "Add a cursor preference to Accessibility Settings" 2022-08-11 15:37:16 +00:00
Hugh Chen
1311019b9a RESTRICT AUTOMERGE Let advanced VPN profile visible immediately before the user consent to use VPN feature
- This CL will check whether advanced VPN apk is exist or not,
  and if so then show the preference of advanced VPN in the
  "Settings > Network & internet > VPN".

Bug: 239984274
Test: atest -c VpnSettingsTest
Change-Id: I8c11c7f2079d6ebec6c691b8bf2fb26dfc450663
2022-08-11 23:33:30 +08:00
Tsung-Mao Fang
a71907e873 Wi-Fi panel doesn't need to check permission
Prior to this cl, we use #getPackagesForUid()
to get a list of calling package names and
pick up 1st package name in the list as target
calling package. And then go to check the
Wi-Fi permission.

This implementation is ok for most apps without
sharing system uid. However, this may not work
if the caller is set as sharing system ui.
In this case, we get a list of packages
and we don't know which one is caller. So, if we
decide to choose the 1st package of list as our
calling package, then it could fail to pass
permission check since that package could not
a calling package.

In this cl, we skip permission check for those
packages running with system uid. So, it can resolve
this Wi-Fi Panel problem since Wi-Fi panel running
on settings process and also promise the security
issue at the same time.

Test: 1. adb shell am start -a android.settings.panel.action.WIFI
2. Verify on assistant app and system ui launcher and search app.
Bug: 240531998

Change-Id: Ia825853dde2e966e3d390cecfbe1a99f6439d31e
Merged-In: Ia825853dde2e966e3d390cecfbe1a99f6439d31e
2022-08-11 12:21:08 +00:00
TreeHugger Robot
4ff741a059 Merge "Wi-Fi panel doesn't need to check permission" 2022-08-11 12:21:01 +00:00
Weng Su
2732be59e5 Show default data SIM in Wi-Fi details when dual SIMs have the same carrier ID
- Because the wifiConfiguration is only save the carrier ID for EAP-SIM authentication

- If multiple SIMs have the same carrier ID, the Wi-Fi framework will use the default data SIM for EAP-SIM authentication

- Show default data SIM in Wi-Fi details settings, when dual SIMs have the same carrier ID

Bug: 233765468
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=WifiDetailPreferenceController2Test

Change-Id: I350fe637f506134770ccf316e47c0e225661bb6a
2022-08-11 17:51:51 +08:00
Tsung-Mao Fang
e1f72b7f3c Wi-Fi panel doesn't need to check permission
Prior to this cl, we use #getPackagesForUid()
to get a list of calling package names and
pick up 1st package name in the list as target
calling package. And then go to check the
Wi-Fi permission.

This implementation is ok for most apps without
sharing system uid. However, this may not work
if the caller is set as sharing system ui.
In this case, we get a list of packages
and we don't know which one is caller. So, if we
decide to choose the 1st package of list as our
calling package, then it could fail to pass
permission check since that package could not
a calling package.

In this cl, we skip permission check for those
packages running with system uid. So, it can resolve
this Wi-Fi Panel problem since Wi-Fi panel running
on settings process and also promise the security
issue at the same time.

Test: 1. adb shell am start -a android.settings.panel.action.WIFI
2. Verify on assistant app and system ui launcher and search app.
Bug: 240531998

Change-Id: Ia825853dde2e966e3d390cecfbe1a99f6439d31e
2022-08-11 16:07:42 +08:00
Lauren Winston
205018a854 Add a cursor preference to Accessibility Settings
Bug: 240194047

Test: atest SoftwareCursorPreferencesControllerTest and
SoftwareCursorTogglerPreferenceControllerTest

Change-Id: I97e226d8d8c0bcdfd0e2612e86b81987480063d1
2022-08-11 04:00:16 +00:00
changbetty
d55a7067aa [LE Audio] To fix the condition of the broadcast icon display
- The broadcast icon will be displayed when the device is connected to
   the LE Audio device.

 - The broadcast option dialog will show the "Broadcast" option when the
   media is streaming. Otherwise, it will not show.

Bug: 235923182
Test: manual test
Test: make RunSettingsRoboTests ROBOTEST_FILTER=MediaVolumePreferenceControllerTest
Change-Id: Ib225d185b6f15463f4fae809e0cdaa25920d52af
2022-08-11 02:01:55 +00:00
Bob Badour
11411e187b Fix permissions for internal links.
Test: m droid dist

Change-Id: If872d5e91a78d8f407e618a2c655c8cf4ac7d7fc
2022-08-10 14:21:47 -07:00