TreeHugger Robot
2359087160
Merge "Launch the correct profile for the App Info items"
2023-01-30 07:43:32 +00:00
Zaiyue Xue
59b863ea73
Fix test failure of ScreenOnTimeControllerTest
...
Bug: 265364490
Fix: 265364490
Test: presubmit
Change-Id: Ia3b371091d45a006733585370ef0cfc6d6c8a83a
2023-01-30 14:41:22 +08:00
TreeHugger Robot
f8ddd05a85
Merge "Make BiometricsViewModelFactory Java 8 compilable"
2023-01-30 04:04:56 +00:00
Chaohui Wang
27e5019790
Make BiometricsViewModelFactory Java 8 compilable
...
Bug: 260441791
Test: Make Settings
Change-Id: I4d2e80a29bb50fe49d0c19030058bf5951b80a80
2023-01-30 10:45:05 +08:00
Chengfei Tao
b5e5100f92
Adjust AlwaysExpand List so that face detail settings will show in side panel
...
while posture guidance will show full-screen
Test: Manual testing with power cycle
Bug: 263068723
Change-Id: I6d632d08dcb3597cd8470f8d3d34258e4280dc14
2023-01-30 10:17:04 +08:00
Chaohui Wang
c1726d07e5
Launch the correct profile for the App Info items
...
Use the app user handle when SubSettingLauncher launch the new page, to
make sure the new page is opened for the correct profile.
Bug: 236346018
Test: Unit test
Test: Manually with App Info Setting page
Change-Id: Idd6eb183e967b1ced10fcf46b9e74bdff3953280
2023-01-29 01:10:47 +08:00
Chaohui Wang
608a9934f7
Move product specific strings to res-product
...
Move the followings,
- security_settings_fingerprint_enroll_finish_v2_message
- security_settings_fingerprint_enroll_finish_v2_add_fingerprint_message
Product specific strings need to be put in res-product.
Bug: 250807976
Test: Make Settings
Change-Id: I6928c8d126bb91456f3b2214e85cab8b6608f532
2023-01-28 22:36:11 +08:00
Bill Yi
72a66bbf28
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: If0994989dc0ca9781b9cce2543977117050691a3
2023-01-27 14:18:04 -08:00
Treehugger Robot
1e45ac1330
Merge "Add mtv engineers to owners for emergency code reviews" am: 3272025234
am: f706f0fc0f
am: fc8edace62
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2404300
Change-Id: I96180d5b091e7274bc120864bfdb1ec31178e013
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-27 21:58:42 +00:00
Julia Reynolds
3bab3c429c
Make pre-upgrade footer appear more consistently
...
It's useful info regardless of whether the NLS is enabled
Test: PreUpgradePreferenceControllerTest
Fixes: 233963916
Change-Id: Idc6b2cebe18b119052233775bd4dcd561fd8b4fa
2023-01-27 16:49:42 -05:00
Julia Reynolds
a50c0b9636
Update icon sizing
...
Fixes: 233087471
Test: BridgedAppsPreferenceControllerTest, view 'see all apps' screen
Change-Id: I1090f2461f22bf87f20de969d1a0c5b8c2c6b7b7
2023-01-27 21:18:33 +00:00
Treehugger Robot
fc8edace62
Merge "Add mtv engineers to owners for emergency code reviews" am: 3272025234
am: f706f0fc0f
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2404300
Change-Id: I80de049254f8ae4503a137cccf466dd984873b6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-27 21:15:59 +00:00
Julia Reynolds
61f2273cb0
Standardize colors in privacy dialogs
...
Test: view a11y and NLS 'do you want to turn this on?' dialogs
Fixes: 222858822
Change-Id: I2a6ada183da71689ca6f31d57c0da711196cadd5
2023-01-27 15:33:10 -05:00
Treehugger Robot
f706f0fc0f
Merge "Add mtv engineers to owners for emergency code reviews" am: 3272025234
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2404300
Change-Id: I50416ec05b1f205986f48fa3635190ec9f48a64d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-27 20:25:55 +00:00
Florian Mayer
6a091f7598
Merge "Revert "[MTE] Move toggle to dev options""
2023-01-27 19:34:54 +00:00
Treehugger Robot
3272025234
Merge "Add mtv engineers to owners for emergency code reviews"
2023-01-27 19:21:59 +00:00
TreeHugger Robot
c54584127b
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 4591a191e1
-s ours am: e617406b8d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21121349
Change-Id: I473165263d0379243128be343727764d2a5f1ae6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-27 08:22:38 +00:00
Bill Yi
1cddc22f0a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f0104105fe
-s ours am: e1a54f8968
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21121349
Change-Id: I22f0d36ecef77f57190853ad79f615fbaee4cd1c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-27 08:22:33 +00:00
TreeHugger Robot
e617406b8d
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 4591a191e1
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21121349
Change-Id: Ieb915ee324738c57efaf2e4e61f968d555f90b68
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-27 07:51:18 +00:00
Bill Yi
e1a54f8968
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f0104105fe
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21121349
Change-Id: I6dd5ec9eb1a9c88145ec78b296e4df736edf9b33
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-27 07:51:01 +00:00
TreeHugger Robot
4591a191e1
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2023-01-27 06:57:01 +00:00
Stefan Andonian
ec6fd4c353
Merge "Move ViewCapture On/Off controls to QuickSettings Tile." into tm-qpr-dev am: d0e6bddbc5
am: 98d219cd2f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20872948
Change-Id: Icd6904a71918a0c25a49fbbc6fff4ce06d6333d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-27 05:54:58 +00:00
Yang Lu
b9862e79df
Add mtv engineers to owners for emergency code reviews
...
Change-Id: I440120397c11b8ebce617649c700b63dbca30ee8
Test: N/A
2023-01-27 05:21:25 +00:00
Stefan Andonian
98d219cd2f
Merge "Move ViewCapture On/Off controls to QuickSettings Tile." into tm-qpr-dev am: d0e6bddbc5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20872948
Change-Id: I9b0c01eee4861a1ca9e1ffb35bb54bb3e8cec473
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-27 05:10:30 +00:00
Stefan Andonian
d0e6bddbc5
Merge "Move ViewCapture On/Off controls to QuickSettings Tile." into tm-qpr-dev
2023-01-27 04:38:04 +00:00
Bill Yi
f0104105fe
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I6b9f9cd2b3f944107a5b980ae67bbca70eb1be93
2023-01-26 18:01:59 -08:00
Florian Mayer
e972d20608
Revert "[MTE] Move toggle to dev options"
...
This reverts commit c70ffd6b3b
.
Reason for revert: Let's keep this and create a new one for persistent dev toggle.
Change-Id: I4d90f04f95c149ce8a75c8fa6872736a02c8a659
2023-01-27 01:05:18 +00:00
Prabal Singh
a9231555e4
Add "for work" in work profile biometrics string
...
Bug: b/266415194
Test: manually tested
Change-Id: Ib16b2d045f4695883276749fcce6ccce60688c09
2023-01-26 17:04:22 +00:00
TreeHugger Robot
abe1e8a329
Merge "Create MoreSecurtiyPrivacyFragment"
2023-01-26 16:06:13 +00:00
Neil Fuller
85327e0ed8
Add "Use location" state to TimeZoneCapabilities
...
Add the user's "Use location" state to TimeZoneCapabilities. This
information is available anyway and saves the SettingsUI needing to call
LocationManager directly (with the small possibility it would get an
inconsistent answer).
Bug: 262407244
Test: atest tests/robotests/src/com/android/settings/datetime/
Change-Id: I49d4e41b27f9817b3189a7643c24237603e36396
2023-01-26 14:52:31 +00:00
Prabal Singh
52ba133285
Create MoreSecurtiyPrivacyFragment
...
Created a new MoreSecurityPrivacyFragment, a new
more_security_privacy_settings xml.
This more_security_privacy_settings xml is a created by merging
privacy_advanced_settings.xml and security_advanced_settings.xml and the
MoreSecurityPrivacyFragment is created by merging
PrivacyDashboardFragment and SecurityAdvancedSettings fragments.
Test: adb shell am start -a com.android.settings.security.MORE_SECURITY_PRIVACY_SETTINGS
Bug: b/261557620
Change-Id: I8729f4eaf25a31f91354383e7b6cb5e0fc7df976
2023-01-26 14:43:00 +00:00
Diya Bera
b61c468b93
[automerger skipped] Merge "Added string to encourage user to enroll more fingerprints" into tm-qpr-dev am: 9f1e35fe1a
am: 789071c86e
-s ours
...
am skip reason: Merged-In I77a6bd08a5bfb58971539bf4d366d0425ae0c9a0 with SHA-1 1c2423f36b
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21089906
Change-Id: I848b38469abd31c513775eff6ec6ffe2d0a7c841
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-26 01:58:40 +00:00
Diya Bera
789071c86e
Merge "Added string to encourage user to enroll more fingerprints" into tm-qpr-dev am: 9f1e35fe1a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21089906
Change-Id: Ie0b1bdb3ab1fe0a28362d7529431f890905507f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-26 00:55:28 +00:00
Daniel Norman
da3e632b5a
Merge "Includes AccessibilityMenu-in-System in interaction controls category."
2023-01-25 23:23:38 +00:00
Diya Bera
9f1e35fe1a
Merge "Added string to encourage user to enroll more fingerprints" into tm-qpr-dev
2023-01-25 22:16:34 +00:00
Diya Bera
561e87932d
Merge "Added string to encourage user to enroll more fingerprints"
2023-01-25 19:47:11 +00:00
Daniel Norman
590eefb55a
[automerger skipped] Merge "RESTRICT AUTOMERGE Updates Accessibilty Settings resources for sw600dp." into tm-qpr-dev am: f6e3be8352
am: 758951ae83
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21050692
Change-Id: I4592c8c18f8a8b04264fc81b019d3e7ed0793512
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-25 19:32:29 +00:00
Daniel Norman
f1c6781e46
[automerger skipped] RESTRICT AUTOMERGE Updates Accessibilty Settings resources for sw600dp. am: 383c10fe93
am: d443d32182
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21050692
Change-Id: I80864f572fb1e8b1564605cf50b8024323ded4fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-25 19:32:22 +00:00
Daniel Norman
758951ae83
Merge "RESTRICT AUTOMERGE Updates Accessibilty Settings resources for sw600dp." into tm-qpr-dev am: f6e3be8352
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21050692
Change-Id: Iee19672e20d6b8522f77a231dafee0791f2a9703
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-25 18:41:19 +00:00
Daniel Norman
d443d32182
RESTRICT AUTOMERGE Updates Accessibilty Settings resources for sw600dp. am: 383c10fe93
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21050692
Change-Id: I7b1cf7c7f5f7c69d1a5b98e0210f8bb81027a08f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-25 18:41:11 +00:00
Diya Bera
711f16ddd8
Added string to encourage user to enroll more fingerprints
...
Test: Manual - Finish enrolling a fingerprint and check the message
displayed
Bug: 265023475
Change-Id: I77a6bd08a5bfb58971539bf4d366d0425ae0c9a0
Merged-in: I77a6bd08a5bfb58971539bf4d366d0425ae0c9a0
2023-01-25 18:32:13 +00:00
Diya Bera
1c2423f36b
Added string to encourage user to enroll more fingerprints
...
Test: Manual - Finish enrolling a fingerprint and check the message
displayed
Bug: 265023475
Change-Id: I77a6bd08a5bfb58971539bf4d366d0425ae0c9a0
2023-01-25 18:04:38 +00:00
Daniel Norman
f6e3be8352
Merge "RESTRICT AUTOMERGE Updates Accessibilty Settings resources for sw600dp." into tm-qpr-dev
2023-01-25 17:44:40 +00:00
TreeHugger Robot
43eb9f8fc9
Merge "Add strings for active unlock in settings"
2023-01-25 09:29:40 +00:00
Derek Jedral
2221964344
Add strings for active unlock in settings
...
Add strings that active unlock needs to consume when surfacing itself in
combined biometrics settings.
Test: none, strings aren't consumed yet.
Bug: 266583888
Change-Id: I41e3b9c1830212303fc3379462e80cb18a23d026
2023-01-25 08:07:10 +00:00
Tyler Freeman
78d943e9d1
chore(magnification): update assets for tablets am: fe7f4fe5ad
am: bb8f8d9a59
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21053107
Change-Id: I27cbaefe4f5f204cc1037eb223c1f375ba374122
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-25 04:36:32 +00:00
Tyler Freeman
bb8f8d9a59
chore(magnification): update assets for tablets am: fe7f4fe5ad
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21053107
Change-Id: I80e9657132e0dad2b8c6550bb2273f948d8cffd8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-25 03:46:59 +00:00
TreeHugger Robot
fd4be32732
Merge "Fix b/265364490: [UX] [Battery usage] Remove comma between hour and min for screen time"
2023-01-25 03:45:12 +00:00
Treehugger Robot
d7ef82078c
Merge "Fix NullPointerException when renaming a fingerprint" am: 5f27701d95
am: 1d7192e9f6
am: 5ebb151415
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2402034
Change-Id: I3ee36a6414a03a41227c79815ef96b8b825c8a17
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-25 03:27:18 +00:00
Treehugger Robot
5ebb151415
Merge "Fix NullPointerException when renaming a fingerprint" am: 5f27701d95
am: 1d7192e9f6
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2402034
Change-Id: I8a73e24c88fcbecc35ea77ef79a253790a77f949
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-25 02:58:33 +00:00