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
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
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
Olivier Nshimiye
baa7a8c2c8
Add enable_private_space_features flag check for Private Space implementation
...
Bug: 326060689
Test: Manual
Change-Id: I82105714e74789394a3d46b852aaa3e7b93e5877
2024-03-08 15:36:29 +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
Wilson Wu
81f2587fd4
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
Change-Id: I3b4e06660e3eaa6ce537b72831073f092cba37e2
2024-03-08 11:22:34 +00:00
Mike Schneider
b7c80a5491
Fold [GoldenImagePathManager] into [GoldenPathManager] #cleanup
...
These are required changes sto be submitted together with ag/26486827.
Bug: 322324387
Test: Test-only change, covered by existing unit tests
Change-Id: I5287c8ed485ff818f5714759663b64f157951897
2024-03-08 11:06:01 +01:00
Bill Yi
1cf54c6888
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ifb7c28118ce7635f9b070ec4971c9543ee4b0dea
2024-03-08 02:05:18 -08:00
Bill Yi
81faef064e
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I65c7c4ec59a127be14dfa2f93302fc50d56a9046
2024-03-08 02:03:31 -08:00
Bill Yi
acfca75497
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ic16b9e934f54685e890507453160f934c6541761
2024-03-08 02:01:20 -08:00
Bill Yi
723639d1d1
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I0bfa57fe10f9cd1d9c5fadeb329f19710aa2060e
2024-03-08 01:59:53 -08:00
Jacky Wang
65e283dca7
Enable android:restoreAnyVersion
...
Bug: 317149339
Test: Manual tests
Change-Id: If1f37519b59159c5cd6fa49a3e23dcc85348336e
2024-03-08 16:41:56 +08:00
Jacky Wang
7dee0538d6
Merge "Sort applications to avoid backup data change" into main
2024-03-08 08:03:43 +00:00
Aditi Katragadda
5c98e0fbcc
Enable Bluetooth stack logging from Developer Options UI Element
...
The goal is to be able to enable different log levels for Bluetooth
stack logging from Developer Options in Settings. This is done by
creating a Bluetooth property which houses the current state of the log
level, adding the required UI elements and linking the two together.
Tag: #feature
Bug: 307330446
Test: atest BluetoothStackLogPreferenceControllerTest
Change-Id: I8665b17622218743aa00250118b718d5cabdb9fc
2024-03-07 23:59:10 -08:00
Jacky Wang
ea8ed47d07
Sort applications to avoid backup data change
...
Bug: 328698829
Fix: 328698829
Test: Manual test
Change-Id: I0e5bf1145d972db136bbd85571f015b4ab6fb171
2024-03-08 15:28:12 +08:00
Pawan Wagh
2e090585ca
Merge "Wipe /data with ext4 before 16K OTA" into main
2024-03-08 06:59:49 +00:00
Bill Yi
6a33366270
Merge "Import translations. DO NOT MERGE ANYWHERE" into main
2024-03-08 04:47:06 +00:00
Bill Yi
20ecc16a7b
Merge "Import translations. DO NOT MERGE ANYWHERE" into main
2024-03-08 04:47:06 +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
Chaohui Wang
25d68d845a
Merge "Fix flicker of "App data usage"" into main
2024-03-08 02:54:39 +00:00
Charlotte Lu
bf582ecedd
Merge "Use randomized MAC." into main
2024-03-08 02:41:50 +00:00
Bill Yi
775282e8b8
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Icaf86a91a2a68f5e665224fef6d4e57039ba8469
2024-03-07 17:41:42 -08:00
Jacky Wang
4f283acb60
Merge changes from topic "datastore-file" into main
...
* changes:
[DataStore] Support backup data state computation
[DataStore] Support backup data with compression
[DataStore] Migrate LocaleNotification SharedPreferences to BackupRestoreStorage
2024-03-07 23:28:22 +00:00
Nino Jagar
65eb00f0f3
Integrate admin controls for content protection
...
Bug: 323038631
Test: End-to-end with TestDPC, new units
Change-Id: I98d52fdd95fca023b8eb576c97d563a1f3cab464
2024-03-07 22:56:09 +00:00
Sudheer Shanka
34bd0481df
Merge "Remove the developer option to control Quarantine app state." into main
2024-03-07 19:39:55 +00:00
Liahav Eitan
0f37c7463b
Fix Settings profile selector on HSUM
...
Currently Settings ProfileSelectorFragment uses isSystem() to identify
the personal user. This change migrates it to use isMain() in line with
HSUM architecture.
Test: atest SettingsRoboTests:com.android.settings.dashboard.profileselector.ProfileSelectFragmentTest
Fixes: 327610266, 327600527, 327585940, 326574736
Change-Id: I064b2fb295b89cffcd556e151fe1bf4484caf384
2024-03-07 14:41:07 +00:00
Chaohui Wang
4b0090700a
Merge "Migrate the "Use this SIM" preference" into main
2024-03-07 12:43:52 +00:00
Graciela Wissen Putri
aed31bb8bd
Follow config overlay's order of aspect ratio options am: a0f573a35e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26456385
Change-Id: I30ff221caba3be36834acb44958cf2aed30c17d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-03-07 12:11:14 +00:00
Automerger Merge Worker
61c27c753b
Merge changes from topic "am-c5c0d77045e4406d92e32b2ac9b4a94d" into main
...
* changes:
[automerger skipped] Merge "Merge Android 14 QPR2 to AOSP main" into main am: 12e4524868
-s ours am: fe3023d496
-s ours
[automerger skipped] Merge Android 14 QPR2 to AOSP main am: a80653d111
-s ours am: ac425a05cb
-s ours
2024-03-07 10:56:58 +00:00
Xin Li
ce57d7c3c0
[automerger skipped] Merge "Merge Android 14 QPR2 to AOSP main" into main am: 12e4524868
-s ours am: fe3023d496
-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: Id494c4c38bd7bd1689e706944de8580d9f8ae0e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-03-07 10:49:18 +00:00
Olivier Nshimiye
b816437d39
Merge changes from topic "add-ps-features-flag" into main
...
* changes:
Add Private Space features flag check to Settings tests
Add an additional flag guard for Private Space implementation
2024-03-07 10:48:58 +00:00
Xin Li
a3333c52c1
[automerger skipped] Merge Android 14 QPR2 to AOSP main am: a80653d111
-s ours am: ac425a05cb
-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: Ib3203c55a0f7e17983e3253e56c36a163ccbe534
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-03-07 10:46:21 +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
Chaohui Wang
186629aad4
Migrate the "Use this SIM" preference
...
This will fix the toggle flicker issue.
Fix: 262179656
Test: manual - on Mobile Settings
Test: unit test
Change-Id: Ided2445034a83a8efc11dc97bab8719686d63712
2024-03-07 17:48:09 +08:00
Charlotte Lu
03aca80e78
Use randomized MAC.
...
Test: Visual Test
Fix: 328554771
Change-Id: Ic1b8082f11d07b1840126374944368830a25c3f9
2024-03-07 16:33:27 +08:00
Chaohui Wang
74fe516e09
Fix flicker of "App data usage"
...
Use placeholder to hold the place.
Fix: 323466366
Test: manual - on Mobile Settings
Test: unit test
Change-Id: I3c4d9ff6538a79500318869f01f4b88b55bd9475
2024-03-07 15:20:01 +08:00
Xin Li
12e4524868
Merge "Merge Android 14 QPR2 to AOSP main" into main
2024-03-07 06:41:13 +00:00
Chaohui Wang
c038d58bef
Merge "Sort the selectable subscription by id" into main
2024-03-07 06:40:34 +00:00
SongFerng Wang
eb80786be3
Merge "Add the mechanism of enable DSDS" into main
2024-03-07 04:33:37 +00:00
Wilson Wu
4406de67e0
Merge "Add fixed amplitude check for keyboard vibration" into main
2024-03-07 04:30:36 +00:00
Chaohui Wang
ad611366df
Sort the selectable subscription by id
...
To make sure users always see a fixed order.
Bug: 318310357
Test: manual - on SIMs and turn on / off SIM
Change-Id: I2910d83f5b1d04287afca0e3ba91dedbeb588c14
2024-03-07 11:23:25 +08:00