Commit Graph

136891 Commits

Author SHA1 Message Date
Evan Chen
1ffcf416b5 Make sure work profile app cant enable notification listener services am: 3465535747 am: 3cd41d5c6f am: 0947ff6b98 am: 91233dd150
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25007539

Change-Id: Id1c2a4497a32af69f648d9dba7c97fb0c680166a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-06 21:26:25 +00:00
Evan Chen
e08372af9e Make sure work profile app cant enable notification listener services am: 3465535747 am: d1eadc08dc am: 9b0c7298cc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25007539

Change-Id: Ic95166f026df396b3f9ddb342ece9ec1b0f0876e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-06 21:26:15 +00:00
Bill Yi
d333b903dd Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev 2023-11-06 21:26:11 +00:00
Bill Yi
a8cfc6d99e Merge "Import translations. DO NOT MERGE ANYWHERE" into main 2023-11-06 21:25:39 +00:00
Evan Chen
91233dd150 Make sure work profile app cant enable notification listener services am: 3465535747 am: 3cd41d5c6f am: 0947ff6b98
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25007539

Change-Id: I87d7e43b1559424220566fee510023b9fe0831a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-06 21:24:13 +00:00
Nino Jagar
a0b54107f1 Update content protection toggle title text
Bug: 307604681
Test: Compiled
Change-Id: I66c6fcf28435012b93ca3964dc7c36a275484247
2023-11-06 21:23:03 +00:00
Evan Chen
b8a4c29d5e Make sure work profile app cant enable notification listener services am: 5c6ca7959c am: dab54b5734 am: 4a33b437d4 am: dbd608df09
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25008551

Change-Id: I6ab40d8d4ba60f52a7c9b3974f7b639af0585baa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-06 21:01:06 +00:00
Evan Chen
46ea8f8a03 Make sure work profile app cant enable notification listener services am: aa122da7d6 am: 582edbd719 am: 221d2eddc9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25007537

Change-Id: I6533eec64e6f939b3baf31d47f386f41514263e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-06 20:59:53 +00:00
Evan Chen
9411e46dd7 Merge "Make sure work profile app cant enable notification listener services" into udc-qpr-dev am: 857047f804 am: d72a0ec505
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25008425

Change-Id: Ifa6df4ac0b2a457f2310f45b750908879dee3ac7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-06 20:58:06 +00:00
Evan Chen
9b0c7298cc Make sure work profile app cant enable notification listener services am: 3465535747 am: d1eadc08dc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25007539

Change-Id: I529ed6c2ed248a52e295ae751cf42be4c5fe199f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-06 20:58:04 +00:00
Evan Chen
0947ff6b98 Make sure work profile app cant enable notification listener services am: 3465535747 am: 3cd41d5c6f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25007539

Change-Id: I7d6125bf4eeceb3fb3cad1f495e677694dd9b175
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-06 20:53:53 +00:00
Evan Chen
dbd608df09 Make sure work profile app cant enable notification listener services am: 5c6ca7959c am: dab54b5734 am: 4a33b437d4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25008551

Change-Id: I5ab92642059d4480f49140ad699cc4ddffdf3a08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-06 20:52:53 +00:00
Evan Chen
221d2eddc9 Make sure work profile app cant enable notification listener services am: aa122da7d6 am: 582edbd719
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25007537

Change-Id: I57ed3a2b39c584f05dfdfb47aebfbbac72ba0da3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-06 20:52:31 +00:00
Evan Chen
ce55cfab72 Make sure work profile app cant enable notification listener services am: 5c6ca7959c am: dab54b5734 am: 8d2e4eb96d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25008551

Change-Id: Ia93b35fcd15b3158f3b4590e00eea466f03a1ac1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-06 20:30:19 +00:00
Evan Chen
d257dbed63 Make sure work profile app cant enable notification listener services am: aa122da7d6 am: 4231ecf16b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25007537

Change-Id: I3c06fa3c9b61668b8943dc15ead0f2d68a7c169c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-06 20:28:47 +00:00
Bill Yi
a5c4a422e6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c16d42d414 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4026fe06aae706c85f7ee895d4c1929e6ef8b3ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-06 20:27:45 +00:00
Evan Chen
d72a0ec505 Merge "Make sure work profile app cant enable notification listener services" into udc-qpr-dev am: 857047f804
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25008425

