Treehugger Robot
75e2dc4b21
Merge "Avoid disabling the Wi-Fi hotspot switch causing Talkback confusion" into main
2024-10-28 05:38:51 +00:00
Haijie Hong
37ae076618
Merge "Fix coroutine scope expired and UI animation issue" into main
2024-10-28 05:20:31 +00:00
Haijie Hong
7764a3e5af
Fix coroutine scope expired and UI animation issue
...
BUG: 375365790
BUG: 375146578
BUG: 375304695
BUG: 375544752
Test: atest BluetoothDeviceDetailsViewModelTest
Flag: com.android.settings.flags.enable_bluetooth_device_details_polish
Change-Id: Ib3bc6699f256288b6c4995b78cc25a16f1af0792
2024-10-28 03:16:26 +00:00
SongFerng Wang
10373c67c0
Merge "Modify the condition for showing DSDS dialog" into main
2024-10-28 02:59:18 +00:00
Weng Su
7557a48e2e
[Catalyst] Create airplane mode preference
...
Bug: 375925972
Flag: com.android.settings.flags.catalyst_network_provider_and_internet_screen
Test: Manual testing
atest -c AirplaneModePreferenceTest
atest -c VpnPreferenceControllerTest
Change-Id: Icf0bb9dfc1a8bda7a001f2ad3c6d6b835c489c0d
2024-10-28 03:54:30 +08:00
Weng Su
259d3a47c8
Avoid disabling the Wi-Fi hotspot switch causing Talkback confusion
...
- Use local variables to filter inappropriate callbacks when the switch is busy
Bug: 374234537
Flag: EXEMPT bugfix
Test: Manual testing
atest -c WifiTetherSwitchBarControllerTest
Change-Id: If5237230c73cae5a6230a6d3fdaa65a8511bdcd8
2024-10-28 03:31:32 +08:00
Dongzhuo Zhang
d9553708e6
Show SIM account preference in Contacts Storage Settings when default
...
account is set as SIM account.
Test: atest SettingsRoboTests:com.android.settings.applications.contacts.ContactsStorageSettingsTest
atest SettingsRoboTests:com.android.settings.applications.contacts.ContactsStoragePreferenceControllerTest
Bug: 368641291
Flag: com.android.settings.flags.enable_contacts_default_account_in_settings
Change-Id: I2f80e63a807f5a060c2ef6f05e3e413c6a689e1f
2024-10-25 22:07:28 +00:00
Robin Lee
661e081c5c
Merge "Override aspect ratio to fullscreen when unset for universal resizeable" into main
2024-10-25 18:24:36 +00:00
t
a2741a76cb
Disable factory reset in DSU mode
...
Bug: 302317901
Bug: 316578327
Test: build
Merged-In: I485eb6ac7beec0893d91ca5fe8ad88ecd96a5cbe
Change-Id: I485eb6ac7beec0893d91ca5fe8ad88ecd96a5cbe
2024-10-25 06:34:19 +00:00
t
27619dd45c
Disable factory reset in DSU mode
...
Bug: 302317901
Bug: 316578327
Test: build
Merged-In: I485eb6ac7beec0893d91ca5fe8ad88ecd96a5cbe
Change-Id: I485eb6ac7beec0893d91ca5fe8ad88ecd96a5cbe
2024-10-25 06:34:08 +00:00
t
4296cc1977
Disable factory reset in DSU mode
...
Bug: 302317901
Bug: 316578327
Test: build
Merged-In: I485eb6ac7beec0893d91ca5fe8ad88ecd96a5cbe
Change-Id: I485eb6ac7beec0893d91ca5fe8ad88ecd96a5cbe
2024-10-25 06:33:59 +00:00
David Liu
c560b73be5
Merge "Migrate Data Saver" into main
2024-10-25 03:20:09 +00:00
Dongzhuo Zhang
b95032af46
Merge "Change to use android.provider.new_default_account_api_enabled flag to control the contacts storage settings launch. Bug: 368641291 Flag: android.provider.new_default_account_api_enabled" into main
2024-10-25 03:09:09 +00:00
Jason Chiu
c7acd88a83
Merge "Make TetherSettings extend RestrictedDashboardFragment" into main
2024-10-25 01:42:53 +00:00
Diya Bera
1bad4e27c1
Identity Check API
...
Update MANDATORY_BIOMETRICS constant to IDENTITY_CHECK
Flag: android.hardware.biometrics.Flags.FLAG_IDENTITY_CHECK_API
Bug: 373424727
Test: N/A
Change-Id: I6413e3695d1e07dcc225230f8fd2d373b1879e8f
2024-10-25 01:20:22 +00:00
David Liu
d7dec0bf7f
Migrate Data Saver
...
Add the skeleton of the Data Saver
Bug: 368359883
Test: atest DataSaverScreenTest
Flag: com.android.settings.flags.catalyst_restrict_background_parent_entry
Change-Id: I008c1ff7a1ad4ff1eeb95be730680abe5666f26c
2024-10-24 22:27:56 +00:00
songferngwang
be68a15621
Modify the condition for showing DSDS dialog
...
Previous condition: there is the psim when the user enable esim
New condition: there is an active psim when the user enable esim
Bug: 362368874
Test: Test UI, atest SimOnboardingServiceTest
Flag: EXEMPT bugfix
Change-Id: I4260674794a961080b1f49e0f3d07ca9f2cf6ab6
2024-10-24 19:00:00 +00:00
Matías Hernández
a9e8225ba4
Update summary of Modes entry in Settings
...
Instead of the number of automatic modes, simply list the first (up to 3) existing modes, according to the standard sort order, when none are active.
As a consequence, the summary is never empty now.
Fixes: 374179941
Test: atest ZenModeSummaryHelperTest + manual
Flag: android.app.modes_ui
Change-Id: I04f9d90a5e1e4ed13d66181b85d77fef8c6ff256
2024-10-24 16:18:50 +02:00
Marzia Favaro
215e9c0f3b
Override aspect ratio to fullscreen when unset for universal resizeable
...
Bug: 374968702
Test: UserAspectRatioDetailsTest
Test: UserAspectRatioManagerTest
Test: manual, verify which option is selected by default after app
installation
Flag: com.android.window.flags.universal_resizable_by_default
Change-Id: I04063e4a130d42a4bfd7e548940ca5e654a6d012
2024-10-24 12:57:27 +00:00
Treehugger Robot
4e8d11bb40
Merge "Fix dialog message overlap title" into main
2024-10-24 10:11:25 +00:00
MiltonWu
1cdc17a7f6
FingerprintEnrollStageCountInteractor
...
Interactor for getting FingerprintManager::getEnrollStageCount()
Bug: b/372385781
Test: Get correct value from FingerprintManager
Flag: EXEMPT feature flag protected on override project
Change-Id: Ib31a9c4da7b0aa7e9fce0223aa8bca207c4a7a7c
2024-10-24 09:22:35 +00:00
Jason Chiu
8547d7ad96
Make TetherSettings extend RestrictedDashboardFragment
...
RestrictedSettingsFragment is deprecated and no longer supported. To be
compatible with catalyst, change the super class to
RestrictedDashboardFragment.
Bug: 368359963
Test: atest TetherSettingsTest, manual test with the user restriction
Flag: EXEMPT N/A
Change-Id: If8c5af9d716c63fd33cb508394e7d13450c9d2e7
2024-10-24 09:15:41 +00:00
tomhsu
6825f23d07
Fix dialog message overlap title
...
Flag: EXEMPT bug fix
Fix: b/326853900
Test: Manual test. see b/326853900#4
Change-Id: Id6e4e27eba5a90820d93802ff4a7c3fb1f053190
2024-10-24 09:00:34 +00:00
Howard Chen
62b7a92aef
[automerger skipped] Merge "Disable factory reset in DSU mode" into tm-qpr-dev am: 702da9e7ab
-s ours am: 04a6b4ebb3
-s ours am: 615233b698
-s ours am: 62d0dab554
-s ours
...
am skip reason: Merged-In I485eb6ac7beec0893d91ca5fe8ad88ecd96a5cbe with SHA-1 15af7d7d55
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29068594
Change-Id: I664661e625849e069a5826cec143579168340fc0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-10-24 08:17:34 +00:00
t
751591220d
[automerger skipped] Disable factory reset in DSU mode am: 0764d71e82
-s ours am: a9662d8983
-s ours am: 6dac577285
-s ours am: bbbdcd2e7e
-s ours
...
am skip reason: Merged-In I485eb6ac7beec0893d91ca5fe8ad88ecd96a5cbe with SHA-1 15af7d7d55
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29068594
Change-Id: I86d4ad0176417d8b94325c27e21cd8af3ebf60f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-10-24 08:17:30 +00:00
Howard Chen
62d0dab554
[automerger skipped] Merge "Disable factory reset in DSU mode" into tm-qpr-dev am: 702da9e7ab
-s ours am: 04a6b4ebb3
-s ours am: 615233b698
-s ours
...
am skip reason: Merged-In I485eb6ac7beec0893d91ca5fe8ad88ecd96a5cbe with SHA-1 15af7d7d55
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29068594
Change-Id: I008961ca89e99e78003756c3be1e3462d06dd272
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-10-24 08:03:24 +00:00
t
bbbdcd2e7e
[automerger skipped] Disable factory reset in DSU mode am: 0764d71e82
-s ours am: a9662d8983
-s ours am: 6dac577285
-s ours
...
am skip reason: Merged-In I485eb6ac7beec0893d91ca5fe8ad88ecd96a5cbe with SHA-1 15af7d7d55
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29068594
Change-Id: Ice4ef46cb73c0f9a113bcadfb7d72e90aff85a88
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-10-24 08:03:17 +00:00
Howard Chen
23c2dfa0d2
[automerger skipped] Merge "Disable factory reset in DSU mode" into tm-qpr-dev am: 702da9e7ab
-s ours am: 04a6b4ebb3
-s ours am: b174a163f6
-s ours
...
am skip reason: Merged-In I485eb6ac7beec0893d91ca5fe8ad88ecd96a5cbe with SHA-1 15af7d7d55
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29068594
Change-Id: Id1a37176132b25852484dbbb581a10dee0bff8b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-10-24 08:03:12 +00:00
t
97d8c8b161
[automerger skipped] Disable factory reset in DSU mode am: 0764d71e82
-s ours am: a9662d8983
-s ours am: 7e3f524667
-s ours
...
am skip reason: Merged-In I485eb6ac7beec0893d91ca5fe8ad88ecd96a5cbe with SHA-1 15af7d7d55
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29068594
Change-Id: I20eb5f617b079712f2adcc366de9af49a6af0bf7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-10-24 08:03:05 +00:00
Howard Chen
b174a163f6
[automerger skipped] Merge "Disable factory reset in DSU mode" into tm-qpr-dev am: 702da9e7ab
-s ours am: 04a6b4ebb3
-s ours
...
am skip reason: Merged-In I485eb6ac7beec0893d91ca5fe8ad88ecd96a5cbe with SHA-1 15af7d7d55
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29068594
Change-Id: I81664f03fd4dd9c03f2fe6e67c879dc9c2f08047
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-10-24 07:43:05 +00:00
t
7e3f524667
[automerger skipped] Disable factory reset in DSU mode am: 0764d71e82
-s ours am: a9662d8983
-s ours
...
am skip reason: Merged-In I485eb6ac7beec0893d91ca5fe8ad88ecd96a5cbe with SHA-1 15af7d7d55
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29068594
Change-Id: I97da7574f7c37efc80d371eb63af8f7a429bb514
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-10-24 07:43:03 +00:00
Howard Chen
615233b698
[automerger skipped] Merge "Disable factory reset in DSU mode" into tm-qpr-dev am: 702da9e7ab
-s ours am: 04a6b4ebb3
-s ours
...
am skip reason: Merged-In I485eb6ac7beec0893d91ca5fe8ad88ecd96a5cbe with SHA-1 15af7d7d55
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29068594
Change-Id: I3f43414612ee1984ee29d69624e91275d07128c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-10-24 07:42:46 +00:00
t
6dac577285
[automerger skipped] Disable factory reset in DSU mode am: 0764d71e82
-s ours am: a9662d8983
-s ours
...
am skip reason: Merged-In I485eb6ac7beec0893d91ca5fe8ad88ecd96a5cbe with SHA-1 15af7d7d55
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29068594
Change-Id: I4d4158e7958cbbda454dd86afa053b723b496949
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-10-24 07:42:43 +00:00
Howard Chen
04a6b4ebb3
[automerger skipped] Merge "Disable factory reset in DSU mode" into tm-qpr-dev am: 702da9e7ab
-s ours
...
am skip reason: Merged-In I485eb6ac7beec0893d91ca5fe8ad88ecd96a5cbe with SHA-1 15af7d7d55
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29068594
Change-Id: I7049edee91325ac9eeacc6a435f5cc895737d2ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-10-24 07:30:25 +00:00
t
a9662d8983
[automerger skipped] Disable factory reset in DSU mode am: 0764d71e82
-s ours
...
am skip reason: Merged-In I485eb6ac7beec0893d91ca5fe8ad88ecd96a5cbe with SHA-1 15af7d7d55
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29068594
Change-Id: I3250660e299902e6fef14d7933269797fe33366a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-10-24 07:30:18 +00:00
Howard Chen
64798c14ec
[automerger skipped] Merge "Disable factory reset in DSU mode" into udc-dev am: 3f7f1a7c45
-s ours am: 29c7e21bfe
-s ours am: 727fa9a5d0
-s ours
...
am skip reason: Merged-In I485eb6ac7beec0893d91ca5fe8ad88ecd96a5cbe with SHA-1 d45a07894b
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29110303
Change-Id: Ib52cbfeae70ae864c350e48a7ab2a6002a0a9dbc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-10-24 07:23:31 +00:00
t
72322bef90
[automerger skipped] Disable factory reset in DSU mode am: 15af7d7d55
-s ours am: 7c1a58f697
-s ours am: 3785300025
-s ours
...
am skip reason: Merged-In I485eb6ac7beec0893d91ca5fe8ad88ecd96a5cbe with SHA-1 d45a07894b
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29110303
Change-Id: If74da16bf2b37899d370e67a302a8df98d3f08fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-10-24 07:23:26 +00:00
Howard Chen
702da9e7ab
Merge "Disable factory reset in DSU mode" into tm-qpr-dev
2024-10-24 07:08:03 +00:00
Jacky Wang
825cc7e5ed
Merge changes from topic "catalyst" into main
...
* changes:
[Catalyst] Migrate "Dark theme" settings
Refactor DarkModePreference for catalyst
2024-10-24 07:06:27 +00:00
Howard Chen
727fa9a5d0
[automerger skipped] Merge "Disable factory reset in DSU mode" into udc-dev am: 3f7f1a7c45
-s ours am: 29c7e21bfe
-s ours
...
am skip reason: Merged-In I485eb6ac7beec0893d91ca5fe8ad88ecd96a5cbe with SHA-1 d45a07894b
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29110303
Change-Id: I8385fdcee5afc3992039b8be0f1954214670177a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-10-24 07:01:55 +00:00
t
3785300025
[automerger skipped] Disable factory reset in DSU mode am: 15af7d7d55
-s ours am: 7c1a58f697
-s ours
...
am skip reason: Merged-In I485eb6ac7beec0893d91ca5fe8ad88ecd96a5cbe with SHA-1 d45a07894b
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29110303
Change-Id: Ic990bd00b177eb2d332d4484de593bad99e902e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-10-24 07:01:51 +00:00
Howard Chen
ac2e0cf4b2
[automerger skipped] Merge "Disable factory reset in DSU mode" into udc-dev am: 3f7f1a7c45
-s ours am: 7d49b3bc98
-s ours
...
am skip reason: Merged-In I485eb6ac7beec0893d91ca5fe8ad88ecd96a5cbe with SHA-1 d45a07894b
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29110303
Change-Id: I5e119a17e4f917eff4dfeddcbb774a3dbf17674d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-10-24 07:01:43 +00:00
t
85d208cfc1
[automerger skipped] Disable factory reset in DSU mode am: 15af7d7d55
-s ours am: 228792b4a7
-s ours
...
am skip reason: Merged-In I485eb6ac7beec0893d91ca5fe8ad88ecd96a5cbe with SHA-1 d45a07894b
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29110303
Change-Id: I6f70e9ef87dc327df7ab704c2c3467a7dcc31fe0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-10-24 07:01:39 +00:00
Howard Chen
12836e048f
[automerger skipped] Merge "Disable factory reset in DSU mode" into udc-qpr-dev am: 821212db7f
-s ours
...
am skip reason: Merged-In I485eb6ac7beec0893d91ca5fe8ad88ecd96a5cbe with SHA-1 d45a07894b
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29110304
Change-Id: I08bc91b06714c31905619918926f641dc78b4bb1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-10-24 06:44:29 +00:00
t
fe8f894e26
[automerger skipped] Disable factory reset in DSU mode am: 76260a7884
-s ours
...
am skip reason: Merged-In I485eb6ac7beec0893d91ca5fe8ad88ecd96a5cbe with SHA-1 d45a07894b
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29110304
Change-Id: Id5da64f257d5122ef2a8b0f31d5d621af3ead094
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-10-24 06:44:26 +00:00
Howard Chen
7d49b3bc98
[automerger skipped] Merge "Disable factory reset in DSU mode" into udc-dev am: 3f7f1a7c45
-s ours
...
am skip reason: Merged-In I485eb6ac7beec0893d91ca5fe8ad88ecd96a5cbe with SHA-1 d45a07894b
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29110303
Change-Id: I6b7e0642b2df335326dc1ca26c4650303cd3c062
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-10-24 06:44:18 +00:00
t
228792b4a7
[automerger skipped] Disable factory reset in DSU mode am: 15af7d7d55
-s ours
...
am skip reason: Merged-In I485eb6ac7beec0893d91ca5fe8ad88ecd96a5cbe with SHA-1 d45a07894b
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29110303
Change-Id: I0dcd73da914cc3ed94fcd657f96047ec173a1510
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-10-24 06:44:15 +00:00
Howard Chen
29c7e21bfe
[automerger skipped] Merge "Disable factory reset in DSU mode" into udc-dev am: 3f7f1a7c45
-s ours
...
am skip reason: Merged-In I485eb6ac7beec0893d91ca5fe8ad88ecd96a5cbe with SHA-1 d45a07894b
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29110303
Change-Id: Ie34b8bf22e63f9f8a8ab38e49612d6c3ac8cf314
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-10-24 06:44:11 +00:00
t
7c1a58f697
[automerger skipped] Disable factory reset in DSU mode am: 15af7d7d55
-s ours
...
am skip reason: Merged-In I485eb6ac7beec0893d91ca5fe8ad88ecd96a5cbe with SHA-1 d45a07894b
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29110303
Change-Id: I8b8b21b6282ed4b08d892dea33fe2e6a181468c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-10-24 06:44:00 +00:00
Howard Chen
821212db7f
Merge "Disable factory reset in DSU mode" into udc-qpr-dev
2024-10-24 06:24:43 +00:00