PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
120,559 Commits 1 Branch 0 Tags
080e4b02c7befbc0607524ecc755157c384e2bc6
Commit Graph

120559 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
97675e3475 Merge changes from topic "tc_change_23022120_22" into udc-dev 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 08d0cbb652
  Import translations. DO NOT MERGE ANYWHERE
 2023-02-22 20:15:45 +00:00
Henri Chataing
fd0203ee28 [automerger skipped] Merge changes from topic "nfc_logging_control" am: 4de9ff1a8f am: 4886f28aba am: 6a7031515e -s ours 
am skip reason: Merged-In Id12e3c10dc04816d4a69692b2d922840a8e84c61 with SHA-1 bcf2efe31e is already in history

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

Change-Id: I948a11f2df4444b9d64fed97fb661ea35f33e3ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-22 19:36:01 +00:00
Jack Yu
8b0fa20c98 [automerger skipped] Show reboot dialog when users disable developer options am: d91e7a0565 am: e1dfe3d417 am: 252dd209b3 -s ours 
am skip reason: Merged-In I531c85fd77934ad7821c480df07465a8cd8f24f9 with SHA-1 d270f29cc8 is already in history

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

Change-Id: Ie49b1ae7183f6a432fae4f2eee8bd70cf338113b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-22 19:35:58 +00:00
Jack Yu
3c0d7c9bfb [automerger skipped] Add a new NFC developer setting option for NFC vendor verbose log am: 8f1794043c am: 0797feaf7b am: 86a6c6a9a7 -s ours 
am skip reason: Merged-In Ic837bbcc32979c44732e99d51e4dcf93eb201cf1 with SHA-1 3d2aff896e is already in history

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

Change-Id: Ie6c1e6ab59c24778de5c503281b991658c7acd9a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-22 19:35:53 +00:00
Jack Yu
bac3cfcbfe [automerger skipped] Add a new NFC developer setting option for NFCSNOOP am: a2f8944942 am: 81f481fac4 am: 08c64a4414 -s ours 
am skip reason: Merged-In I3fd34500e5e7093c9d77ff737987a35f6866814e with SHA-1 b71de640b5 is already in history

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

Change-Id: Ide65bf95812fe09989230b73301c8007d652518f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-22 19:35:45 +00:00
Henri Chataing
6a7031515e Merge changes from topic "nfc_logging_control" am: 4de9ff1a8f am: 4886f28aba 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2332205

Change-Id: I938ce76f23b82ffc4f4b0f95364120dadc7cdb00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-22 19:16:49 +00:00
Jack Yu
252dd209b3 Show reboot dialog when users disable developer options am: d91e7a0565 am: e1dfe3d417 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2332204

Change-Id: I7225161683a0b68b6eebf188ec99f39e57a33851
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-22 19:16:48 +00:00
Jack Yu
86a6c6a9a7 Add a new NFC developer setting option for NFC vendor verbose log am: 8f1794043c am: 0797feaf7b 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2332203

Change-Id: Id9fd40284b018c8cc3424d6a77c6f6f7bf43da2e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-22 19:16:45 +00:00
Jack Yu
08c64a4414 Add a new NFC developer setting option for NFCSNOOP am: a2f8944942 am: 81f481fac4 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2332202

Change-Id: I28561bde03b8dd3cbf2394ea5c851b15b584da49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-22 19:15:02 +00:00
Automerger Merge Worker
3e158cd48b Merge "Merge "Change API name" am: a0642974a4 am: f9d1535640 am: a14b3c6be2" into udc-dev 2023-02-22 18:50:05 +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
Treehugger Robot
4767472df7 Merge "Change API name" am: a0642974a4 am: f9d1535640 am: a14b3c6be2 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2445642

Change-Id: I368b125ea1f96f6a70ce4eb0cbcf91150d865ef5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-22 18:48:37 +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
Treehugger Robot
a14b3c6be2 Merge "Change API name" am: a0642974a4 am: f9d1535640 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2445642

Change-Id: Id8b6e017f93933b3b64b66be9639b203b0fa9e93
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-22 18:37:55 +00:00
Henri Chataing
4886f28aba Merge changes from topic "nfc_logging_control" am: 4de9ff1a8f 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2332205

Change-Id: I082c6fda1b1420dd49a2507ea87e8262b341be8c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-22 18:31:00 +00:00
Jack Yu
e1dfe3d417 Show reboot dialog when users disable developer options am: d91e7a0565 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2332204

Change-Id: If1a8b237f58bcbb1c07a27b054be09a7530922f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-22 18:30:54 +00:00
Jack Yu
0797feaf7b Add a new NFC developer setting option for NFC vendor verbose log am: 8f1794043c 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2332203

Change-Id: Ic9c47d49121184737369e041048a678dda53bf52
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-22 18:30:50 +00:00
Jack Yu
81f481fac4 Add a new NFC developer setting option for NFCSNOOP am: a2f8944942 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2332202

Change-Id: Ic96878e632ec919f2486263a5cb479486b9d4c54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-22 18:30:37 +00:00
Treehugger Robot
f9d1535640 Merge "Change API name" am: a0642974a4 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2445642

Change-Id: I3a96da519c41151b57e7580b0816101590322b1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-22 18:21:01 +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
Brian Lee
ad2660c0fc Update RemoteLockscreenValidation detail strings and char limits. 
Test: Manual
Bug: 270203601
Change-Id: I3d8f707955de49f790e30314b1ff919eb474d138
 2023-02-22 09:40:24 -08:00
Henri Chataing
4de9ff1a8f Merge changes from topic "nfc_logging_control" 
* changes:
  Add test cases for NfcSnoopLog and NfcVerboseVendorLog
  Show reboot dialog when users disable developer options
  Add a new NFC developer setting option for NFC vendor verbose log
  Add a new NFC developer setting option for NFCSNOOP
 2023-02-22 17:12:46 +00:00
Treehugger Robot
a0642974a4 Merge "Change API name" 2023-02-22 16:59:10 +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
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
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
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
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