Pawan Wagh
023b52dc4d
Merge "Publish system update info when updates are in progress" into main am: a6bec4e541
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2930333
Change-Id: I95643df37fae5dbe700914fe93f6b403e1bf07a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-01-30 22:12:16 +00:00
Pawan Wagh
a6bec4e541
Merge "Publish system update info when updates are in progress" into main
2024-01-30 21:28:58 +00:00
Pawan Wagh
54409112e2
Publish system update info when updates are in progress
...
Publish separate update status when updates are in progress and
device is waiting for restart
Test: m Settings && adb install -r
$ANDROID_PRODUCT_OUT/system_ext/priv-app/Settings/Settings.apk
Bug: 295035851
Change-Id: I42936431791055536fe73d018545dd9b2d658cf0
2024-01-26 23:02:27 +00:00
Vineel Sadineni
7b16a62bb2
Merge "Make MoreOptionsScope abstract class" into main am: 62d6ccd106
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2928196
Change-Id: If7656674b4675eec8de6d8bca635955a66e7760c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-01-26 19:20:01 +00:00
Vineel Sadineni
62d6ccd106
Merge "Make MoreOptionsScope abstract class" into main
2024-01-26 18:10:18 +00:00
Chaohui Wang
745c69b76a
Make MoreOptionsScope abstract class
...
Bug: 321724969
Test: m Settings
Test: unit test
Merged-In: Iced9df83f600c86cc409abc040fb9ace0dcedf1e
Change-Id: Iced9df83f600c86cc409abc040fb9ace0dcedf1e
2024-01-25 20:22:45 +00:00
Treehugger Robot
d769422063
Merge "Document "Revoke USB debug authorizations"" into main am: e7c4bf5eab
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2924722
Change-Id: I5994b8801858d404cd22a586bb5a8a4b983acfdd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-01-25 00:12:35 +00:00
Treehugger Robot
e7c4bf5eab
Merge "Document "Revoke USB debug authorizations"" into main
2024-01-24 23:24:58 +00:00
Fabien Sanglard
46086cbee0
Document "Revoke USB debug authorizations"
...
It is not clear why the button "Revoke USB debugging authorizations"
may be missing from the Developer settings. This is only adding a
line to explain why we don't display it.
Test: NA
Bug: NA
Change-Id: Ie67e7a8142fc80d35016e0b43febf68d2c0354d1
2024-01-24 13:52:35 -08:00
Chris Antol
e686f52dae
Merge "Hide accounts of users that should not be shown" into main am: 8595d95122
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2898064
Change-Id: I3e0fe00eca5c30127a38a1e7cd36c22ec7666de6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-01-19 22:52:28 +00:00
Chris Antol
8595d95122
Merge "Hide accounts of users that should not be shown" into main
2024-01-19 22:05:53 +00:00
Oliver Scott
3e2dcefff0
Hide accounts of users that should not be shown
...
Bug: 318825347
Change-Id: If0f5cae8648e70c0e9c039d9b73cdc5be72b09d3
2024-01-19 18:41:21 +00:00
Chris Antol
fd72508177
Merge "Prevent the disabling of specified apps" into main am: d06d6affb4
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2774892
Change-Id: I71870eb897d63bd00a7ad4d436bcc1dd91315144
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-01-16 17:56:49 +00:00
Chris Antol
d06d6affb4
Merge "Prevent the disabling of specified apps" into main
2024-01-16 17:27:43 +00:00
Pawan Wagh
7b96c4e57b
Merge changes from topic "16k_dev_ui" into main am: 052a1658e4
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2775987
Change-Id: I2d074f6bd19c6957659b018af8736c076b95047b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-01-12 19:51:17 +00:00
Pawan Wagh
0aebae8d79
Show progress bar till the applyPayload returns am: 9be05afc88
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2766345
Change-Id: I713b313d751c063cea3835c7396859f40a61645d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-01-12 19:51:13 +00:00
Pawan Wagh
d2110a76a7
Call update engine to apply payload am: 008842edeb
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2756951
Change-Id: I21c7ec553c2a9276df3f9b352ad3f106f816a3bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-01-12 19:51:09 +00:00
Pawan Wagh
acd2de2533
Developer option for booting with 16K pages am: 8996ca9768
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2705817
Change-Id: I28136f884536a8bbf5aa10cd04ab597595e9f223
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-01-12 19:51:02 +00:00
Pawan Wagh
052a1658e4
Merge changes from topic "16k_dev_ui" into main
...
* changes:
Publish update info via SystemUpdateManager
Show progress bar till the applyPayload returns
Call update engine to apply payload
Developer option for booting with 16K pages
2024-01-12 19:42:36 +00:00
Edward Savage-Jones
49a60a152a
Prevent the disabling of specified apps
...
Prevent the disabling of specified apps, avoiding cases
where disabling the app may result in an unusable system.
Bug: 200043113
Test: make RunSettingsRoboTests ROBOTEST_FILTER=ApplicationFeatureProviderImplTest
Change-Id: I0b298af76cec20e4f31ec7411bbf3200a2869035
Merged-In: I0b298af76cec20e4f31ec7411bbf3200a2869035
2024-01-12 18:55:41 +00:00
Pawan Wagh
905b78e4a5
Publish update info via SystemUpdateManager
...
When 16K OTA is applied, this info would need to be published
to a SystemUpdateManager so that we don't clobber the updates with
other pending updates. Similarly, Fetch the pending update info from
SystemUpdateManager before applying update.
Test: m Settings && adb install -r $ANDROID_PRODUCT_OUT/system_ext/priv-app/Settings/Settings.apk
Bug: 302391134
Bug: 295035851
Change-Id: I4998122942d7f2defd69bc34474230c8aea3c25a
2024-01-12 17:33:56 +00:00
Pawan Wagh
9be05afc88
Show progress bar till the applyPayload returns
...
Displaying a progress bar till the applyPayload from update_engine
returns.
Test: m Settings && adb install -r $ANDROID_PRODUCT_OUT/system_ext/priv-app/Settings/Settings.apk
Bug: 295035851
Bug: 298214075
Change-Id: Ic8cf4df700505e7f10185ee0f08225411c6621e5
2024-01-12 17:14:03 +00:00
Pawan Wagh
008842edeb
Call update engine to apply payload
...
Calling update engine to apply payload provided from boot_otas and
reboot on success. Updating different dialogues for 4k prompt.
Test: m Settings && adb install -r $ANDROID_PRODUCT_OUT/system_ext/priv-app/Settings/Settings.apk
Test: make RunSettingsRoboTests ROBOTEST_FILTER=Enable16kPagesPreferenceControllerTest
Bug: 295573133
Change-Id: Iab90a2c2fae5f6aefce95b2306db91c7b056d9f7
2024-01-12 17:13:31 +00:00
Pawan Wagh
8996ca9768
Developer option for booting with 16K pages
...
Adding developer option to boot with 16K compatible kernel. Adding
resources, layouts and dialog classes for 16k option. This needs
to integrated with update engine to make OTA switch happen.
Test: m Settings && adb install -r $ANDROID_PRODUCT_OUT/system_ext/priv-app/Settings/Settings.apk
Bug: 295035851
Bug: 294614538
Change-Id: I3a24fed059eee99407e3486a7254285e0e4a251c
2024-01-12 16:51:16 +00:00
Jason Chiu
36dc648ca5
Merge "Finish HomepageActivity when it's not the root of a task and not singleTask." into main am: 4f4bb89a23
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2884507
Change-Id: I5b61af6e8d265bc62603554ff0236a62ba7f94a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-12-26 08:48:01 +00:00
Jason Chiu
4f4bb89a23
Merge "Finish HomepageActivity when it's not the root of a task and not singleTask." into main
2023-12-26 08:08:27 +00:00
Jason Chiu
706907b7b2
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
Fix: 309045575
Test: robotest
Change-Id: Iddcba1652060d755693dd20d0e350e3d6c1ae138
Merged-In: Iddcba1652060d755693dd20d0e350e3d6c1ae138
2023-12-26 02:08:14 +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
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
Xin Li
4f1ec8cb8a
Merge UQ1A.231205.015
...
Bug: 308969284
Merged-In: I5d9d1d30d280311875d8bd8604aed0fd0c08ab2c
Change-Id: I22fa193e9846fdb998810c93c9c26344a40d89a9
2023-12-07 15:48:03 -08:00
Roshan Pius
da05498175
Merge "settings: Remove @hide NFC API usage" into main am: 75a49e0abb
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2851159
Change-Id: Ic089b941505ff82eca32e9d82f9648909b30c267
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-30 18:31:27 +00:00
Roshan Pius
75a49e0abb
Merge "settings: Remove @hide NFC API usage" into main
2023-11-30 17:29:37 +00:00
Roshan Pius
0d11f492f7
settings: Remove @hide NFC API usage
...
These @hide usages in other parts of platform need to be cleaned
up to unbundle NFC mainline module.
Flag: None (The NFC flag - `enableNfcMainline` has been promoted to trunkfood. Note these APIs are available as @hide even if not available in formal SDK until V)
Bug: 307352220
Test: Compiles
Merged-In: I6f87ad7ae03c67aaa2ddb0ac2529debc53278ba8
Change-Id: I6f87ad7ae03c67aaa2ddb0ac2529debc53278ba8
2023-11-29 22:22:16 +00:00
Eric Biggers
51a0475c44
Merge "Use isCeStorageUnlocked() in storage wizards" into main am: 7ec6e27c64
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2807094
Change-Id: I038600e5177845571e80d65c24eb90278320e295
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-29 03:38:30 +00:00
Eric Biggers
7ec6e27c64
Merge "Use isCeStorageUnlocked() in storage wizards" into main
2023-11-29 02:27:02 +00:00
Hansen Kurli
42ad676a4e
Merge "Create a new string to alert unsupported vpn start." into main am: 3c569b5379
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2831551
Change-Id: I6ee70a33d9c5739ee2e44dcef8158c5f2b7767e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-21 08:59:06 +00:00
Hansen Kurli
3c569b5379
Merge "Create a new string to alert unsupported vpn start." into main
2023-11-21 08:21:33 +00:00
Hansen Kurli
e49454db98
Create a new string to alert unsupported vpn start.
...
Test: Manual test
Change-Id: Ic32db48671335a59c3bf8b43065cfef7c39c2936
2023-11-21 13:29:27 +08:00
Treehugger Robot
8a2a127435
Merge "Fix crash when clicking Spell Checker" into main am: e4f376f7ef
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2828056
Change-Id: Idb4ebe7592c2bdf2685fb20c95b57c20565c0dcd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-21 03:49:50 +00:00
Treehugger Robot
e4f376f7ef
Merge "Fix crash when clicking Spell Checker" into main
2023-11-21 03:13:59 +00:00
Peiyong Lin
bcefa0a8c4
Merge "Unconditionally enable ANGLE developer option UI." into main am: 4e6db90f5d
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2798714
Change-Id: Id58c91947beea82ad02fa2b83e2a536f27dea327
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-17 02:07:48 +00:00
Peiyong Lin
4e6db90f5d
Merge "Unconditionally enable ANGLE developer option UI." into main
2023-11-17 01:45:25 +00:00
Hansen Kurli
f151e8bdd0
Merge "Use AlertDialog to alert Unsupported VPN type." into main am: 643136bba6
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2824760
Change-Id: I741bcfd4484ef711d3190c94c7dd4f2a1c325fed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-16 11:34:15 +00:00
Hansen Kurli
643136bba6
Merge "Use AlertDialog to alert Unsupported VPN type." into main
2023-11-16 11:08:33 +00:00
Peiyong Lin
8fc1391a75
Unconditionally enable ANGLE developer option UI.
...
Bug: b/283781993
Test: atest CtsAngleIntegrationHostTestCases -c
Test: atest SettingsRoboTests:GraphicsDriverEnableAngleAsSystemDriverControllerTest
Change-Id: I7f491151cc26dc10ccdb2900cfa81ff09c23b184
Merged-In: I7f491151cc26dc10ccdb2900cfa81ff09c23b184
2023-11-15 18:16:46 +00:00
Treehugger Robot
202b3b147b
Merge "Settings: remove multiple users search when multi-user not supported" into main am: 5a9826b844
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2827270
Change-Id: I5a9b318d5ce194fc7b4623a1d68085dd43b4a4da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-15 09:57:05 +00:00
Treehugger Robot
5a9826b844
Merge "Settings: remove multiple users search when multi-user not supported" into main
2023-11-15 09:28:00 +00:00
Howard Chen
8524cc8afd
Merge "Disable factory reset in DSU mode" into main am: 8136e6d397
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2814174
Change-Id: I1020e5af5af7f91446d3afd290b643429163eb12
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-15 08:35:33 +00:00