Jeff DeCew
da1f2578a0
Merge "Do not cache the bubble settings illustration" into tm-qpr-dev am: 3c5bbbdb0c
am: 05c43c2edc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21483805
Change-Id: Id8d24e0960947e53fc309d1e3f6fd776a204677b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-22 02:39:05 +00:00
Jeff DeCew
05c43c2edc
Merge "Do not cache the bubble settings illustration" into tm-qpr-dev am: 3c5bbbdb0c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21483805
Change-Id: Ie06a7625785dd3c82a50d5e3b1e24b44b54c02ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-22 01:38:58 +00:00
Chaohui Wang
6461dc3814
Merge "Update HomePageProvider to use getSettingsPage" into udc-dev
2023-02-22 01:28:43 +00:00
Bill Yi
48957d9e2b
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I5b49fa939841cbd2af7ddc54bd3bf773dd36b916
2023-02-21 17:26:14 -08:00
Bill Yi
1051b47c26
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Iaee6c70775a043a98864c0f8fb413d92048035f6
2023-02-21 17:17:02 -08:00
Bill Yi
899ab27b2f
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Id105be6dcfce31f16760f5bafd90cf697beeff68
2023-02-21 17:13:24 -08:00
Jeff DeCew
3c5bbbdb0c
Merge "Do not cache the bubble settings illustration" into tm-qpr-dev
2023-02-22 01:06:41 +00:00
TreeHugger Robot
12fbd842db
Merge "Reduce jank on DND apps page" into tm-qpr-dev am: 694742152d
am: 2ecd05add8
am: 408a4045f1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21477350
Change-Id: I35dec799c6e9077aa40884bf4950376f6834a612
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-21 23:01:54 +00:00
Jack Yu
aeb9d72bac
Cleaned up the deprecated APIs
...
Bug: 270094276
Test: Basic phone funcationality tests
Change-Id: If58b250be461aa05ec3e55390fe73142676b283d
2023-02-21 15:01:23 -08:00
Florian Mayer
0ed53b5527
[automerger skipped] Fix string annotations. am: 7450e5cf38
am: 097a76f8bf
-s ours
...
am skip reason: Merged-In I27cce80b4cfb6d570d1f4a870f3f49b788d0e3f7 with SHA-1 7450e5cf38
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21522384
Change-Id: Icfcd718f3039f71aa367f5706100e0fff8310e7f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-21 22:52:40 +00:00
Florian Mayer
097a76f8bf
Fix string annotations. am: 7450e5cf38
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21522384
Change-Id: Id9516e3d2bdc75d2eddd021a4f2601989662399a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-21 21:42:29 +00:00
TreeHugger Robot
408a4045f1
Merge "Reduce jank on DND apps page" into tm-qpr-dev am: 694742152d
am: 2ecd05add8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21477350
Change-Id: I06dc22c948192703fdf717a735ef9abc3df58496
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-21 21:32:14 +00:00
Jiaming Liu
28eed32ebc
[automerger skipped] Fix build for jetpack update am: da7f685695
-s ours am: c0e3bdd218
-s ours am: addeccd855
-s ours
...
am skip reason: Merged-In If48e7338ee560d995cb8bff7b5348ab36c457836 with SHA-1 1c0af48f8c
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21482786
Change-Id: Ic9551fe01327714578d13850888784300ccbfb34
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-21 20:02:35 +00:00
Diego Vela
b3c8e604a5
[automerger skipped] Update ActivityEmbedding usage. am: 585a7f3c7a
-s ours am: 798e242964
-s ours am: 542b1141c6
-s ours
...
am skip reason: Merged-In I8e4aa8daf51cb9c669d06b152cc5a2fc69a06571 with SHA-1 d2dfc4285e
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21482785
Change-Id: I280ed154a5c99dfa07e8a1293b0f2ba920683c07
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-21 20:02:31 +00:00
Florian Mayer
a443be3f1f
[automerger skipped] Fix string annotations. am: 7450e5cf38
-s ours
...
am skip reason: Merged-In I27cce80b4cfb6d570d1f4a870f3f49b788d0e3f7 with SHA-1 36dd04b1be
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21522384
Change-Id: I757de1e2da1dd740b3e282e2d7f417389c8255d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-21 19:52:18 +00:00
TreeHugger Robot
2ecd05add8
Merge "Reduce jank on DND apps page" into tm-qpr-dev am: 694742152d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21477350
Change-Id: I3b215c7f5c824c04837cc84f2af1c81e0702aa6c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-21 19:47:05 +00:00
Jiaming Liu
addeccd855
[automerger skipped] Fix build for jetpack update am: da7f685695
-s ours am: c0e3bdd218
-s ours
...
am skip reason: Merged-In If48e7338ee560d995cb8bff7b5348ab36c457836 with SHA-1 1c0af48f8c
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21482786
Change-Id: I18bc137f1213009023531b7d27e8a9bb4430697c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-21 19:35:55 +00:00
Diego Vela
542b1141c6
[automerger skipped] Update ActivityEmbedding usage. am: 585a7f3c7a
-s ours am: 798e242964
-s ours
...
am skip reason: Merged-In I8e4aa8daf51cb9c669d06b152cc5a2fc69a06571 with SHA-1 d2dfc4285e
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21482785
Change-Id: Iadc40ca7f31b5bbd3819fea72b9fa496d4408f26
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-21 19:35:51 +00:00
Jiaming Liu
c0e3bdd218
[automerger skipped] Fix build for jetpack update am: da7f685695
-s ours
...
am skip reason: Merged-In If48e7338ee560d995cb8bff7b5348ab36c457836 with SHA-1 1c0af48f8c
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21482786
Change-Id: I7f4db3fa4fdc97b6957c1e23938c6b85fea2c117
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-21 19:34:00 +00:00
Diego Vela
798e242964
[automerger skipped] Update ActivityEmbedding usage. am: 585a7f3c7a
-s ours
...
am skip reason: Merged-In I8e4aa8daf51cb9c669d06b152cc5a2fc69a06571 with SHA-1 d2dfc4285e
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21482785
Change-Id: Ib0c2a6ededbfc7d0c4caf4cbe85a4420d7967e50
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-21 19:33:57 +00:00
Florian Mayer
7450e5cf38
Fix string annotations.
...
The char limit was applied to the wrong string.
(cherry picked from commit 36dd04b1be
)
Bug: 270174344
Merged-In: I27cce80b4cfb6d570d1f4a870f3f49b788d0e3f7
Change-Id: I27cce80b4cfb6d570d1f4a870f3f49b788d0e3f7
2023-02-21 19:03:43 +00:00
TreeHugger Robot
694742152d
Merge "Reduce jank on DND apps page" into tm-qpr-dev
2023-02-21 18:15:25 +00:00
Eric Biggers
a31c9d506c
Merge "Stop calling LockPatternUtils.setVisiblePasswordEnabled()"
2023-02-21 17:59:21 +00:00
Nikhil Kumar
25d4014a0a
Merge "Get profile parent's context in case of work profile" into udc-dev am: 21b2671c20
am: 0fd4b8edf7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21512484
Change-Id: I6fdf5236929672fab74ab498a67c866e0dc89ce2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-21 14:38:12 +00:00
Nikhil Kumar
5bfc89e290
Merge "Get profile parent's context in case of work profile" into udc-dev am: 21b2671c20
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21512484
Change-Id: Ief8e9582ee64dfb72740854686f916629cb77b62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-21 13:27:15 +00:00
Nikhil Kumar
0fd4b8edf7
Merge "Get profile parent's context in case of work profile" into udc-dev am: 21b2671c20
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21512484
Change-Id: I6829eb15fb21775dfdec2f3abca7cd86c1d88261
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-21 13:26:42 +00:00
Nikhil Kumar
21b2671c20
Merge "Get profile parent's context in case of work profile" into udc-dev
2023-02-21 12:48:23 +00:00
Vincent Wang
d911fe6399
Fix FaceSettings UI problem am: 4e8bded71b
am: 251a8cd40d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21517331
Change-Id: I80d90a38e62824fd425700e28252ec5c5119f1e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-21 12:04:48 +00:00
Vincent Wang
1ba6a6bb87
Fix FaceSettings UI problem am: 4e8bded71b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21517331
Change-Id: Id1d70a046af077aeda765800e52b122f77acbd71
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-21 10:55:43 +00:00
Vincent Wang
251a8cd40d
Fix FaceSettings UI problem am: 4e8bded71b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21517331
Change-Id: I0ed199c30485b4c1ed8a2100640aa30d5dcdaa2b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-21 10:55:10 +00:00
Bill Yi
b68f49055e
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I6666b3bab75c42875a1bb406e695aef2813b60d1
2023-02-20 23:39:33 -08:00
Bill Yi
9e9dc0ab83
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I4ae6dcb265dd6d41036c6d4edb0ab0d1bf43bea6
2023-02-20 23:38:35 -08:00
Vincent Wang
4e8bded71b
Fix FaceSettings UI problem
...
Update the visibility of button in onStart to avoid missing check
state if Fragment & Activity were restarted
Bug: 269553342
Test: 1. enroll face
2. go to settings > Security privacy > device lock > face & fingerprint unlock
3. Eenter screen lock
4. Click face unlock > delete face model
5.re-enroll face
6.check the UI of face unlock detailed page
Change-Id: I152467afe2cc90932a53fe73b541e97b5b742831
2023-02-21 07:37:17 +00:00
Bill Yi
26e205dfb9
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ic1987daee94e5d3f6ec814ea6fd12dac465b53b4
2023-02-20 23:37:16 -08:00
Bill Yi
d222947eff
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: If6e477440d9a01b546c1531305cf82bef0aae90c
2023-02-20 23:33:59 -08:00
Bill Yi
2181b97ef8
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ic5659cc2201c7ee88caae347b5c9e8ced94c485d
2023-02-20 23:29:46 -08:00
Bill Yi
e21149b10a
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Iaa4a7fab2f08cea2f636f4c5fcc53349a4d33136
2023-02-20 23:28:30 -08:00
Bill Yi
08d0cbb652
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ic7d4931508f22b63b4d4b868b13df654d52dc365
2023-02-20 23:27:28 -08:00
Vincent Wang
c0af01a562
Merge "Refactor FingerprintEnrollEnrolling to fragment" into udc-dev am: 98d2e83c3d
am: 545be92e5d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21508164
Change-Id: I3dda5162fcb37494d887e4a40f6c86e52b2fa258
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-21 07:02:47 +00:00
tom hsu
5907b5f57f
[Regional preferences] Modify Temperature and Nubmering system title. am: 02f4727ada
am: 7424f3637b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21505314
Change-Id: I4c207b152291d9230988ef2c42bbeee6b6c29a69
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-21 07:01:28 +00:00
Weiyue Huang
552b53467e
Merge "Prevent the screen reader box from unexpected scrolling in dream setting page."
2023-02-21 06:29:50 +00:00
Weiyue Huang
edfd262be2
Prevent the screen reader box from unexpected scrolling in dream setting
...
page.
Bug: 228355186
Test: manual
Change-Id: I66a70d6b12bd3a2766e6879cb27c68a851d1dd87
2023-02-21 14:14:14 +08:00
Vincent Wang
545be92e5d
Merge "Refactor FingerprintEnrollEnrolling to fragment" into udc-dev am: 98d2e83c3d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21508164
Change-Id: I6a49438863ca9a93eb8937623432336777081292
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-21 05:52:24 +00:00
Vincent Wang
197f12d065
Merge "Refactor FingerprintEnrollEnrolling to fragment" into udc-dev am: 98d2e83c3d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21508164
Change-Id: I4f7b42e2cadbed273b94e91207d1dfa4f8b89464
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-21 05:50:55 +00:00
tom hsu
7424f3637b
[Regional preferences] Modify Temperature and Nubmering system title. am: 02f4727ada
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21505314
Change-Id: Ie4ee66ec8547804959ccf9200bf4675cae293784
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-21 05:50:48 +00:00
tom hsu
3978f7c4a7
[Regional preferences] Modify Temperature and Nubmering system title. am: 02f4727ada
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21505314
Change-Id: Ieb5338503fc29ab07d5afbe20edc9753e45614b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-21 05:50:32 +00:00
Vincent Wang
98d2e83c3d
Merge "Refactor FingerprintEnrollEnrolling to fragment" into udc-dev
2023-02-21 05:21:51 +00:00
tom hsu
02f4727ada
[Regional preferences] Modify Temperature and Nubmering system title.
...
Bug: b/265878199
Test: Manual test. See b/265878199#2
Change-Id: I5d2b6f3c6ca9552889702a9f289b37c6de9d99f8
2023-02-21 03:12:13 +00:00
Nikhil Kumar
846d1d26f4
Get profile parent's context in case of work profile
...
In the headless system user mode a non-system user can also have
a work profile.
Refactor DatabaseUtils to get the profile parent's context when
the user is a work profile.
Bug: 270039752
Test: make RunSettingsRoboTests
Change-Id: I1fb78c9d91d59d50880a1ea0dd5f83a3d11dd08f
2023-02-20 18:38:13 +00:00
TreeHugger Robot
3342ecc5b0
Merge "Move the same-name-different-product configs from res folder to res-product folder" into udc-dev am: ae2c14a039
am: 782287ad07
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21502690
Change-Id: I05e3cf609d4e0cc472fbf15c431a207e4e989321
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-20 15:28:33 +00:00