Pawan Wagh
ae28bee6fc
Merge "Wipe /data with ext4 before 16K OTA" into main am: 2e090585ca
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2973764
Change-Id: Ia1e7de564f6d3d1e81ff4fc26c5cdb0817fcdcba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-03-08 18:52:07 +00:00
Pawan Wagh
2e090585ca
Merge "Wipe /data with ext4 before 16K OTA" into main
2024-03-08 06:59:49 +00:00
Pawan Wagh
2951b024dc
Wipe /data with ext4 before 16K OTA
...
16K developer option needs /data partition to be ext4. Wipe
the /data and reformat it to ext4 using RecoverySystem.
Test: m Settings && adb install -r $ANDROID_PRODUCT_OUT/system_ext/priv-app/Settings/Settings.apk
Test: adb shell cat /proc/mounts | grep f2fs
Bug: 295035851
Bug: 320700993
Change-Id: I7ca6f3a7e18d6dbe4e9791b3c83d149365941989
2024-03-08 03:12:40 +00:00
Xin Li
fe3023d496
[automerger skipped] Merge "Merge Android 14 QPR2 to AOSP main" into main am: 12e4524868
-s ours
...
am skip reason: Merged-In I309e4d56dc379680d07bf1e28648ca620b824bad with SHA-1 887741ee49
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2990667
Change-Id: I07caaffd876b2cdfcf53b63a76eea24b3f64c30e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-03-07 09:57:57 +00:00
Xin Li
ac425a05cb
[automerger skipped] Merge Android 14 QPR2 to AOSP main am: a80653d111
-s ours
...
am skip reason: Merged-In I309e4d56dc379680d07bf1e28648ca620b824bad with SHA-1 887741ee49
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2990667
Change-Id: I5c754c832b54501813c71cdb14b719b33029155c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-03-07 09:54:56 +00:00
Xin Li
12e4524868
Merge "Merge Android 14 QPR2 to AOSP main" into main
2024-03-07 06:41:13 +00:00
Xin Li
a80653d111
Merge Android 14 QPR2 to AOSP main
...
Bug: 319669529
Merged-In: I309e4d56dc379680d07bf1e28648ca620b824bad
Change-Id: Idce3726e1ade60db7b02c9995ecb43cfa1986ff0
2024-03-06 09:30:06 -08:00
Treehugger Robot
887741ee49
Merge "[Thread] fix wrong kotlin argument name" into main am: dee4388b93
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2984352
Change-Id: I309e4d56dc379680d07bf1e28648ca620b824bad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-03-05 15:22:33 +00:00
Treehugger Robot
dee4388b93
Merge "[Thread] fix wrong kotlin argument name" into main
2024-03-05 14:31:02 +00:00
Harry Cutts
3c1a5bb3c0
Merge "Touchpad: add Framework Input team as owners" into main am: a3a04112fd
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2982053
Change-Id: Idf76ff1bf592de800d224052910927285c47c42e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-03-05 12:05:02 +00:00
Harry Cutts
a3a04112fd
Merge "Touchpad: add Framework Input team as owners" into main
2024-03-05 11:17:46 +00:00
Daniel Norman
af3c4de3c3
Merge "Add Chun-Ku to A11y Settings OWNERS" into main am: 951cd157de
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2985032
Change-Id: I66e884b014a5162ea02312fd31030bde7beb859d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-02-29 21:43:19 +00:00
Daniel Norman
951cd157de
Merge "Add Chun-Ku to A11y Settings OWNERS" into main
2024-02-29 21:06:34 +00:00
Daniel Norman
b9e38fa9f0
Add Chun-Ku to A11y Settings OWNERS
...
Change-Id: Ia82f9f2196a33518faf2b7f345ad354990f7cf74
Test: n/a
Bug: n/a
2024-02-29 21:04:02 +00:00
Kangping Dong
abd5f23fe9
Merge "[Thread] add Thread toggle in settings" into main am: 522e193947
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2909326
Change-Id: I8640f2cf4a90203972a5db703ebb3e027224c746
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-02-29 17:43:51 +00:00
Kangping Dong
e5c4c6e677
[Thread] fix wrong kotlin argument name
...
Fixes build warning:
```
the corresponding parameter in the supertype 'LifecycleEventObserver' is named 'source'. This may cause problems when calling this function with named arguments.
override fun onStateChanged(lifecycleOwner: LifecycleOwner, event: Lifecycle.Event) {
```
Bug: 327098435
Change-Id: I9c50ab508cd39bf2eda02c423deeef9ca5342f4f
2024-03-01 00:49:03 +08:00
Kangping Dong
522e193947
Merge "[Thread] add Thread toggle in settings" into main
2024-02-29 16:45:34 +00:00
Kangping Dong
5fc01ddd6e
[Thread] add Thread toggle in settings
...
Allows a user to disable or enable Thread network / radio from
settings.
In this commit, a toggle is added to Settings > Connected devices >
Connection preferences to control Thread state. See the screenshots
below:
1. Thread is on: https://screenshot.googleplex.com/7FqqbzRX6rGwvSb
2. Thread is off: https://screenshot.googleplex.com/AmfRAhzuukULAAG
3. Thread is disabled by airplane mode: https://screenshot.googleplex.com/7zcesyomrveCqFE
4. Thread is searchable: https://screenshot.googleplex.com/9yFL2jeSuEhJwrS
Requirements:
1. the in-take bug: b/327098435
2. See the screenshot above
3. Test with `atest SettingsUnitTests` and manual tests
4. +2 from Yuwen
5. Flagged by "com.android.net.thread.platform.flags.Flags.thread_enabled_platform"
6. It doesn't need B&R, no preferences are added (the state is in
Android framework (mainline module))
7. Confirmed searchable
8. Code written in Kotlin
Bug: 296990038
Bug: 319077562
Test: atest SettingsUnitTests
Change-Id: Ifa2264b8e59a5112290fd0224cb75ad228732077
2024-02-29 18:05:49 +08:00
Harry Cutts
3715b07684
Touchpad: add Framework Input team as owners
...
Also replace references to
frameworks/base:/services/core/java/com/android/server/input/OWNERS with
ones directly to frameworks/base:/INPUT_OWNERS.
Bug: 324058706
Test: none
Change-Id: Ib8943ca749887da7d5eebae908516e86310f2077
2024-02-28 14:37:10 +00:00
Treehugger Robot
2605622758
Merge "Drop platform_apis from android_library" into main am: ff6f53b24a
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2971233
Change-Id: I193568ec0dc8884dfa0be634e90b26295658aee8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-02-21 19:09:57 +00:00
Treehugger Robot
ff6f53b24a
Merge "Drop platform_apis from android_library" into main
2024-02-21 18:29:16 +00:00
Spandan Das
266a9a503c
Drop platform_apis from android_library
...
This property is a no-op for this module type.
Test: m nothing
Bug: 215379393
Change-Id: I73811c70c4191eb6005a5f365f0b1c149d30564b
2024-02-21 14:37:30 +00:00
Treehugger Robot
79bb73b651
[automerger skipped] Merge "[DON'T BLOCK] Test ownership migration rules" into main am: cca4e91fcf
-s ours
...
am skip reason: Merged-In I7fbd55a92f4302a6e03bcff0283737fd9295165d with SHA-1 3f65505208
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2950590
Change-Id: Idb929307456e59f885e1486227f3f6dce7b9d714
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-02-12 22:02:29 +00:00
Aditya Choudhary
394bf6541d
[automerger skipped] [DON'T BLOCK] Test ownership migration rules am: 01735e6b40
-s ours
...
am skip reason: Merged-In I7fbd55a92f4302a6e03bcff0283737fd9295165d with SHA-1 3f65505208
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2950590
Change-Id: I8a5358be63fda69b82685b407c2019bd7919bb25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-02-12 22:02:23 +00:00
Treehugger Robot
cca4e91fcf
Merge "[DON'T BLOCK] Test ownership migration rules" into main
2024-02-12 20:55:57 +00:00
Aditya Choudhary
01735e6b40
[DON'T BLOCK] Test ownership migration rules
...
This CL is created as a best effort to migrate test targets
to the new android ownership model. If you find incorrect or unnecessary
attribution in this CL, please create a separate CL to fix that.
For more details please refer to the link below,
go/new-android-ownership-model
Bug: 304529413
Test: N/A
Change-Id: I7fbd55a92f4302a6e03bcff0283737fd9295165d
Merged-In: I7fbd55a92f4302a6e03bcff0283737fd9295165d
2024-02-09 17:45:41 +00:00
Aditya Choudhary
3f65505208
[DON'T BLOCK] Test ownership migration rules
...
This CL is created as a best effort to migrate test targets
to the new android ownership model. If you find incorrect or unnecessary
attribution in this CL, please create a separate CL to fix that.
For more details please refer to the link below,
go/new-android-ownership-model
Bug: 304529413
Test: N/A
Change-Id: I7fbd55a92f4302a6e03bcff0283737fd9295165d
2024-02-09 16:14:48 +00:00
Xin Li
6387b7e6b2
Merge "Merge Android 24Q1 Release (ab/11220357)" into aosp-main-future
2024-01-30 22:44:00 +00:00
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
Xin Li
6b4b7336bc
Merge Android 24Q1 Release (ab/11220357)
...
Bug: 319669529
Merged-In: If21ca5e914a5ee5aff3fbeeee9595bb77a8fc3d0
Change-Id: I87182e72d0ceb75499528f9011d009d772045e09
2024-01-30 09:24:25 -08: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