Commit Graph

53415 Commits

Author SHA1 Message Date
SongFerng Wang
a2b1d8a0a2 Merge "Fix the burst callback issue on the repository" into main am: a23320eedd am: 4362f09737 am: bc4909cafd
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2780887

Change-Id: I009b6ec4bbc2ff46160772f7bd8a773086c5e20b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-07 10:55:00 +00:00
ykhung
e5536bb101 Update the constant fields in the BatteryOptimizeUtils
Test: presubmit
Bug: 306329984
Change-Id: I64df1d6f632f913e2d3629f640c6c75437e19e13
2023-11-07 18:43:42 +08:00
SongFerng Wang
bc4909cafd Merge "Fix the burst callback issue on the repository" into main am: a23320eedd am: 4362f09737
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2780887

Change-Id: I69a30d3d6af7b75177cee4c259786b7acbfdd5cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-07 10:11:00 +00:00
SongFerng Wang
5ec0fa333c Merge "Fix the burst callback issue on the repository" into main am: a23320eedd
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2780887

Change-Id: I5d83bd6ea2f3f44aa961c0a77aa64c1275f4b268
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-07 09:43:39 +00:00
SongFerng Wang
4362f09737 Merge "Fix the burst callback issue on the repository" into main am: a23320eedd
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2780887

Change-Id: Ia0f4f76a704973e123cfe5e4c2d571bbea0c861f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-07 09:41:19 +00:00
Hyundo Moon
e07cfd8b0b Merge "Send bluetooth permission reply intent only to BT package" into main 2023-11-07 09:19:39 +00:00
SongFerng Wang
e60c9521c2 Merge "To avoid crash IllegalStateException" into main 2023-11-07 09:16:30 +00:00
SongFerng Wang
a23320eedd Merge "Fix the burst callback issue on the repository" into main 2023-11-07 09:11:06 +00:00
Yiyi Shen
e4aabf044a Merge "[Audiosharing] Impl audio sharing main switch." into main 2023-11-07 09:05:39 +00:00
SongFerngWang
5eae90d731 To avoid crash IllegalStateException
Bug: 308855978
Test: [pass]make RunSettingsRoboTests ROBOTEST_FILTER=NetworkProviderSettingsTest
Change-Id: Ia0a1cbe0326e63b878c3fe7797ca47e25ccc16d4
2023-11-07 16:00:41 +08:00
Yiyi Shen
87372de071 [Audiosharing] Impl audio sharing main switch.
Start/stop broadcast when >=1 eligible buds connected.

Flagged with enable_le_audio_sharing

Bug: 305620450
Test: Manual
Change-Id: Ic982571f49ab79c39d0503929df4bb8be64b720e
2023-11-07 15:41:34 +08:00
Chaohui Wang
0d338cd1df Let SpaBridgeActivity support ActivityEmbedding
Move the multi pane shared logic into EmbeddedDeepLinkUtils.

Fix: 309075424
Test: manual - with SpaActivity
Test: unit tests
Test: m RunSettingsRoboTests ROBOTEST_FILTER=".*\.SettingsActivityTest"
Change-Id: I8c41c801b8a5009a3959c85b784ed9739d947a70
2023-11-07 13:24:59 +08:00
Treehugger Robot
e79bdaef63 Merge "settings(payments): Use newly exposed formal API for CardEmulation.getServices()" into main am: 85ca373e75 am: 3521df9dca
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2810325

Change-Id: Ic739f9650dcfe638521dc0488c397ef9b8fa5ea7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-07 05:18:50 +00:00
Treehugger Robot
f19320aca6 Merge "settings(payments): Use newly exposed formal API for CardEmulation.getServices()" into main am: 85ca373e75
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2810325

Change-Id: I71614129cf95ac29f845dadf479135dcb3a5a48c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-07 04:52:27 +00:00
Treehugger Robot
3521df9dca Merge "settings(payments): Use newly exposed formal API for CardEmulation.getServices()" into main am: 85ca373e75
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2810325

Change-Id: I0ac76dbfb034e1a9856b231aa59b3ec0197914d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-07 04:48:36 +00:00
Treehugger Robot
85ca373e75 Merge "settings(payments): Use newly exposed formal API for CardEmulation.getServices()" into main 2023-11-07 04:08:35 +00:00
Treehugger Robot
01e207ede7 Merge "Check if the bedtime settings intent is null before launch" into main 2023-11-07 02:58:40 +00:00
Wa Gao
2ddabf5785 Merge "Add the controller for the top switch." into main 2023-11-07 01:22:43 +00:00
Wa Gao
aa5d7420db Add the controller for the top switch.
Bug: 302189945
Change-Id: Ie43ac181e643a8b215ca830afc6ef670d91a5762
2023-11-06 23:46:56 +00:00
Eghosa Ewansiha-Vlachavas
4211b4a83c Merge "Set aspect ratio app list settings page id as attribtion in logs" into main 2023-11-06 22:38:10 +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
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
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
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
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
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
Sally Qi
6584f32b6a Merge "Settings: add a new developer menu entry to show hdr/sdr ratio overlay." into main 2023-11-03 19:13:06 +00:00
Sally Qi
fbb088ffdb Settings: add a new developer menu entry to show hdr/sdr ratio overlay.
- The hdr/sdr ratio overlay will be shown on screen if the option is
  selected from the developer option.
- This option is hidden on non-HDR-supported devices.
- Add flags: com.android.settings.flags.development_hdr_sdr_ratio

Test: enable show hdr/sdr ratio from developer menu; com.android.settings.development.ShowHdrSdrRatioPreferenceControllerTest
Bug: 291863102
Change-Id: Idd72f95c67c95cd8127f9b94e031b3d87b18e307
2023-11-03 11:02:07 -07:00
josephpv
380ac9a48e Adds Google account login during private space setup
This has the following changes:
1. On profile creation starts intent to add google account to the private profile for Pixel only devices.
2. On accout sign in failed show an error screen with message to try again.
3. Moves the lock setup fragment from private to main user which now calls the helper Activity as a private user which helps to setup lock. This activity can now also be called from the planned Secondary Auth settings page to set up private profile lock.
4. On set up complete use SHOW_WORK_APPS intent as a workaroud to start launcher.

Bug: 308397617
Test: Manual setup
Change-Id: I19b95375409f015b2a5d30fdad766c2f6baa634b
2023-11-03 13:50:55 +00:00
Yiyi Shen
b4890641b0 Merge "[Audiosharing] Impl audio sharing main switch." into main 2023-11-03 12:27:41 +00:00
Eghosa Ewansiha-Vlachavas
bf7010be33 Merge "Log radio button clicks on the user aspect ratio app info page" into main 2023-11-03 10:28:16 +00:00