George Chang
5004b19a2d
[automerger skipped] Revert "settings(dev): Remove NFC stack logging control" am: b5d57eaa58
-s ours
...
am skip reason: Merged-In I3c6026e230c7d35f04d9771442fadbf040a84b94 with SHA-1 a5bd1cf34f
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26593227
Change-Id: I03265d2076c67b8d7be8dfb1caa473a77fd545f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-03-19 05:25:20 +00:00
Ze Li
29168c0d3e
Merge "[ConnectedDevicePage] Add setup to fix testing fail." into main
2024-03-19 05:05:40 +00:00
Chun-Ku Lin
59a329cae5
Merge "Make QS shortcut type as default preferred shortcut for A11yService that associate with a TileService" into main
2024-03-18 17:20:43 +00:00
Aleksandr Lukin
23cb6eeb10
Merge "Add strings for System split" into main
2024-03-18 15:06:55 +00:00
Eran Messeri
7011cfeb8b
Merge "Auth-bound keys usability: Update strings" into main
2024-03-18 14:58:58 +00:00
Vincent Wang
1a498d030d
Merge "Show calibtation result in FingerprintSettings & EnrollEnrolling if results are available" into main
2024-03-18 14:34:24 +00:00
Allen Su
354a78e33b
Merge "Fix Locale unit test failure" into main
2024-03-18 14:11:08 +00:00
Ze Li
e1bff83335
[ConnectedDevicePage] Add setup to fix testing fail.
...
Test: manual test
Bug: 322712259
Change-Id: I770e56524ce28511b9d3f773b439d6ea419b1509
2024-03-18 19:22:41 +08:00
Bill Lin
aee3dd3fb3
Merge "Revert "Prevent full-screen face enroll on tablet"" into main
2024-03-18 10:15:22 +00:00
Chaohui Wang
905d0ff82e
Merge "Fix SubscriptionInfoListViewModelTest" into main
2024-03-18 09:23:03 +00:00
Vincent Wang
6666bb97b4
Show calibtation result in FingerprintSettings & EnrollEnrolling
...
if results are available
Bug: b/326155807
Test: Enroll multiple fingerprints and check if
calibration isn't triggered.
Change-Id: I006db64f001fb70d2bb294a15a2d3efc77e2da25
2024-03-18 09:07:46 +00:00
Allen Su
99fb1065fa
Fix Locale unit test failure
...
Bug: 301380610
Bug: 313604701
Test: atest LocalePickerActivityTest
Change-Id: Icab8eeea62c7c40c160d745afd08f71fcca5ec9c
2024-03-18 08:52:34 +00:00
Jakub Rotkiewicz
1c4d2116da
Merge "Refactor Bluetooth Codec settings to dynamic ListPreference" into main
2024-03-18 08:21:57 +00:00
Chaohui Wang
21d5f4160b
Merge "Enforce BaseUserRestriction for DISALLOW_CONFIG_SCREEN_TIMEOUT" into main
2024-03-18 05:43:44 +00:00
Chaohui Wang
95d2b19c17
Merge "Enforce BaseUserRestriction for DISALLOW_CONFIG_BRIGHTNESS" into main
2024-03-18 05:43:38 +00:00
Chaohui Wang
10f5bdabb4
Fix SubscriptionInfoListViewModelTest
...
Fix: 329160337
Test: unit test
Change-Id: I7a3d27cb53c930a56ab0f0896b545807bf4f9dc0
2024-03-18 13:43:04 +08:00
Charlotte Lu
9419d67044
Merge "Add server name title." into main
2024-03-18 05:24:45 +00:00
Chaohui Wang
be49e61d0f
Enforce BaseUserRestriction for DISALLOW_CONFIG_BRIGHTNESS
...
Fix: 329205638
Test: pm set-user-restriction --user 0 no_config_brightness 1
Change-Id: Icacf051789ea40d23cd29c16168fbeb204cf8f5b
2024-03-18 03:32:54 +00:00
Charlotte Lu
18f3d29a5c
Add server name title.
...
Test: Manual
Fix: 330084607
Change-Id: I11f2cc995d5d09d04bbfb3d95b9bf5309813e8eb
2024-03-18 11:30:59 +08:00
Chun-Ku Lin
5cdf972b50
Make QS shortcut type as default preferred shortcut for A11yService that
...
associate with a TileService
Bug: 322712028
Test: manual (Turn on the shortcut for the first time for various
feature with or without tile. Verify only the A11yService with tile
would show QS as the shortcut when directly turn on the main shortcut
toggle)
Test: atest com.android.settings.accessibility
Flag: aconfig android.view.accessibility.a11y_qs_shortcut
Change-Id: I569b417639d2db8b7eddd818a2b9037ed4be2509
2024-03-18 00:14:43 +00:00
Bill Yi
42be6f6e88
Merge "Import translations. DO NOT MERGE ANYWHERE" into main
2024-03-15 20:23:43 +00:00
Bill Yi
1732b38eda
Merge "Import translations. DO NOT MERGE ANYWHERE" into main
2024-03-15 20:23:43 +00:00
Bill Yi
e82472d6f5
Merge "Import translations. DO NOT MERGE ANYWHERE" into main
2024-03-15 20:23:43 +00:00
Treehugger Robot
71ebe0f959
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: e80fe88947
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26588535
Change-Id: I970433d9e624039d5e8757085b983429384de349
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-03-15 17:09:32 +00:00
Bill Yi
f69c8e50b3
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1bfd1f0420
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26588535
Change-Id: I08915d5d5f8c54278f2e65ab6715ebedd2a9ac20
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-03-15 17:09:28 +00:00
Treehugger Robot
58f996238b
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: ca8f823c87
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26588534
Change-Id: I11d675974eb806d88048e5adff7007317b40c0a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-03-15 17:09:23 +00:00
Bill Yi
a3a25757cd
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b999a848db
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26588534
Change-Id: I938414220cd83b91ffb9e20dcbfac1ea4e32ed0c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-03-15 17:09:09 +00:00
Manish Singh
3b4e29e68d
Merge "Return my user id" into main
2024-03-15 16:55:36 +00:00
Treehugger Robot
e80fe88947
Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev
2024-03-15 16:49:43 +00:00
Treehugger Robot
ca8f823c87
Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev
2024-03-15 16:49:43 +00:00
Bill Yi
706902fbca
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 697dfd9269
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26588532
Change-Id: I614c69886dadab01e1438f30929c11db9970cb9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-03-15 16:47:43 +00:00
Chaohui Wang
ab1cf4ccad
[automerger skipped] New countryIfOriginLabel am: 67579d564b
-s ours
...
am skip reason: Merged-In I0b8851da20face9ca444b3e6456a4a662b944b65 with SHA-1 87318b10cd
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26593648
Change-Id: I0f1d791ad7c734a2833a046f703a3a59d0c74b6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-03-15 16:21:39 +00:00
Eran Messeri
47973b88ac
Auth-bound keys usability: Update strings
...
Update the strings for the warning shown to the user when they are about
to remove their screen lock and there are authentication-bound keys
that would be invalidated.
These strings are provided by Android UXW.
Additionally, apply the new string to all types of device lock screen:
Pattern, password and unknown.
Bug: 302109605
Test: Manual, flashed a device and added different types of screen lock.
Change-Id: Ida6f5f16c5aa1671f3f2c1358160b8173a1d1407
2024-03-15 14:55:51 +00:00
Treehugger Robot
6b6aa30bdc
Merge "[i18n] Fix tests for RegionalPreference and TickButtonPreference" into main
2024-03-15 14:02:43 +00:00
Prince Donkor
5f35b28015
Merge "Toggle Home controls when user selects Home Control Panel Dream" into main
2024-03-15 13:35:08 +00:00
Bill Lin
0bcfc38307
Revert "Prevent full-screen face enroll on tablet"
...
This reverts commit 812d880ee7
.
Reason for revert: Block face enrollment b/316900124
Change-Id: I457ecb7ee8babdc3a15085a1600246b0eff4bd1d
2024-03-15 13:17:40 +00:00
Zoey Chen
22da08d8b9
Merge "[ToA] New string for title and summary" into main
2024-03-15 12:32:47 +00:00
Manish Singh
20b7cdcda8
Return my user id
...
Since the current context is the correct one, we can simply return
myUserId - just like for the managed profile.
Bug: 329784721
Test: manual
Change-Id: Ifbc13b0d87ba7b06c6d04c3442bbac0580c4cf3e
2024-03-15 12:25:51 +00:00
Allen Su
4e8b442383
Merge "[ToA] Move IO to background thread" into main
2024-03-15 10:49:58 +00:00
Zoey Chen
fe5e153a12
[i18n] Fix tests for RegionalPreference and TickButtonPreference
...
Bug: 329808623
Test: atest TermsOfAddressNotSpecifiedControllerTest
Test: atest TermsOfAddressFeminineControllerTest
Test: atest TermsOfAddressNeutralControllerTest
Test: atest TermsOfAddressMasculineControllerTest
Test: atest FirstDayOfWeekItemListControllerTest
Test: atest TemperatureUnitListControllerTest
Change-Id: I8f00e423799be75a222078247116558f3bb6b34b
2024-03-15 10:20:20 +00:00
Treehugger Robot
cef373c705
Merge "Support Private Space in battery usage." into main
2024-03-15 09:46:38 +00:00
Chaohui Wang
67579d564b
New countryIfOriginLabel
...
And display this label as fallback when Regulatory Image is missing.
Bug: 329378943
Test: manual - on SIMs
Test: unit test
Change-Id: I0b8851da20face9ca444b3e6456a4a662b944b65
Merged-In: I0b8851da20face9ca444b3e6456a4a662b944b65
2024-03-15 09:23:31 +00:00
Chaohui Wang
167f9d4166
Merge "New countryIfOriginLabel" into main
2024-03-15 08:46:14 +00:00
Zoey Chen
218402a3c3
[ToA] New string for title and summary
...
Bug: 329792136
Test: manual
Change-Id: Ibbdba4c99d4b42b0cd88a144a96779b13e2401e1
2024-03-15 08:18:35 +00:00
Joseph Vincent
f2f44f50de
Merge "Add entrypoint for Learn More in PS settings & Setup intro" into main
2024-03-15 07:39:16 +00:00
Chaohui Wang
87318b10cd
New countryIfOriginLabel
...
And display this label as fallback when Regulatory Image is missing.
Bug: 329378943
Test: manual - on SIMs
Test: unit test
Change-Id: I0b8851da20face9ca444b3e6456a4a662b944b65
2024-03-15 15:25:55 +08:00
Allen Su
bb62c74bda
[ToA] Move IO to background thread
...
Bug: 295826542
Bug: 312324895
Test: atest TermsOfAddressNotSpecifiedControllerTest, atest
TermsOfAddressNeutralControllerTest, atest
TermsOfAddressMasculineControllerTest, atest TermsOfAddressFeminineControllerTest
Change-Id: I45808815401f2caa24ffc03d634a4b2c90dfd55e
2024-03-15 07:23:34 +00:00
George Chang
b5d57eaa58
Revert "settings(dev): Remove NFC stack logging control"
...
This reverts commit a5bd1cf34f
.
Bug: 329776725
Test: manual turn on/off debug logging.
Merged-In: I3c6026e230c7d35f04d9771442fadbf040a84b94
Change-Id: Ica004bb5f22636777287acfe1226b0f6a650d4f7
2024-03-15 05:55:41 +00:00
mxyyiyi
c9e8b8a011
Support Private Space in battery usage.
...
- Use database cache for single-user single-profile
- Reload battery usage info in other cases
Bug: 299032923
Test: manual
Change-Id: I5e524a094422639eedbf6e07eda498f3f72fccae
2024-03-15 11:13:34 +08:00
Chaohui Wang
67bfb4141f
Merge "Fix simOnboardingLabelSimImpl_showItem_show3Items" into main
2024-03-15 03:08:22 +00:00