PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
138,799 Commits 1 Branch 0 Tags
bcf91ee6a7808045a7ca075cfe0d17445623ede6
Commit Graph

138799 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mark Kim
4345908c39 Merge "Add 'Restore' button to AppInfo screen" into main 2023-12-12 10:42:10 +00:00
Jakob Schneider
2368e260fe Merge "Change the strings on the opt-out toggle to also account for archiving." into main 2023-12-12 10:28:53 +00:00
YK Hung
cf48086210 Merge "Add screen timeout destination to settings" into main 2023-12-12 10:11:43 +00:00
YK Hung
249434d02b Merge "Add record for anomaly detect request source and clean up unused function." into main 2023-12-12 10:10:57 +00:00
Manish Singh
b31b54d5c3 Merge "Select the correct tab" into main 2023-12-12 10:04:19 +00:00
Manish Singh
c1cd428e43 Don't show setting if private profile is locked 
Bug: 311343261
Test: manual
Change-Id: I16e1f08c7cace0964e666a71e785fee1c18cc577
 2023-12-12 08:51:19 +00:00
Chelsea Hao
65b8b5997f Merge "[Audiosharing] Impl pwd dialog and detail page" into main 2023-12-12 08:38:01 +00:00
mxyyiyi
ed7ce44f65 Add record for anomaly detect request source and clean up unused function. 
Bug: 315905559
Test: make RunSettingsGoogleRoboTests ROBOTEST_FILTER="com.google.android.settings.fuelgauge.*"
Change-Id: I21a13a7910b21b27aac58143bd41c77e87c71953
 2023-12-12 15:56:54 +08:00
David Liu
e642b4cf2d Merge "fixed NPE while initializing controllers by commenting out the failure one for temporal fix" into main 2023-12-12 07:07:53 +00:00
Wesley Wang
336c441db5 Add screen timeout destination to settings 
When an intent with action android.settings.SCREEN_TIMEOUT_SETTINGS is
launched, ScreenTimeoutSettings should be shown in settings

Bug: 293813663
Test: manual and local build verify
Change-Id: I1340cd3c233aa5d36f45b53b0fd2b6924f3a1d75
 2023-12-12 14:55:15 +08:00
Yiyi Shen
9687251040 [Audiosharing] Refine text style. 
Bug: 305620450
Test: manual
Change-Id: I0b67ff1896556951451b5676b1b5d4ae39963524
 2023-12-12 14:40:26 +08:00
Hyunho Shin
a2555df74c Merge "Add the condition to show the eSIM convert menu." into main 2023-12-12 06:33:33 +00:00
chelseahao
1bb099f872 [Audiosharing] Impl pwd dialog and detail page 
Bug: 305620450
Test: manual

Change-Id: I2686aee4c3809c5f683a42b6440a5fd361e7be0b
 2023-12-12 14:14:03 +08:00
Yiyi Shen
a51097d008 Merge "[Audiosharing] Add prefix to device list item text in adapter." into main 2023-12-12 05:36:54 +00:00
Yiyi Shen
f3e693d7a5 Merge "[Audiosharing] Fix test." into main 2023-12-12 05:35:44 +00:00
Chaohui Wang
e96900d1ae Merge "Fix the isEmbeddedSubscriptionVisible logic" into main 2023-12-12 05:21:01 +00:00
Chaohui Wang
7a33bd5982 Merge "Fix cold startup of NetworkProviderCallsSmsController" into main 2023-12-12 05:20:51 +00:00
Hyunho
036ed3fcee Add the condition to show the eSIM convert menu. 
When pSIM converts to eSIM, the new eSIM is downloaded and pSIM is disabled.
However, if the pSIM is in the preferred SIM, a pop-up occurs that says the downloaded eSIM is preferred.
This may cause confusion for users regarding seamless pSIM conversion.
Therefore, change the condition to show the convert menu if there is a pSIM, pSIM conversion is supported, and there is no active eSIM.

Bug: b/314881248
Test: manual done
Change-Id: I10134057a9ae7845ab9fb8b9b8b9f85629d33fa0
 2023-12-12 04:56:19 +00:00
SongFerng Wang
e4d761254e Fix the isEmbeddedSubscriptionVisible logic 
Bug: 314736037
Change-Id: I10ddafbad1590a660735466c0f6d7e9ed8bffcff
Test: local test
 2023-12-12 04:26:43 +00:00
Yiyi Shen
bdb66db5f3 [Audiosharing] Fix test. 
https://android-build.corp.google.com/test_investigate/?invocationId=I15800010225964211&testResultId=TR05829086064241708

Test: make RunSettingsRoboTests2 -j40
Bug: 305620450
Change-Id: Ia93cd0dc0c9959d8ab078b29023936b21c7a0e08
 2023-12-12 11:44:58 +08:00