Change-Id: Ia1193710342c11b9a6809f5379405754fd061859
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-06 20:18:11 +00:00
Evan Chen
cdc4580ec5 Make sure work profile app cant enable notification listener services am: 5c6ca7959c am: dab54b5734
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25008551

Change-Id: Ie570caebfa07a49f019f45a8c701aea7cf2e1f34
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-06 20:17:21 +00:00
Evan Chen
2abb356f2d Make sure work profile app cant enable notification listener services am: aa122da7d6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25007537

Change-Id: Id0c70f2fac4631e1dd90070d43db8f735ceb22ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-06 20:17:02 +00:00
Evan Chen
8d2e4eb96d Make sure work profile app cant enable notification listener services am: 5c6ca7959c am: dab54b5734
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25008551

Change-Id: Iaaac346455a46df8b77ab0d659436c03bbfab4ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-06 20:15:15 +00:00
Evan Chen
4231ecf16b Make sure work profile app cant enable notification listener services am: aa122da7d6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25007537

Change-Id: I6f970cea31ac0771e9a3413bb8e1af113d7eba4b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-06 20:14:51 +00:00
Evan Chen
4a33b437d4 Make sure work profile app cant enable notification listener services am: 5c6ca7959c am: dab54b5734
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25008551

Change-Id: I9a32e9f02c5d14d07085154f2e9d7e1a7fe681b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-06 20:14:24 +00:00
Evan Chen
582edbd719 Make sure work profile app cant enable notification listener services am: aa122da7d6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25007537

Change-Id: Ib3ad3f5e10a9cdafa7580b64c67117f1a1f19d19
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-06 20:13:37 +00:00
Evan Chen
3cd41d5c6f Make sure work profile app cant enable notification listener services am: 3465535747
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25007539

Change-Id: I492643968e65f1c7e7881379914a59bc535e4047
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-06 20:12:03 +00:00
Evan Chen
d1eadc08dc Make sure work profile app cant enable notification listener services am: 3465535747
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25007539

Change-Id: Iab3c4ee5e7ae6a685f3a5f22308f694a28da5fea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-06 20:11:51 +00:00
Evan Chen
dab54b5734 Make sure work profile app cant enable notification listener services am: 5c6ca7959c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25008551

Change-Id: Ica7d3101c8f1efbc798654d0492fa87dcfee28fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-06 20:11:40 +00:00
Joshua Mccloskey
114fabf79d Adding back screenshot test to Settings.
Test: atest SettingsScreenshotTests
Fixes: 307356833
Change-Id: I80b32cd40155d56e38d41d5f6d52e4c5d5ef715c
2023-11-06 19:40:58 +00:00
Nino Jagar
bf97254dd7 Use DeviceConfig flag instead of aconfig flag
Bug: 308610589
Test: Units
Flag: EXEMPT
Change-Id: I3ff34b4048d8c0f0101f74fbab0498f91c7c2409
2023-11-06 19:28:38 +00:00
Evan Chen
857047f804 Merge "Make sure work profile app cant enable notification listener services" into udc-qpr-dev 2023-11-06 19:15:32 +00:00
Nino Jagar
b1852541a0 Merge "Disable content protection settings if no service" into main 2023-11-06 18:50:50 +00:00
Steven Ng
9ad7284d3f Check if the bedtime settings intent is null before launch
Test: make RunSettingsRoboTests -j56 ROBOTEST_FILTER=com.android.settings.display.darkmode.*
Bug: 306060498
Change-Id: Iddaec94c3a4cba74841d83305e581605c030bf33
2023-11-06 18:45:34 +00:00
Eghosa Ewansiha-Vlachavas
85b3279d7a Set aspect ratio app list settings page id as attribtion in logs
When loging the users aspect ratio change, set the logs attribution as
`USER_ASPECT_RATIO_APP_LIST_SETTINGS` if the user came from the aspect
ratio app list page.

Fix: 309424648
Bug: 298030311
Test: atest SettingsSpaUnitTests:UserAspectRatioAppsPageProviderTest && UserAspectRatioAppPreferenceTest
Change-Id: Ia88f0dee8ed2c9c8e54919cf02c7526caf944dee
2023-11-06 13:13:29 +00:00
MiltonWu
f1bf44392a Scroll-down after click accessiblity button
On FaceEnrollEducation page, scroll-down when user click "Setup for
limited vision or head motion button"

