Alexander Milantev
179d3d41aa
Merge "Enabled Settings Core activity embedding for Assistant" into udc-dev am: cb227a79a2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22071823
Change-Id: Idc79a3e928daefc8ae86b4097cad51b4819cc27f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-23 18:46:51 +00:00
Josh Hou
1e73fa1555
[automerger skipped] Merge "[Panlingual] Can't set per-app languages for apps on work profile page" into tm-qpr-dev am: d06d826549 am: 3a03857139 -s ours am: b3ed786e76 -s ours
...
am skip reason: Merged-In I4405b3b7e832b71b9ef66fa71d9e42ce12da167c with SHA-1 38df174bba is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22173333
Change-Id: Ia8f99fff9e746e269e0f59e43762bc017ce04326
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-23 18:46:41 +00:00
Tom Hsu
b31390c086
Merge "Remove Numbering System preference if no corresponding locale." into udc-dev am: db94f350cb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22122897
Change-Id: I4f93cea7045a6b4a1c5a074a5e384b50e5244b90
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-23 18:46:29 +00:00
TreeHugger Robot
c9ff8dcdc8
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 419d424c0b -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22203642
Change-Id: Ib3d9109379920fc40d70599e9c2c5a8a0944dd39
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-23 17:59:30 +00:00
Bill Yi
ab4978ac8b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4bf6f099aa -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22203642
Change-Id: I74d8f523e73ebbadef5b94284ebc0039ee6e9ae7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-23 17:57:57 +00:00
TreeHugger Robot
4c3acacbd4
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: b7c595c4de -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22203762
Change-Id: I9eccc7ca136a58cee15f339fe0a6eff6489d0354
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-23 17:19:41 +00:00
Bill Yi
7758e6fb7d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b11c37e6f6 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22203762
Change-Id: Ie45c1ccbd062a89d1d28d3a24fbeaa0020236247
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-23 17:19:22 +00:00
Jason Hsu
ebfe97df5e
Merge "Extract duplicate part for hearing audio routing into SettingsLib" into udc-dev am: 0ef1b05630
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21809666
Change-Id: Idf0816d94ebcbd5d611f8b0d28c5627d21cfd9f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-23 16:44:02 +00:00
Etan Cohen
933b105924
Merge "Force MAC randomization to enabled on ACTION_WIFI_ADD_NETWORKS" into udc-dev am: a7e606e406
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22156122
Change-Id: I6ca20839cc97dbf787251873df3f7ef9630b8dbe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-23 16:43:19 +00:00
Zoey Chen
719d849e8e
Merge "[Settings] The receiver should be registered with all clients instead of the client which init the repository" into udc-dev am: 4940c2978a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22198542
Change-Id: I7b3ca5955457d2f6f5c2b91bfe1357d8ca2e8805
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-23 16:43:05 +00:00
TreeHugger Robot
621571b461
Merge "Fixes AOSP crash when WPP isn't installed." into udc-dev am: 010ef319c8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22187500
Change-Id: I3af5044cd8488e1621450c2729a9dfb7049a4c9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-23 16:42:55 +00:00
TreeHugger Robot
705ba0f77e
Merge "Show package name if no label" into udc-dev am: 9848eb9053
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22163925
Change-Id: I850e3dab8560aad409dff27f27597ba4a4bd0930
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-23 16:42:41 +00:00
Jason Hsu
c78bd74413
Merge "Correct the char limit for strings" into udc-dev am: 72237b55f8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22200384
Change-Id: I29d4e6a649d2e70af17003bac9878f9a728f9114
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-23 16:42:00 +00:00
Wu Ahan
da385a3a1e
Merge "Use GlifLayout#setDescriptionText in SetupChooseLockGenericFragment" into tm-qpr-dev am: 3a2ef6db2f am: 0067e9581b am: 2034c0c395
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22099962
Change-Id: Ieb89d930c15214f55312c53b16c70315dff351a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-23 14:58:03 +00:00
Alexander Milantev
cb227a79a2
Merge "Enabled Settings Core activity embedding for Assistant" into udc-dev
2023-03-23 10:44:28 +00:00
Josh Hou
b3ed786e76
[automerger skipped] Merge "[Panlingual] Can't set per-app languages for apps on work profile page" into tm-qpr-dev am: d06d826549 am: 3a03857139 -s ours
...
am skip reason: Merged-In I4405b3b7e832b71b9ef66fa71d9e42ce12da167c with SHA-1 38df174bba is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22173333
Change-Id: Ia690fd66cd5a944cc20b8523be6e3ac2f3cb03f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-23 07:07:16 +00:00
Tom Hsu
db94f350cb
Merge "Remove Numbering System preference if no corresponding locale." into udc-dev
2023-03-23 06:41:37 +00:00
Josh Hou
3a03857139
Merge "[Panlingual] Can't set per-app languages for apps on work profile page" into tm-qpr-dev am: d06d826549
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22173333
Change-Id: I3d91cd2c803357778718e7d70350aa73c4cec675
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-23 06:28:32 +00:00
TreeHugger Robot
419d424c0b
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev
2023-03-23 05:41:57 +00:00
Josh Hou
d06d826549
Merge "[Panlingual] Can't set per-app languages for apps on work profile page" into tm-qpr-dev
2023-03-23 05:39:19 +00:00
TreeHugger Robot
b7c595c4de
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev
2023-03-23 05:37:26 +00:00
Jason Hsu
0ef1b05630
Merge "Extract duplicate part for hearing audio routing into SettingsLib" into udc-dev
2023-03-23 05:18:56 +00:00
Etan Cohen
a7e606e406
Merge "Force MAC randomization to enabled on ACTION_WIFI_ADD_NETWORKS" into udc-dev
2023-03-23 04:24:41 +00:00
Zoey Chen
4940c2978a
Merge "[Settings] The receiver should be registered with all clients instead of the client which init the repository" into udc-dev
2023-03-23 01:24:24 +00:00
TreeHugger Robot
010ef319c8
Merge "Fixes AOSP crash when WPP isn't installed." into udc-dev
2023-03-23 00:53:08 +00:00
TreeHugger Robot
9848eb9053
Merge "Show package name if no label" into udc-dev
2023-03-22 22:10:11 +00:00
Becca Hughes
0b5eb7691b
Show package name if no label
...
Test: make
Bug: 273753519
Merged-In: I78b47e8c55382ceef90329547231124db2ca27d9
Change-Id: I78b47e8c55382ceef90329547231124db2ca27d9
2023-03-22 20:23:41 +00:00
Alejandro Nijamkin
20e244a964
Fixes AOSP crash when WPP isn't installed.
...
If there is no installed application with the ability to start an
activity with the SET_WALLPAPER action, we no longer show the
"Shortcuts" entry under the "Display > Lock screen" settings page.
Flag: CUSTOMIZABLE_LOCK_SCREEN_QUICK_AFFORDANCES
Fix: 274075866
Test: expanded unit test
Test: manually verified that, if Intent.resolveActivity returns false,
the shortcuts item isn't present in settings.
Change-Id: I919427d1e71a88a520c762307029a53065a68f46
2023-03-22 13:22:43 -07:00
Bill Yi
b11c37e6f6
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I8d632ac17ae813042eeaa5b8a80270127c40b295
2023-03-22 12:28:35 -07:00
Bill Yi
4bf6f099aa
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I72cf106bca67ce25cc517ac76700e5262e8764dd
2023-03-22 12:25:27 -07:00
tom hsu
881e8ac556
Remove Numbering System preference if no corresponding locale.
...
- If locale has no multiple numbering systems, it shall not
show the locale on list.
- If there is no locale with numberung system, remove the entry of
numbering system preference on UI.
Bug: b/274053189
Test: atest passed
Test: Manual test passed
Change-Id: If61c7e233630644e2d6245c5efd75d15d52cf94b
2023-03-23 01:44:46 +08:00
Jason Hsu
72237b55f8
Merge "Correct the char limit for strings" into udc-dev
2023-03-22 17:32:55 +00:00
jasonwshsu
e621a54f0a
Correct the char limit for strings
...
* string: bluetooth_system_sounds_title is too long to fit in one line.
Should allow more char limit to two lines.
Bug: 270086620
Test: flash rom and check UI
Change-Id: I8b0c8ca37fc3b7447da3dba3bca66673b4d05f7a
2023-03-23 01:25:19 +08:00
Zoey Chen
5c4d79154e
[Settings] The receiver should be registered with all clients instead of
...
the client which init the repository
Bug: 274748033
Test: local test
Change-Id: I9981d39f5407f02684585354d1fc0de0bd8b0873
2023-03-22 16:36:59 +00:00
Alexander Milantev
c413b3e8e0
Enabled Settings Core activity embedding for Assistant
...
Test: manual
Bug: 271260497
Change-Id: Ia5c308a45f4b0bde902c22da5352510413fbf018
2023-03-22 14:40:46 +00:00
Wu Ahan
2034c0c395
Merge "Use GlifLayout#setDescriptionText in SetupChooseLockGenericFragment" into tm-qpr-dev am: 3a2ef6db2f am: 0067e9581b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22099962
Change-Id: I19a4ecd726bf1e6b059909fcb274f2d2cc080fb7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-22 14:02:36 +00:00
Wu Ahan
0067e9581b
Merge "Use GlifLayout#setDescriptionText in SetupChooseLockGenericFragment" into tm-qpr-dev am: 3a2ef6db2f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22099962
Change-Id: Ibe03950c9d6e02ebd641e93df2cb5cb646dbfb35
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-22 13:44:52 +00:00
TreeHugger Robot
c2b7bce383
Merge "Fix icons of DND timelapse/event schedule types in Dark Mode" into udc-dev am: a311ae81fc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22166492
Change-Id: Ic249607574653f392927f02024d01544897a6bfd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-22 12:26:46 +00:00
TreeHugger Robot
a311ae81fc
Merge "Fix icons of DND timelapse/event schedule types in Dark Mode" into udc-dev
2023-03-22 11:40:57 +00:00
Josh Hou
f8a3717611
Merge "[Panlingual] Can't set per-app languages for apps on work profile page" into udc-dev am: b1f9d26174
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22173332
Change-Id: I2fbe71e8fec2e2c12ec5086c65ccf730af6b6703
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-22 05:58:21 +00:00
Josh Hou
b1f9d26174
Merge "[Panlingual] Can't set per-app languages for apps on work profile page" into udc-dev
2023-03-22 05:14:47 +00:00
Wu Ahan
3a2ef6db2f
Merge "Use GlifLayout#setDescriptionText in SetupChooseLockGenericFragment" into tm-qpr-dev
2023-03-22 03:46:30 +00:00
Milton Wu
6ba09ff33f
Merge "Launch Face Settings when device enrolled face" into tm-qpr-dev am: 1d68fbf007 am: 544feb9013 am: cdaf1091d1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21294281
Change-Id: I6964b421ee874bf8821205cf3915f7cd12f2eb11
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-22 02:11:53 +00:00
Milton Wu
cdaf1091d1
Merge "Launch Face Settings when device enrolled face" into tm-qpr-dev am: 1d68fbf007 am: 544feb9013
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21294281
Change-Id: I748aafeb257bfc6325f5e3a0ef724dbd0e36d697
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-22 01:33:58 +00:00
Milton Wu
544feb9013
Merge "Launch Face Settings when device enrolled face" into tm-qpr-dev am: 1d68fbf007
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21294281
Change-Id: I1a80e569626469eaca583007ee94fb77bf36f03a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-22 00:57:38 +00:00
Milton Wu
1d68fbf007
Merge "Launch Face Settings when device enrolled face" into tm-qpr-dev
2023-03-22 00:26:50 +00:00
lbill
c7dd729a43
Launch Face Settings when device enrolled face
...
In legacy flow FaceEnrollIntroduction check maxFacesEnrolled()
then update introduction description and prevent user go to next
enroll step, the CUJ was not good to user, instead bring user
to Face Settings and let user decide the next action(Delete face or
change config) is more make sense.
As any applications could broadcast intent(android.settings.FACE_ENROLL)
to bring FaceEnrollIntroduction up, we add a check in onCreate() and check
if device has been enrolled max face, launch FaceSettingsInternalActivity.
In addition, skip to register any posture change callback when
maxFacesEnrolled() during activity onStart().
Test: atest SettingsGoogleUnitTests
Test: m -j SettingsGoogleRoboTests RunSettingsGoogleRoboTests
Test: m RunSettingsRoboTests ROBOTEST_FILTER= \
"FaceEnrollIntroductionTest"
Test: m RunSettingsRoboTests ROBOTEST_FILTER= \
"FingerprintEnrollIntroductionTest"
Test: Manual enrolled face, unfold device, launch Tips Security page
and click "Set up Face Unlock", device launch Face Settings insteand of
posture guidance page.
Bug: 263830403
Change-Id: Ied8b92259810f954ce6b2daaa9b87fc996ad752a
2023-03-21 19:10:57 +00:00
Sally Yuen
f464edf6dc
Merge "Update Extra dim banner for tablets" into tm-qpr-dev am: 6d6736c1c9 am: 1795481a72 am: 40019f876b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22076421
Change-Id: I54c8118e05f1c17662bac7eb5260aaa544b3b7f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-21 19:04:37 +00:00
Sally Yuen
40019f876b
Merge "Update Extra dim banner for tablets" into tm-qpr-dev am: 6d6736c1c9 am: 1795481a72
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22076421
Change-Id: Ib68b4ee9ecbd90f565eb57ceed0e8d2eb445864a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-21 18:24:43 +00:00
Sally Yuen
1795481a72
Merge "Update Extra dim banner for tablets" into tm-qpr-dev am: 6d6736c1c9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22076421
Change-Id: I781c0e19683127e794d63949979b1b5a2eb2ff4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-21 17:46:07 +00:00