Fan Wu
dd61b6bb3d Merge "Fix BluetoothUpdateWorkerTest." into main 2023-12-12 01:16:22 +00:00
David Liu
13c63260a3 fixed NPE while initializing controllers by commenting out the failure 
one for temporal fix

Added @Nullable in parameters of buildPreferenceControllers() to prevent using nullable parameter to functions requires non-nullable.

Bug: 315330037
Test: see developer options preferences show/hide based on the
controllers isAvailable()

Change-Id: If42faea900a2220d9b1f5e38e1befbd5a555e78a
 2023-12-12 00:16:32 +00:00
Ruslan Kim
4df98df7f7 Merge "Revert "Adding screenshot tests to postsubmit."" into main 2023-12-11 23:54:36 +00:00
Jigar Thakkar
66fb046c70 Enable biometric support to unlock profiles 
This change ensures the ConfirmCredentialActivity allows biometric
authentication to unlock (or disable quiet mode for) a profile if
the profile storage is unlocked when in quiet mode.

Test: atest SettingsRoboTest
Bug: 312184187
Change-Id: Iefcebf2f93403591a1a4c50ff5da8d6055a37b03
 2023-12-11 23:50:10 +00:00
Ruslan Kim
498d88671a Revert "Adding screenshot tests to postsubmit." 
This reverts commit ade491b466.

Reason for revert: Missing test_suite b/315860052

Change-Id: Ie64aa53f6d327f4710db491415263c586e52a8c4
 2023-12-11 23:31:44 +00:00
Xin Li
58696a3345 [automerger skipped] Merge "Merge Android 14 QPR1" into main am: 32cdca80cc -s ours am: 5cd5689267 -s ours am: c118ba99fa -s ours 
am skip reason: Merged-In I22fa193e9846fdb998810c93c9c26344a40d89a9 with SHA-1 4f1ec8cb8a is already in history

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

Change-Id: I2af6e22165f8aff1b2ee178d59e891cd1558d24c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-11 23:00:26 +00:00
Xin Li
967bdd4310 [automerger skipped] Merge Android 14 QPR1 am: 784b56d43f -s ours am: 7d2f4be0ba -s ours am: 36a2f3cc93 -s ours 
am skip reason: Merged-In I22fa193e9846fdb998810c93c9c26344a40d89a9 with SHA-1 4f1ec8cb8a is already in history

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

Change-Id: I4bae7926a47aa80d04c89cdbe7f7d4d9737b8881
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-11 22:57:30 +00:00
Mark Kim
e3b456ef3e Add 'Restore' button to AppInfo screen 
Test: AppButtonsTest, AppRestoreButtonTest

Bug: 304255818
Change-Id: Ica9055d8ee5603e4bb682e9b5d90a225c839002a
 2023-12-11 22:07:03 +00:00
Treehugger Robot
bd0eb0dd31 Merge "Lock Private space at the end of PS setup." into main 2023-12-11 22:05:12 +00:00
Xin Li
c118ba99fa [automerger skipped] Merge "Merge Android 14 QPR1" into main am: 32cdca80cc -s ours am: 5cd5689267 -s ours 
am skip reason: Merged-In I22fa193e9846fdb998810c93c9c26344a40d89a9 with SHA-1 4f1ec8cb8a is already in history

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

Change-Id: I41ee10d0c4c60f9777907275260404156def2d64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-11 22:05:10 +00:00
Xin Li
36a2f3cc93 [automerger skipped] Merge Android 14 QPR1 am: 784b56d43f -s ours am: 7d2f4be0ba -s ours 
am skip reason: Merged-In I22fa193e9846fdb998810c93c9c26344a40d89a9 with SHA-1 4f1ec8cb8a is already in history

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

Change-Id: I07ee696955ad4f1b7f5952539da6f6c299328429
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-11 22:02:17 +00:00
Joshua Mccloskey
d1f24c845c Merge "Adding screenshot tests to postsubmit." into main 2023-12-11 21:43:07 +00:00
Xin Li
5cd5689267 [automerger skipped] Merge "Merge Android 14 QPR1" into main am: 32cdca80cc -s ours 
am skip reason: Merged-In I22fa193e9846fdb998810c93c9c26344a40d89a9 with SHA-1 4f1ec8cb8a is already in history

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

Change-Id: I0295ace8868448969c6e97d817ac85a042f3452b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-11 21:19:27 +00:00
Xin Li
7d2f4be0ba [automerger skipped] Merge Android 14 QPR1 am: 784b56d43f -s ours 
am skip reason: Merged-In I22fa193e9846fdb998810c93c9c26344a40d89a9 with SHA-1 4f1ec8cb8a is already in history

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

