Treehugger Robot
2d84c6354b
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod am: 7102c78fcb
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26166251
Change-Id: I08ab13501cb9f18e1d04e5086297d50809e00f3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-02-09 00:41:12 +00:00
Bill Yi
c71365c83b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3ca22c2264
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26166251
Change-Id: I9637856a21900d133d870df877030065a1ede21d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-02-09 00:40:58 +00:00
Treehugger Robot
7102c78fcb
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod
2024-02-09 00:29:44 +00:00
Treehugger Robot
8fbe7d0999
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 09a89e2771
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26167193
Change-Id: I059410533357526bc719967d31260dbe00e13697
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-02-08 23:00:47 +00:00
Bill Yi
b562459996
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a11618f1e5
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26167193
Change-Id: Ie81aed76e26175fcb69cbe6484262f688f9ddb03
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-02-08 23:00:36 +00:00
Treehugger Robot
4db9f309ba
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 1dc33e2d40
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26167192
Change-Id: I93ac1473ec66be11969cd475107f5d9742395920
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-02-08 23:00:28 +00:00
Bill Yi
0aa9f5a3b3
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e3372c4cda
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26167192
Change-Id: I8b40b18aa5c3ab876b3e5c29f555a3f4e1727d1d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-02-08 23:00:22 +00:00
Bill Yi
521eb76c79
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4d6d1f66d3
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26166814
Change-Id: I116a500f2a346104947e563203a32744ddef157c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-02-08 23:00:07 +00:00
Jay Sullivan
33173589ab
Merge "[ECM] Declare MANAGE_ENHANCED_CONFIRMATION_STATES permission (Settings)" into main
2024-02-08 22:22:46 +00:00
Treehugger Robot
09a89e2771
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev
2024-02-08 22:07:13 +00:00
Treehugger Robot
1dc33e2d40
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev
2024-02-08 22:07:13 +00:00
Bill Yi
730bf706e4
Merge "Import translations. DO NOT MERGE ANYWHERE" into main
2024-02-08 20:56:31 +00:00
Bill Yi
8645d44e37
Merge "Import translations. DO NOT MERGE ANYWHERE" into main
2024-02-08 20:56:31 +00:00
Bill Yi
844f6fdccf
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e36f8bf429
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26166250
Change-Id: I135bebdfb29a5a3d6234d34cf3e8a51e859c6913
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-02-08 20:50:18 +00:00
Elliot Sisteron
c20d8d2977
Merge "Enable Safety Center & Security unit tests on presubmit." into main
2024-02-08 18:06:32 +00:00
Hyunho Shin
0516e24d34
Merge "Click the 'convert to eSIM' menu to finish the pSIM setting" into main
2024-02-08 17:27:49 +00:00
Elliot Sisteron
185542bd96
Enable Safety Center & Security unit tests on presubmit.
...
See b/323650746 and b/323649900 for issues that should’ve been caught by pre-submit.
Bug: 323649900
Bug: 323650746
Change-Id: I77d664b6fce6a3f76a4c9a6b39202f6e9d47da33
Test: atest SettingsUnitTests
2024-02-08 16:08:40 +00:00
Hyunho
2e53658089
Click the 'convert to eSIM' menu to finish the pSIM setting
...
Bug: b/319527964
Test: manual done
Change-Id: I07facccf53c5ee258f0148f64643eb6e1c3d9118
2024-02-08 13:49:20 +00:00
Manish Singh
3207f127dd
Merge "Don't surface BiometricsSafetySource for private profile" into main
2024-02-08 12:55:40 +00:00
Bill Yi
1d79d6af88
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I1b3d4a546a9cdf32e7eb0a984c7c43b66eb25698
2024-02-07 16:52:15 -08:00
Bill Yi
010e4d90b5
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Iee2eae8a9c0dedaaaef7671b6894521dc9565c68
2024-02-07 16:46:43 -08:00
Aman Gupta
3ed1950aa5
Merge "[String changes] Updating strings as per the suggestion in b/318837875." into main
2024-02-08 00:37:41 +00:00
Bill Yi
4d6d1f66d3
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I1334ce697598fabc251dd937c47036a90de7ff2a
2024-02-07 15:21:40 -08:00
Bill Yi
a11618f1e5
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I307d5a243bb3d7938ab89dc84b3446ab6ad193a4
2024-02-07 15:20:08 -08:00
Bill Yi
e3372c4cda
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I4ac92be0e614f3f9ab28ba368696d4e396920831
2024-02-07 15:18:42 -08:00
Bill Yi
3ca22c2264
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I9401863e8509fa2a2323a5d1dbe0d50bf2d949df
2024-02-07 15:17:13 -08:00
Bill Yi
e36f8bf429
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ifb619c4587cff45ae87e26d0f856424daa42708f
2024-02-07 15:15:45 -08:00
Prabir Pradhan
7db25ab210
Merge "Stylus: Introduce Show Stylus Hover Pointer Setting (2/2)" into main
2024-02-07 22:49:21 +00:00
Aman Gupta
2860559061
[String changes] Updating strings as per the suggestion in b/318837875.
...
Change-Id: I13a0fd0c46d918ca5dfba8158955c24879b01b47
Test: Manual
2024-02-07 21:36:03 +00:00
Omer Ozer
d91824db27
Disable nfc foreground tests when the role flag is disabled.
...
Bug: 315194263
Test: SettingsRoboTests:com.android.settings.nfc.NfcForegroundPreferenceControllerTest
Change-Id: I21037ac3323d4a0322c10450be0dfbb8c9d0d3a0
2024-02-07 19:04:03 +00:00
Arnab Sen
e221abaa48
Stylus: Introduce Show Stylus Hover Pointer Setting (2/2)
...
Currently, the stylus hover icon can only be shown when
config_enableStylusPointerIcon is set to true. This means that the
users do not have a choice of turning the feature on or off.
This CL introduces the capability to do the same. This CL adds the
toggle in the StylusDevicesController to be shown when stylus is
connected. The toggle is mapped to the STYLUS_POINTER_ENABLED secure
setting which InputManagerService listens to turn on and off the stylus
pointer icon.
Test: manual
Steps:
1. Change the value of config_enableStylusPointerIcon as true.
2. Build the images and flash it to a stylus supporting device.
3. After the device is booted, hover over the screen, the stylus
pointer should appear.
4. Go to Settings > Connected Devices > Stylus and tap on
"Show pointer while hovering" toggle.
5. Try hovering over the screen, check no pointer icon is shown
6. Repeat Step#4, check that stylus pointer appears.
Run
- make RunSettingsRoboTests \
ROBOTEST_FILTER=StylusDevicesControllerTest
- atest SettingsProviderTest
Change-Id: Idfff9b4307370cc510a5f94bd57777c30c96e854
2024-02-07 17:46:18 +00:00
YK Hung
ca4565083f
Merge "Add AOSP smart battery entries" into main
2024-02-07 15:23:43 +00:00
Manish Singh
7e1a9138c3
Don't surface BiometricsSafetySource for private profile
...
The biometric lock for pirvate profile is handled separately.
Bug: 286539356
Test: manual
Change-Id: Iec0a98a40f0ff0c303f450a340720782a4e37f00
2024-02-07 14:29:48 +00:00
josephpv
646ec3e3e5
Revert interim strings added for PS Hide behavior
...
With the Tile fulfillment avialable now this change reverts the interim
strings added for hide behaviour.
Also change the strings based on latest mocks.
Screenshot : go/ss/BCCEknnFyuJnzAq.png
Bug: 309950257
Test: Verified manually
Change-Id: Ia27a9a8b32883e0821531840b3644a79b2d18d17
2024-02-07 13:50:04 +00:00
Angela Wang
65dcdcbdd8
Merge "New hearing device pairing page: ignore bonded device" into main
2024-02-07 12:31:51 +00:00
Angela Wang
c9875fc836
Merge "New hearing device pairing page: check gatt status" into main
2024-02-07 12:31:37 +00:00
Matías Hernández
67484c2791
Merge "Fix cast of RestrictedSwitchPreference to SwitchPreference" into main
2024-02-07 11:00:03 +00:00
Angela Wang
4972c58783
New hearing device pairing page: ignore bonded device
...
The device might still in advertising mode even if it's bonded. We can
just ignore this kind of devices in the scanning result.
Bug: 307890347
Test: manual test
Change-Id: I782cc62edd4fec779f5f55444425b32a77f85e5e
2024-02-07 10:22:24 +00:00
Angela Wang
3ca9ef8edc
New hearing device pairing page: check gatt status
...
Checks the gatt status in `onConnectionStateChange()` and `onServiceDiscovered()` callbacks. Disconnects and removes the gatt from the `mConnectingGattList` if the gatt status is not success in these callbacks.
Bug: 307890347
Test: manual test
Change-Id: Iab09f13b2ff3d33e5c4d6a8710736307c26b17e7
2024-02-07 08:54:41 +00:00
Zoey Chen
6368895adf
Merge "[ToA] Metrics in Settings" into main
2024-02-07 08:07:13 +00:00
Wesley Wang
ffcce1e7cf
Add AOSP smart battery entries
...
- Revert "Cleanup smart battery entries (1/3)" patch only instead whole topic, updated part of codes to resolve the conflicts
This reverts commit 742e506d13
.
Reason for revert: b/315401539
Bug: 315401539
Change-Id: I75a4e4f75b624c90aae18288c77214c0238e43eb
2024-02-07 07:29:48 +00:00
Wu Ahan
3bea5fcc98
Merge "Increase test coverage for fps pause enrollment feature" into main
2024-02-07 07:28:54 +00:00
Zoey Chen
7dc497dfcc
[ToA] Metrics in Settings
...
Bug: 323462103
Test: atest TermsOfAddressNotSpecifiedControllerTest
Test: atest TermsOfAddressNeutralControllerTest
Test: atest TermsOfAddressMasculineControllerTest
Test: atest TermsOfAddressFeminineControllerTest
Change-Id: I09c3ad4c92275ba48b810b1971a4e98e54e5136d
2024-02-07 05:46:16 +00:00
SongFerng Wang
5b716c2c6b
Merge "SIM Onboarding flow completed" into main
2024-02-07 04:48:55 +00:00
Becca Hughes
407a6d2723
Merge "Update strings to match updated figma" into main
2024-02-06 23:19:43 +00:00
Becca Hughes
3aa7212b26
Merge "Fix enterprise settings bug" into main
2024-02-06 22:35:07 +00:00
Becca Hughes
47469160c8
Update strings to match updated figma
...
These three strings are updated to match
the latest figma mocks:
https://screenshot.googleplex.com/6JvDwmhKh3ANTzR
Other strings like the summary text will
be done in a follow up.
Test: on device
Bug: 322074376
Change-Id: I70b7a5317056abc669d581d11ba2b93dad2adba4
2024-02-06 10:02:43 -08:00
Wu Ahan
5e577c03e5
Increase test coverage for fps pause enrollment feature
...
Bug: 288155127
Test: atest SfpsEnrollmentFeatureImplTest
Change-Id: I1a067d78262daf4903dd7a8b8c60b582c0945719
2024-02-06 15:15:15 +00:00
songferngwang
f1ea484425
SIM Onboarding flow completed
...
- Add the setup flow for switching sim and rename and setup primary sim
items
- Add the bottom sheet and progress dialog.
Bug: 318310357
Bug: 298898436
Bug: 298891941
Test: build pass. Will upload another cl for testing
Change-Id: Ie9680f0a67afe453c1449c0f2b59e98fd627e215
2024-02-06 10:56:59 +00:00
Yiyi Shen
ac869a57ad
Merge "[Audiosharing] Avoid dialog flickering for same bt device group." into main
2024-02-06 06:26:30 +00:00