Kangping Dong
33722b512a
Merge "[Thread] use dedicated flag for Thread settings" into main
2024-03-14 05:28:50 +00:00
Pawan Wagh
09561aa513
Merge "Show dialog to OEM unlock the device for 16k dev option" into main am: 72fd15a678
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2974373
Change-Id: I3337702190cfd724670477ef12a62a367be8ae1b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-03-14 04:50:29 +00:00
Pawan Wagh
72fd15a678
Merge "Show dialog to OEM unlock the device for 16k dev option" into main
2024-03-14 04:37:31 +00:00
Android Build Coastguard Worker
bc99244e96
Merge cherrypicks of ['googleplex-android-review.googlesource.com/26385510', 'googleplex-android-review.googlesource.com/26561927'] into 24Q2-release.
...
Change-Id: I9906d2bd5eb7b4410e363a26f1e9855ae785eea9
2024-03-14 01:01:06 +00:00
Wilson Wu
2ffd023d17
Fix keyboard vibration settings delay
...
The default settings observer delay is 10s for
background service. It cause the apps get the
settings update delay and lead a unsync behavior.
Update the settings change without delay.
Bug: 327094397
Test: Manual test with bug steps
Test: atest KeyboardVibrationTogglePreferenceControllerTest
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:f2174611b8be192815f16e0ebc42eebfe3bfca0d )
Merged-In: Ib1c23ec9e1442e8397c7a36ffa157594ac64a9b3
Change-Id: Ib1c23ec9e1442e8397c7a36ffa157594ac64a9b3
2024-03-14 00:59:38 +00:00
Vaibhav Devmurari
9d0f23c862
Modify PK Settings page to make it more user friendly
...
PK Settings page:
- Show current PK layout selected for the current user profile and current IME language instead of a list of IMEs
PK layout mapping page:
- Show IME name in header only if multiple active IMEs
- Show the PK layout selection criteria (Automatic v/s User selected)
Bug: 325925410
Bug: 326195401
Test: manual
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:8754f114ac48cb80c367c11769947553f5c56034 )
Merged-In: I93a2e169742a800fa116fa5d55e1a91e5548cebb
Change-Id: I93a2e169742a800fa116fa5d55e1a91e5548cebb
2024-03-14 00:59:27 +00:00
Kangping Dong
08dd96fd8f
[Thread] use dedicated flag for Thread settings
...
a larger THREAD_ENABLED_PLATFORM flag which guards all Thread-related
platform changes is used for the Thread settings change. But we need
more flexible control of the UX release timeline. So use a dedicated
THREAD_SETTINGS_ENABLED flag here.
Bug: 329384658
Change-Id: Ib5b3ae3c71ccc890fc46af982b021858774938f3
2024-03-13 18:28:45 +08:00
Pawan Wagh
1c1366e968
Show dialog to OEM unlock the device for 16k dev option
...
Device should be OEM unlocked before using dev option. Show dialog
to user to perform OEM unlock. This also checks if user has permission
to do OEM unlock and it is allowed by carrier.
Test: m Settings && adb install -r $ANDROID_PRODUCT_OUT/system_ext/priv-app/Settings/Settings.apk
Bug: 295035851
Bug: 320705365
Change-Id: I6470bf7d02424a26621ed67f19f2cd14fa9eea50
2024-03-08 21:36:58 +00:00
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
Android Build Coastguard Worker
889d33f319
Merge cherrypicks of ['googleplex-android-review.googlesource.com/26459632'] into 24Q2-release.
...
Change-Id: I439d6888ed42174a6dfdf69a9f6d4f6ca8542fe3
2024-03-07 20:58:00 +00:00
Wilson Wu
08308b2ee8
Add fixed amplitude check for keyboard vibration
...
Make sure the keybaord vibration settings only show
up when fixed amplitude provided to avoid any unsync
behavior with platform.
Bug: 326027376
Test: atest KeyboardVibrationTogglePreferenceControllerTest
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:fd45101eee85da95a3de8d4ce2bfd01824e282c3 )
Merged-In: I3b4e06660e3eaa6ce537b72831073f092cba37e2
Change-Id: I3b4e06660e3eaa6ce537b72831073f092cba37e2
2024-03-07 20:54:55 +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
Android Build Coastguard Worker
7147196c42
Snap for 11526283 from a6f283382a to 24Q2-release
...
Change-Id: I97724f2b3f3a2afab2dc784dad328b9cb963c3e2
2024-03-05 00:49:21 +00:00
Treehugger Robot
a6f283382a
Merge "Import translations. DO NOT MERGE ANYWHERE" into main
2024-03-04 17:25:26 +00:00
Treehugger Robot
fd54b422d7
Merge "Import translations. DO NOT MERGE ANYWHERE" into main
2024-03-04 17:25:26 +00:00
SongFerng Wang
71c6c3e557
Merge changes I96574a79,I74681222 into main
...
* changes:
Fix the testcase failed
Add the log for SidecarFragment
2024-03-04 12:27:37 +00:00
songferngwang
c9a3eeb792
Fix the testcase failed
...
Add mock for SubscriptionManager.createForAllUserProfiles
Bug: 323652989
Test: atest MobileNetworkPreferenceControllerTest
Change-Id: I96574a79eba581db95d387f0d9c9fde2e004c41c
2024-03-04 10:58:22 +00:00
Charlotte Lu
3b856490e8
Merge "Change WepNetworkDialogActivity exported="true"." into main
2024-03-04 10:15:53 +00:00
songferngwang
0d7d180246
Add the log for SidecarFragment
...
The system miss the SidecarFragment result, so the settings did not
active the esim.
Bug: 302505660
Test: NA
Change-Id: I746812220fed001eddc7d4aeeaf7aa0b04b86692
2024-03-04 10:10:30 +00:00
SongFerng Wang
d94a556939
Merge "Fix SimDialogActivityTest" into main
2024-03-04 08:48:11 +00:00
Zaiyue Xue
62132fffb2
Merge "Update the logic for logging anomaly information to WW." into main
2024-03-04 08:00:08 +00:00
Zaiyue Xue
a399c73ba0
Merge "Fix anomaly is not logged in non-debug mode." into main
2024-03-04 07:55:18 +00:00
Chaohui Wang
66dacdf050
Merge "Create phoneNumberFlow" into main
2024-03-04 07:48:37 +00:00
Angela Wang
6089d3edd6
Merge "Replaces HearingDevicePairingDetail with HearingDevicePairingFragment" into main
2024-03-04 06:53:19 +00:00
Chaohui Wang
c8edb018a4
Create phoneNumberFlow
...
Bug: 318310357
Test: manual - on Mobile Settings
Change-Id: Ib80b6c510ebd89650557240add23d914934ba6c9
2024-03-04 13:52:18 +08:00
Zaiyue Xue
87ecb92e6e
Fix anomaly is not logged in non-debug mode.
...
Proto is not supported to fully toString() in non-debug mode.
Bug: 327978756
Fix: 327978756
Test: manual
Change-Id: I1231c40769fd345b500ec120cf9c6fca3eb7c54a
2024-03-04 13:24:13 +08:00
Jacky Wang
16a99aecae
Merge "[DataStore] Migrate BatteryBackupHelper to BackupRestoreStorage" into main
2024-03-04 03:58:29 +00:00
Weng Su
1a2d60a867
Merge "Ignore failed Wi-Fi unit tests" into main
2024-03-04 03:47:47 +00:00
Zaiyue Xue
51740f6540
Update the logic for logging anomaly information to WW.
...
Bug: 316075226
Test: manual
Change-Id: I22198ee1ae3cedee6ee9d2e8191423000ba32af2
2024-03-04 10:47:29 +08:00
Chelsea Hao
7eb6df8ee7
Merge "[Audiosharing] Remove audio streams from settings." into main
2024-03-04 02:33:18 +00:00
Weng Su
777157b5b4
Ignore failed Wi-Fi unit tests
...
Bug: 323645528
Flag: None
Test: unit test
atest -c SettingsUnitTests:RequestToggleWiFiActivityTest \
SettingsUnitTests:WifiDialog2Test \
SettingsUnitTests:WifiUtilsTest
Change-Id: I8d3ddb1eb775b8758cb359cac4dac39bb9c8dfed
2024-03-04 06:07:40 +08:00
Jacky Wang
006bf17c4f
[DataStore] Migrate BatteryBackupHelper to BackupRestoreStorage
...
Bug: 325144964
Test: Manual tests
Change-Id: I19f7c78969d70648d1e45f1627827d98b1fdd1e0
2024-03-03 22:42:00 +08:00
Android Build Coastguard Worker
49cfbcc552
Snap for 11521484 from bec4c9573e to 24Q2-release
...
Change-Id: I086a5d8514a9b53b90a94e4e4eb47dac4e074bcf
2024-03-02 22:21:12 +00:00
songferngwang
3f6d1dc3e5
Fix SimDialogActivityTest
...
Can't create handler inside thread
Bug: 323649089
Test: atest SimDialogActivityTest
Change-Id: I678a1a1841ab1e1cd87c358fbb3d52cbfb55dbe4
2024-03-02 14:45:47 +00:00
Chaohui Wang
bec4c9573e
Create isSubscriptionEnabledFlow
...
To better display the isEnable checked state.
Bug: 318310357
Test: manual - on Mobile Settings
Test: unit test
Change-Id: Ia595e7445650ad67883f1e7c1a0662cb826565ea
2024-03-02 05:01:28 +00:00
Bill Yi
2d9d67e1ab
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I2ca02b24a8caada2f029fe0404380cd4b5a19bf6
2024-03-01 18:35:22 -08:00
Bill Yi
dffd47e40f
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I7b7532edc5b9fea79f8316e27ddb64e83dbc22d5
2024-03-01 18:33:40 -08:00
Android Build Coastguard Worker
de6d552cf7
Snap for 11520864 from 14f9f67df6 to 24Q2-release
...
Change-Id: Idcefa9f228f317f3793b39194e32ae4d9eb0452f
2024-03-02 02:21:10 +00:00
Treehugger Robot
29e984b13a
Merge "settings(dev): Remove NFC stack logging control" into main
2024-03-02 02:16:24 +00:00
Treehugger Robot
14f9f67df6
Merge "Make SmartBatterySettings unsearchable when it's not available." into main
2024-03-01 17:56:59 +00:00
Yiling Chuang
93c0dbf98d
Make SmartBatterySettings unsearchable when it's not available.
...
Bug: 323915905
Test: robotest
Change-Id: I5adc9d19b482b8e07237f5c7d62d315556095c38
2024-03-01 16:28:12 +00:00