Change-Id: Ie0309426ebc4ba2c6db303e08d87c4b940802db7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-11 21:16:28 +00:00
Jeremy Meyer
44a3e096fd Merge "Put grammatical gender developer option behind flag" into main 2023-12-11 21:00:07 +00:00
josephpv
242ae4fbcc Lock Private space at the end of PS setup. 
This change is to call UserManager requestQuietModeEnabled() API at the
end of PS setup to enable quitemode for private space.

Bug: 313652502
Test: atest PrivateSpaceMaintainerTest
Verify Private space is locked state after private space setup completion.

Change-Id: I1d863f6d51ffa4bb58318696603905d35c3109b6
 2023-12-11 20:43:59 +00:00
Joshua McCloskey
ade491b466 Adding screenshot tests to postsubmit. 
Test: atest --host :postsubmit
Bug: 314807258
Change-Id: I7c593520369f308b5678554f4ea0afe335698a96
 2023-12-11 20:37:04 +00:00
Joshua Mccloskey
9a0db2d6e5 Merge "Change screenshot test to use RNG" into main 2023-12-11 20:33:48 +00:00
Joshua McCloskey
f055c2e374 Change screenshot test to use RNG 
Test: atest -c SettingsScreenshotRNGTests
 -- --test-arg
 com.android.tradefed.testtype.IsolatedHostTest:java-flags:
 -Drobolectric.graphicsMode=NATIVE
Fixes: 314807258
Change-Id: I4fa533c19d0b1386a7a4649ed88e3814816c1899
 2023-12-11 19:14:32 +00:00
Wu Ahan
740d345fb2 Update help animation per new spec 
Bug: 288155127
Bug: 305834550
Test: manually
Change-Id: I0731d65bbcbefa30c25b53e625d07b4e5771c78d
 2023-12-11 14:22:12 +00:00
Mark Kim
d1a58b9b41 Reload buttons on App Info page after app archiving. 
Most of the buttons should become disabled after app archiving.

Test: n/a

Bug: 315770669
Change-Id: Ib94f8bbf94bb75e3ea9e09f6308a02e825317b52
 2023-12-11 13:21:27 +00:00
Johannes Gallmann
e615b8fca4 Merge "Add predictive back aconfig flag" into main 2023-12-11 13:19:25 +00:00
FanWu
e6d648aa40 Fix BluetoothUpdateWorkerTest. 
Should avoid spying on Android classes due to potential test pollution: https://robolectric.org/best-practices/

Bug: 315399487

Test: atest SettingsRoboTests:com.android.settings.homepage.contextualcards.slices --iterations 20
Change-Id: Ia52baf52bf43d3a3959dc0234fbfc5b4a4575dac
 2023-12-11 10:23:09 +00:00
Chaohui Wang
fe2a106d5c Fix cold startup of NetworkProviderCallsSmsController 
Network & internet is shown at the very beginning when activity
embedding is enabled.

Fix: 311604902
Test: manual - with TestDPC
Change-Id: Ic27455e34a9ba4b48b8e72fd30d5b8d9e4be7194
 2023-12-11 16:29:58 +08:00
mxyyiyi
a919306d75 Provide foreground_service usage time in BatteryDiffEntry. 
- Fetch foreground service info through new api from UidBatteryConsumer.
- Record fgs & bg usage time separately, combine them till ui display.

Bug: 315255868
Test: make RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.fuelgauge.*"
Change-Id: Ic19844db7908a6ae6522c7a72972f44f94dcfca4
 2023-12-11 15:57:10 +08:00
SongFerng Wang
dd2cc366a6 Merge "Add condition whether esim is visible or not" into main 2023-12-11 05:52:47 +00:00
Chaohui Wang
64bfa1cb53 Merge "Add HideNonSystemOverlayMixin for SpaActivity" into main 2023-12-11 03:31:56 +00:00
SongFerngWang
ec27c60461 Add condition whether esim is visible or not 
Bug: 314736037
Test: SubscriptionInfoListViewModelTest pass and build pass
Change-Id: I7dc86ca93691f044d951122c0c669c790b7aef98
 2023-12-11 05:47:49 +08:00
Manish Singh
585bffb7ec Select the correct tab 
What the clients send over is the tab based on user, but the correct tab
(position) wise needs to figured out.

Bug: 314371622
Test: manual
Change-Id: Ib6ebefb898b1c5678c14157333dc2b2ebc198ed8
 2023-12-10 09:32:21 +00:00
Jean Chen
013626ebff Merge "feat(MultiFingerMultiTap): Update shortcut string to double tap from triple tap" into main 2023-12-09 05:04:34 +00:00