Jacky Wang
2bc6aebf14
[automerger skipped] [DataStore] Support backup data state computation am: 85e130ad7a -s ours
...
am skip reason: Merged-In I8ad4f2788f9f364eceb1bca841830e1f3a68fe77 with SHA-1 5847d50e7b is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26561030
Change-Id: If9090bd12fcf9d92ddf43bbd5f0e6b171ccdeacb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-03-13 06:56:03 +00:00
Jacky Wang
5ccf24fe46
[automerger skipped] [DataStore] Support backup data with compression am: a76aade27e -s ours
...
am skip reason: Merged-In Id73a30c2b58fafa6d9d1cbe247a6d9c38397394b with SHA-1 23821a69f3 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26561029
Change-Id: I9119ce5e0dab4d96cb119b9a3fc559c6c97531f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-03-13 06:55:59 +00:00
Jacky Wang
4b1c39ef43
[automerger skipped] [DataStore] Migrate LocaleNotification SharedPreferences to BackupRestoreStorage am: 11c9f1bff4 -s ours
...
am skip reason: Merged-In I195ee91f29030fcfe7176ed0c18fb2e2d0d40257 with SHA-1 cc0a94d732 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26561028
Change-Id: I07188cecba8d5e9feb324418063e6c060c97c6ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-03-13 06:55:53 +00:00
Charlotte Lu
8cad117210
Merge "Fix certX509 has not been initialized." into main
2024-03-13 06:42:51 +00:00
Charlotte Lu
6693a02a2b
Fix certX509 has not been initialized.
...
Test: Manual
Fix: 329243388
Change-Id: If9507f2aeddc1a5077a39246ac2af2f32b2b94bc
2024-03-13 12:13:30 +08:00
Jacky Wang
85e130ad7a
[DataStore] Support backup data state computation
...
Bug: 325144964
Test: Manual tests
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:5847d50e7bcab7d45d03351df802fb1228226aa5 )
Merged-In: I8ad4f2788f9f364eceb1bca841830e1f3a68fe77
Change-Id: I8ad4f2788f9f364eceb1bca841830e1f3a68fe77
2024-03-13 03:23:27 +00:00
Jacky Wang
a76aade27e
[DataStore] Support backup data with compression
...
Bug: 325144964
Test: Manual tests
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:23821a69f31c5712cb369bfdd7776a66926dc5ac )
Merged-In: Id73a30c2b58fafa6d9d1cbe247a6d9c38397394b
Change-Id: Id73a30c2b58fafa6d9d1cbe247a6d9c38397394b
2024-03-13 03:23:19 +00:00
Jacky Wang
11c9f1bff4
[DataStore] Migrate LocaleNotification SharedPreferences to BackupRestoreStorage
...
Bug: 325144964
Test: Manual tests
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:cc0a94d73247fa81eff0054a0dcf06e99c45adb1 )
Merged-In: I195ee91f29030fcfe7176ed0c18fb2e2d0d40257
Change-Id: I195ee91f29030fcfe7176ed0c18fb2e2d0d40257
2024-03-13 03:23:12 +00:00
Marcus Ge
3042a3f02b
Merge "Update Settings homepage color role mappings" into main
2024-03-12 20:56:49 +00:00
Mike Schneider
3085f01f6f
Merge "Fold [GoldenImagePathManager] into [GoldenPathManager] #cleanup" into main
2024-03-12 17:42:03 +00:00
Nino Jagar
720bdde511
Merge "Integrate admin controls for content protection" into main
2024-03-12 17:05:24 +00:00
Joseph Vincent
d003fb1be8
Merge "Show Alert dialog on Hide when locked is enabled" into main
2024-03-12 17:04:44 +00:00
Oli Thompson
e0f43bbc42
Merge "add a check if the app store link intent can be opened in the profile." into main
2024-03-12 11:07:48 +00:00
josephpv
3c97c63d62
Show Alert dialog on Hide when locked is enabled
...
Bug: 325398789
Test: atest HidePrivateSpaceControllerTest
Change-Id: I6bfa3546b3ba56905918f8fd44c5351bf2d284b8
2024-03-12 10:35:56 +00:00
Treehugger Robot
fb52d69142
Merge "Fix test failure in com.android.settings.wifi.details2" into main
2024-03-12 06:55:42 +00:00
Treehugger Robot
3c26c93bd5
Merge "Add new dialogue when user is going to delete multiple sims where aleast on of them use RAC." into main
2024-03-12 05:45:06 +00:00
Zaiyue Xue
ff8116cc36
Fix test failure in com.android.settings.wifi.details2
...
Bug: 329046490
Fix: 329046490
Test: manual
Change-Id: Ia8ecdc4e52c57c5491786c5f0741820a94345428
2024-03-12 12:47:09 +08:00
Charlotte Lu
e9ee2c66bb
Merge "Add CertificateDetailsPageProvider." into main
2024-03-12 03:31:25 +00:00
Charlotte Lu
470c27b8bd
Merge "Add dhcp in advanced settings toggle." into main
2024-03-12 02:32:57 +00:00
Rafael Higuera Silva
9ac44b3aae
Add new dialogue when user is going to delete multiple sims where aleast on of them use RAC.
...
Test: make, manually test, atest com.android.settings.network, atest SubscriptionUtilTest
Bug: 328649505
Change-Id: I0c6fb7b5407179ec6850ece47f486b64759e2d1c
2024-03-11 23:29:30 +00:00
Treehugger Robot
b9895a2438
Merge "Touchpad: add metric for tap dragging setting changes" into main
2024-03-11 16:00:28 +00:00
Treehugger Robot
f3b5904c94
Merge "settings(dev): Remove NFC stack logging control resources" into main
2024-03-11 11:23:15 +00:00
Charlotte Lu
458b942a90
Add CertificateDetailsPageProvider.
...
Test: Unit Test
Fix: 326191189
Change-Id: I542903b26bac589ba67c297d8758ea0a69ebdf23
2024-03-11 17:29:35 +08:00
Chaohui Wang
fd666490ec
Merge "Restrict SimPreference" into main
2024-03-11 09:27:49 +00:00
Chaohui Wang
15b42fe25a
Merge "Use SubscriptionUtil.getFormattedPhoneNumber" into main
2024-03-11 09:27:45 +00:00
Jacky Wang
e18a651d89
Merge "Reset app preferences does not trigger backup for App battery usages" into main
2024-03-11 09:11:12 +00:00
Angela Wang
c9563a59da
Merge changes from topic "ha-preset" into main
...
* changes:
Selects presets in device details page (2/2)
Selects presets in device details page (1/2)
Separate category controller out of HearingDeviceControlsController
2024-03-11 08:33:46 +00:00
Chaohui Wang
59c8ba7fd0
Use SubscriptionUtil.getFormattedPhoneNumber
...
For Primary SIM.
Bug: 318310357
Test: manual - on Mobile Settings
Change-Id: Ic8085532fd025bb1e0b6897f5509f485c37a6d56
2024-03-11 15:51:35 +08:00
Charlotte Lu
08f8f0ce9e
Add dhcp in advanced settings toggle.
...
Test: Unit Test
Fix: 329002870
Change-Id: I5c57deb1e8ed0dd59a7699b56f5eb99ca29876b8
2024-03-11 06:47:38 +00:00
Jacky Wang
ef8a51fac8
Reset app preferences does not trigger backup for App battery usages
...
Bug: 328712606
Fix: 328712606
Test: UT && Verify logcat when change/reset App battery usages
Change-Id: Ia3917c8dc2654185f5f048c048362fd47379b7d1
2024-03-11 13:41:03 +08:00
Chaohui Wang
af43d95332
Restrict SimPreference
...
Check policy UserManager.DISALLOW_CONFIG_MOBILE_NETWORKS.
Bug: 329000499
Test: manual - on Mobile Settings
Change-Id: I37687299a9ec5c77b59cb231969180872271f4a6
2024-03-11 12:35:11 +08:00
Fan Wu
c8d5701ab5
Merge "Fix AppInfoWithHeaderTest" into main
2024-03-11 04:06:35 +00:00
Jacky Wang
a0f50eb526
Merge "Enable android:restoreAnyVersion" into main
2024-03-11 02:13:25 +00:00
Roshan Pius
aef8284b9d
settings(dev): Remove NFC stack logging control resources
...
Was not fully removed in ag/26414526.
Bug: 327517842
Change-Id: Ia147e754547a73ff63d877eb6ef86794f3dd0250
Test: Compiles
2024-03-11 00:48:44 +00:00
Treehugger Robot
8b609ded50
Merge "Import translations. DO NOT MERGE ANYWHERE" into main
2024-03-09 04:27:21 +00:00
Treehugger Robot
fa3e660b93
Merge "Import translations. DO NOT MERGE ANYWHERE" into main
2024-03-09 04:27:21 +00:00
Treehugger Robot
35b5d41db3
Merge "Fix crash on potentially missing EuiccManager" into main
2024-03-09 03:39:54 +00:00
Treehugger Robot
b1e1e290af
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: 871af637b2 -s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26512038
Change-Id: Ia0d3f54a4af33a6fb85b6525a2c7c0676bc79d15
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-03-09 00:42:18 +00:00
Bill Yi
5ca63eacd3
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1cf54c6888 -s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26512038
Change-Id: Ide1d396da3b43cf30b7c18fc8738e9be9da57142
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-03-09 00:41:52 +00:00
Bill Yi
db22f010b3
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 723639d1d1 -s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26512035
Change-Id: I8878bfd2b9d27057f05d581497e1e93a135e3dd0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-03-08 23:58:01 +00:00
Treehugger Robot
871af637b2
Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev
2024-03-08 23:49:59 +00:00
Pawan Wagh
e33f92fa98
Merge "Wipe /data with ext4 before 16K OTA" into main am: 2e090585ca am: ae28bee6fc
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2973764
Change-Id: I8980389f8cdf590dbec4470766c92fc6ec0407a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-03-08 19:34:05 +00:00
Aditi Katragadda
d983741f07
Merge "Enable Bluetooth stack logging from Developer Options UI Element" into main
2024-03-08 19:17:04 +00:00
Oli Thompson
77f8e503c3
add a check if the app store link intent can be opened in the profile.
...
Bug: 245269933
Test: manually tested
Change-Id: I5240c2a5e2444444738fe1d226c11e9d56ab8c87
2024-03-08 18:55:52 +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
Tomasz Wasilczyk
b27c9b507b
Fix crash on potentially missing EuiccManager
...
Bug: 310710841
Test: it builds
Change-Id: I9d2c88091a34a4e4e118fd1bd8d95c724c52e77e
2024-03-08 18:41:25 +00:00
Treehugger Robot
0003443c3d
Merge "Fix Settings profile selector on HSUM" into main
2024-03-08 18:36:27 +00:00
Chun-Ku Lin
9cf7f6e861
Merge "Show QS shortcut option if the a11y feature provides a tile." into main
2024-03-08 17:20:15 +00:00
Mykola Podolian
82ca9a1c3d
Merge "Updated bubble setting design according to b/284170911." into main
2024-03-08 15:10:04 +00:00
Wilson Wu
e6e41fb1c4
Add fixed amplitude check for keyboard vibration am: 81f2587fd4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26496383
Change-Id: I1b92f86b8161c2fc15cae4d632f179dd318e4242
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-03-08 15:03:22 +00:00