PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
120,244 Commits 1 Branch 0 Tags
34a75bf63a1ce8ac2fe5669dc83974b41ede92f9
Commit Graph

120244 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
34a75bf63a Merge changes from topic "tc_change_23022120_23" into udc-dev am: 1e410e7a11 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21517269

Change-Id: Ide8718367cf66bc5a6cb5bdfa1f3a62e5677df71
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-23 19:14:40 +00:00
Bill Yi
2ab0d2d710 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: e21149b10a am: 2f3719e7f8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I439482d032687632e6d665f8831cf00ac2d80378
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-23 19:14:21 +00:00
Diya Bera
b0fb8ebc95 Merge "Remove duplicate code" into tm-qpr-dev am: 041d00afac am: 65721576d8 am: 1da59b0eab 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21487844

Change-Id: I18341d77c718d5ad5fb04ca488bd2f284c479e6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-23 18:33:39 +00:00
Nikhil Kumar
4096329efa Merge "Removed isWorkProfile_withSystemUser_returnFalse test" into udc-dev am: 8e67abccae 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21539124

Change-Id: I69701d8d501c9207cc17c413519be2cad116cf8d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-23 18:33:17 +00:00
YK Hung
edb878db1b Merge "Fix b/270290013: Updates battery usage system component icons" into udc-dev am: 629782cc88 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21537109

Change-Id: I3298a3ce189f806219b961c8c733621417309699
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-23 17:55:20 +00:00
YK Hung
fd3b8bc1dd Merge "Fix b/265364509 Update battery usage page footer string" into udc-dev am: c74a6b4fb0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21535009

Change-Id: I7933641404c7cbeccc7d8057e66d8a9bd9cdb4f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-23 17:55:03 +00:00
YK Hung
cc207d81a3 Merge "Fix b/270296263: Updates screen system component name to "Display"" into udc-dev am: 405bea531a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21537106

Change-Id: Iedf3c9ba2fd5fbca72517d4287bf0a245ca64c67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-23 17:54:47 +00:00
TreeHugger Robot
3105ce9819 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: I819254885e6972c342d53eec9696a1fda876f98f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-23 17:54:26 +00:00
Jeff DeCew
2a269d9b76 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: I6cc344d50231606058bd7a45d18a7c50dfde8fad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-23 17:53:43 +00:00
Chaohui Wang
81aecc52a5 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: I82ecba944d71423e68fa49c52bcfe2cfce1107e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-23 17:22:33 +00:00
TreeHugger Robot
156ef43064 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: I40ea3e965313f192bb15dbc0407ae2216ea3b25c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-23 17:22:14 +00:00
Jiaming Liu
4fb46658b0 [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: I42b1ed20e4b1ca8313bf6863fd5c7ff9e6441021
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-23 17:05:22 +00:00
Diego Vela
42eb9e2878 [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: I1a8e9f27d381e25939e7bb4a1f23884b8181b771
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-23 17:05:10 +00:00
TreeHugger Robot
1e410e7a11 Merge changes from topic "tc_change_23022120_23" into udc-dev 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: e21149b10a
  Import translations. DO NOT MERGE ANYWHERE
 2023-02-22 18:49:12 +00:00
Diya Bera
1da59b0eab Merge "Remove duplicate code" into tm-qpr-dev am: 041d00afac am: 65721576d8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21487844

Change-Id: I8efe213dc674f2790130d2935ce9062546b5210f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-22 18:42:46 +00:00
Diya Bera
65721576d8 Merge "Remove duplicate code" into tm-qpr-dev am: 041d00afac 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21487844

Change-Id: If6a80674fa3d00f6d5a82110df1f2bab50693ba4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-22 18:15:52 +00:00
Nikhil Kumar
8e67abccae Merge "Removed isWorkProfile_withSystemUser_returnFalse test" into udc-dev 2023-02-22 18:03:04 +00:00
Diya Bera
041d00afac Merge "Remove duplicate code" into tm-qpr-dev 2023-02-22 16:44:06 +00:00
YK Hung
629782cc88 Merge "Fix b/270290013: Updates battery usage system component icons" into udc-dev 2023-02-22 15:06:44 +00:00
YK Hung
c74a6b4fb0 Merge "Fix b/265364509 Update battery usage page footer string" into udc-dev 2023-02-22 14:56:15 +00:00
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
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
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
Jeff DeCew
3c5bbbdb0c Merge "Do not cache the bubble settings illustration" into tm-qpr-dev 2023-02-22 01:06:41 +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
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
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
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
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
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
e21149b10a Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Iaa4a7fab2f08cea2f636f4c5fcc53349a4d33136
 2023-02-20 23:28:30 -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
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
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