PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
137,519 Commits 1 Branch 0 Tags
778bcee1572d9bd254a33c9839fc235d16c57dbb
Commit Graph

137519 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Antol
778bcee157 Revert "Finish HomepageActivity when it's not the root of a task and not singleTask." 
This reverts commit 5a305645c1.

Reason for revert: b/325861149

Change-Id: I4441f939a46bf65514756a015355ea5089147c1d
 2024-02-28 19:56:56 +00:00
Jason Chiu
5a305645c1 Finish HomepageActivity when it's not the root of a task and not singleTask. 
HomepageActivity should be the first activity in a task, or be launched
in singleTask mode. Finishing it will bring up the previous activity in
the task.

Fix: 297857732
Test: robotest
Change-Id: Iddcba1652060d755693dd20d0e350e3d6c1ae138
 2023-12-20 03:40:29 +00:00
Fan Wu
dd61b6bb3d Merge "Fix BluetoothUpdateWorkerTest." into main 2023-12-12 01:16:22 +00:00
Ruslan Kim
4df98df7f7 Merge "Revert "Adding screenshot tests to postsubmit."" into main 2023-12-11 23:54:36 +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
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
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
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
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
Xin Li
32cdca80cc Merge "Merge Android 14 QPR1" into main 2023-12-09 00:11:59 +00:00
Xin Li
784b56d43f Merge Android 14 QPR1 
Merged-In: I22fa193e9846fdb998810c93c9c26344a40d89a9
Bug: 315507370
Change-Id: I4a3a51affce75afe081a0cc9197e0034e34fe82d
 2023-12-08 13:14:21 -08:00
Joshua Mccloskey
4ed5548887 Merge "Fixed biometric setting crash." into main 2023-12-08 20:22:59 +00:00
Chaohui Wang
c69eb48807 Add HideNonSystemOverlayMixin for SpaActivity 
Fix: 315473158
Test: manual - try overlay on SpaActivity
Change-Id: I67f30f6aa0adb22f891683a6d603fb6cb146b4f1
 2023-12-09 00:08:17 +08:00
Johannes Gallmann
af96028267 Add predictive back aconfig flag 
Bug: 309545085
Flag: ACONFIG com.android.window.flags.predictive_back_system_animations DISABLED
Test: atest BackAnimationPreferenceControllerTest; Manual, i.e. building and verifying correct behaviour for different flag configurations
Change-Id: I3f478dc23bbfeb1f13cae64f3d04b3210841731d
 2023-12-08 13:37:25 +00:00
Anubhav Kakkar
6bc92efaae Merge "Add activity to handle app specific request to open media routing controll special" into main 2023-12-08 12:35:27 +00:00
Mark Kim
d17b1a3816 Merge "Add 'Archive' button to AppInfo screen" into main 2023-12-08 10:25:58 +00:00
Chelsea Hao
920037db83 Merge "[Audiosharing] Implement add source by qrcode scan" into main 2023-12-08 09:43:39 +00:00
Anubhav Kakkar
e79fcbef78 Add activity to handle app specific request to open media routing controll special 
Bug: 313775893
Test: Trigger the intent with action "android.settings.REQUEST_MEDIA_ROUTING_CONTROL" and package name in the data uri
Change-Id: If65ea61a058b465dc44836eff9c7d3fb25425ec4
 2023-12-08 08:52:44 +00:00
Xin Li
af57916bb1 [automerger skipped] Merge UQ1A.231205.015 am: 4f1ec8cb8a -s ours am: e72aefc106 -s ours 
am skip reason: Merged-In I5d9d1d30d280311875d8bd8604aed0fd0c08ab2c with SHA-1 fdf80bd5c9 is already in history

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

Change-Id: Id02614b3bfb1fb9d42ab5279c3a4611f62fe30c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-08 08:51:06 +00:00
Yiyi Shen
79028d1c8f Merge "[Audiosharing] Refine sharing disconnect dialog." into main 2023-12-08 08:24:07 +00:00
Yiyi Shen
90844f3546 Merge "[Audiosharing] Refine sharing stop dialog." into main 2023-12-08 08:23:39 +00:00
Xin Li
e72aefc106 [automerger skipped] Merge UQ1A.231205.015 am: 4f1ec8cb8a -s ours 
am skip reason: Merged-In I5d9d1d30d280311875d8bd8604aed0fd0c08ab2c with SHA-1 fdf80bd5c9 is already in history

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

Change-Id: I8326d3adfea2de2f71271b65f4673bf9dc251125
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-08 08:21:19 +00:00
Yiyi Shen
f8ccd2bda3 Merge "[Audiosharing] Refine main sharing dialog." into main 2023-12-08 08:13:24 +00:00
Yiyi Shen
4d130705c7 [Audiosharing] Refine sharing stop dialog. 
Bug: 305620450
Test: atest AudioSharingStopDialogFragmentTest
Change-Id: I1593d1b18af23ffea0ccae0425ad848191b90e8b
 2023-12-08 07:17:57 +00:00
Yiyi Shen
13d09c97b2 [Audiosharing] Refine main sharing dialog. 
Bug: 305620450
Test: atest AudioSharingDialogFragmentTest
Change-Id: Icd9d7524b29bc3a37f27316107176b93510cc12c
 2023-12-08 14:54:41 +08:00
Yiyi Shen
16b78546a1 [Audiosharing] Refine sharing disconnect dialog. 
Bug: 305620450
Test: atest AudioSharingDisconnectDialogFragmentTest
Change-Id: I16507fc5424fcb4bfa977199e92f9728c5df69c6
 2023-12-08 14:27:36 +08:00
Yiyi Shen
eeec2a708c Merge "[Audiosharing] Refine sharing join dialog." into main 2023-12-08 06:19:35 +00:00
Milton Wu
eacde88922 Merge "Refine UdfpsEnrollCalibration" into main 2023-12-08 05:41:44 +00:00
Yiyi Shen
fb617e423e [Audiosharing] Refine sharing join dialog. 
Bug: 305620450
Test: atest AudioSharingJoinDialogFragmentTest
Change-Id: I54001d254d5cfd0cd72ea1a115d71142b6e6ed47
 2023-12-08 13:14:23 +08:00
Chaohui Wang
5e3472b5c0 Merge "Fix flaky of AppInstallerInfoPreferenceTest" into main 2023-12-08 05:03:48 +00:00
Charlotte Lu
18808379ed Merge "Telephony Issue: Apn config mmsc should start with http but is 啊." into main 2023-12-08 04:31:07 +00:00
chelseahao
541dac155a [Audiosharing] Implement add source by qrcode scan 
Bug: 305620450
Test: manual
Change-Id: If09522b515649621000208285340736abba04b4d
 2023-12-08 04:25:04 +00:00
Treehugger Robot
961f299c4c Merge "Ignore failing test of BluetoothUpdateWorkerTest" into main 2023-12-08 04:10:14 +00:00
Yanting Yang
033263b858 Ignore failing test of BluetoothUpdateWorkerTest 
Bug: 315399487
Test: post-submit
Change-Id: I2747b45e60b7aa4d1326e8eb01bc2af8e8666030
 2023-12-08 03:11:01 +00:00