Commit Graph

120751 Commits

Author SHA1 Message Date
YK Hung
405bea531a Merge "Fix b/270296263: Updates screen system component name to "Display"" into udc-dev 2023-02-22 14:41:45 +00:00
Nikhil Kumar
c9cb8e5bcb Removed isWorkProfile_withSystemUser_returnFalse test
Only the UM.isManagedProfile property should be used to determine
whether a user is a managed prfile.
There is no need to perform any additional check on top of
UM.isManagedProfile to make sure the user is a managed profile.

After removing the additional check as part of ag/21512484
DataBaseUtilsTest.isWorkProfile_withSystemUser_returnFalse test
is redundant.

Test: atest DataBaseUtilsTest -c
Bug: 270283369
Change-Id: Ic4fd7eef2ac24786e2a59db7dabc9daf4a7ce028
2023-02-22 11:14:40 +00:00
Zaiyue Xue
7350621d40 Fix b/270290013: Updates battery usage system component icons
Bug: 270290013
Fix: 270290013
Test: manual
Change-Id: I92cda88269fdee767b00cd1b9aa78062015a5095
2023-02-22 18:23:20 +08:00
Zaiyue Xue
ca973f43cf Fix b/270296263: Updates screen system component name to "Display"
Bug: 270296263
Fix: 270296263
Test: manual
Change-Id: Iaa42c5576b856ea523dfa8fe92554a82779a62ce
2023-02-22 17:23:55 +08:00
Zaiyue Xue
cc9df56ed4 Fix b/265364509 Update battery usage page footer string
Bug: 265364509
Fix: 265364509
Test: manual
Change-Id: I1deef3157ae7c5a8425e2ae438dacebcadd25fce
2023-02-22 15:55:51 +08:00
TreeHugger Robot
3430405f5b Merge "Cleaned up the deprecated APIs" into udc-dev am: 22a620dbd4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21528007

Change-Id: I576d30b48ddd941910e00a06bcdbf1bf986ed85b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-22 07:50:40 +00:00
TreeHugger Robot
22a620dbd4 Merge "Cleaned up the deprecated APIs" into udc-dev 2023-02-22 06:45:01 +00:00
Bill Yi
2f3719e7f8 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: e21149b10a
Blank merge reason: commit message contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21517269

Change-Id: Ic023c7947c8ec8d33473fabc1d56cb78701e4f1f
2023-02-22 04:11:52 +00:00
Bill Yi
5bdc27be54 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 08d0cbb652
Blank merge reason: commit message contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21517268

Change-Id: I18ff4dda537b5743f83b6ed37e8d67a974d1b50c
2023-02-22 04:11:50 +00:00
Chris Li
af2b07b248 Update EmbeddingAspectRatio to the latest
alwaysAllow() is changed to ALWAYS_ALLOW per API Council feedback.

Bug: 270160592
Test: build
Change-Id: I44c7e97932456ec5b5bb0339ee2ee060cb6e42e0
2023-02-22 03:14:54 +00:00
Jeff DeCew
30864035cc Merge "Do not cache the bubble settings illustration" into tm-qpr-dev am: 3c5bbbdb0c am: 05c43c2edc am: da1f2578a0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21483805

Change-Id: I81627b2efe516ccc0413d7f8b773993f9f19cdce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-22 02:54:34 +00:00
Chaohui Wang
eb26875a32 Merge "Update HomePageProvider to use getSettingsPage" into udc-dev am: 6461dc3814
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21489365

Change-Id: Ice4d96f8ab8420448f53ffa7da62cbedcb3a30cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-22 02:46:01 +00:00
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