Test: SettingsRoboTest FaceEnrollEducationTest
Bug: 309368020
Change-Id: Ifc07337dd8af6f67412de6e7503fc4bc221fb068
2023-11-06 17:40:03 +08:00
Chaohui Wang
855053ca41 Limit wifi item edit content's max length to 500
Bug: 293199910
Test: manual - on "Add network"
Change-Id: I303b8c6e0f3c3a1174a047ba98f302042e5db9ae
2023-11-06 09:14:18 +00:00
Yi-Ling Chuang
9718ae0aa9 Add battery warning TipType
Bug: 309054332
Test: rebuild
Change-Id: Ib7f95eb14aac7ac6d6a0941ea40a9eb723fa9300
2023-11-06 15:43:57 +08:00
Xinyi Mao
2736ca15bb Merge "Update all forcestop icons in Settings." into main 2023-11-06 07:14:59 +00:00
Jun Lan
43f436e065 Merge "Format battery java code" into main 2023-11-06 06:48:20 +00:00
Treehugger Robot
75de0f5ae9 Merge "Revert "[PK settings] Remove metrics."" into main 2023-11-06 06:42:57 +00:00
mxyyiyi
8e7bf5d2c1 Update all forcestop icons in Settings.
Test: manual
Bug: 308893988
Fix: 308893988
Change-Id: I007225c390a922c69f2b32d0d1dbd4224e5bc4b5
2023-11-06 14:12:54 +08:00
Hyundo Moon
946e94bb5d Send bluetooth permission reply intent only to BT package
Bug: 292540708
Test: make SettingsGoogle -j;
      Also manually tested clicking 'Allow' to message permission
      request dialog.
Change-Id: I3c339de2bf3bacd1e70f8dc8b0352aa83da14195
2023-11-06 05:56:40 +00:00
Jun Lan
cca804e1ed Format battery java code
After this CL, we can follow Guideline:go/hc-mainline-dev#format-code to keep java format consistent.

Test: manual
Bug: 304439460
Change-Id: I5bb77f81b0bd9be618e34942eaaee8296bc42796
2023-11-06 13:55:48 +08:00
Jun Lan
da70c86bda Merge "Replace HashMap with ArrayMap for better performance" into main 2023-11-06 05:31:07 +00:00
Jun Lan
b0f9489a09 Replace HashMap with ArrayMap for better performance
Reason: https://screenshot.googleplex.com/BdHiua8gU8aGUmR

Test: manual
Bug: 308913393
Fix: 308913393
Change-Id: Iea085006ffe6ca48fe547319b9f0f4d20aa78bda
2023-11-06 12:34:05 +08:00
Chaohui Wang
3c0bcceeca Merge "Fix IMEI is not selectable" into main 2023-11-06 04:23:32 +00:00
Chaohui Wang
ddf79703ce Merge "[Spa] Fix State<T> as a parameter of SwitchPreference" into main 2023-11-06 04:19:30 +00:00
FanWu
1e0e039708 Cleanup Spa special access tests
Bug: 309042337

Test: Unit test
Change-Id: Id58dfc46a6e3cafc8d6e89516ffd241c791adda1
2023-11-06 04:00:19 +00:00
Chaohui Wang
c744aaabae Fix IMEI is not selectable
By settings textIsSelectable = true

Also unify all the similar logic into @style/device_info_dialog_value

Fix: 305248578
Test: manual - on About phone page
Change-Id: Iaa6b4ab45067a01106367de3b8d81d5df51bd6dc
2023-11-06 11:01:18 +08:00
Chaohui Wang
89a3f9b194 Merge "New MobileDataEnabledFlow" into main 2023-11-06 02:56:31 +00:00
Chaohui Wang
fead9257b3 Fix AppDataUsageCycleController.setInitialCycles
This is actually called after displayPreference(), so should update
cycleAdapter in setInitialCycles() instead of displayPreference().

Also update test.

Bug: 240931350
Test: manual - on AppDataUsage
Test: unit test
Change-Id: I00287c21e307199b26c336f15b9a623737a5d130
2023-11-05 21:27:19 +08:00
Chaohui Wang
eedc7fd52d [Spa] Fix State<T> as a parameter of SwitchPreference
Bug: 292036686
Test: manual - with Settings
Test: unit tests
Change-Id: I003f3b7f29117258da6ae3c48039fb50c2bee95c
2023-11-05 00:09:27 +08:00