PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
117,524 Commits 1 Branch 0 Tags
66087f926612affab0f705b51e31cd059bf1c3e4
Commit Graph

117524 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
66087f9266 Merge "Import translations. DO NOT MERGE ANYWHERE" 2022-11-17 05:24:20 +00:00
Bill Yi
f6b3c7caa6 Merge "Import translations. DO NOT MERGE ANYWHERE" 2022-11-17 05:24:20 +00:00
TreeHugger Robot
be679b68a6 Merge "Clean up BatteryAppListPreferenceController" 2022-11-17 05:05:25 +00:00
Chaohui Wang
386eac8b5c Merge "Remove kotlin.RequiresOptIn" 2022-11-17 04:53:20 +00:00
Xuanang Zhao
8ad4ac66c8 Add type annoation. 
Change-Id: Idb0b5db3a2116b71ab1aaa7e55d332144ff2b8fb
 2022-11-17 11:32:42 +08:00
Zaiyue Xue
7a30768503 Clean up BatteryAppListPreferenceController 
Bug: 256123455
Bug: 258576047
Fix: 258576047
Test: presubmit
Change-Id: I8c3d05f76e7a6995fccc34b2cc60ee126bb3d350
 2022-11-17 11:28:06 +08:00
Diya Bera
f0da87dae8 Merge "Remove header "When using fingerprint unlock" for Udfps" into tm-qpr-dev am: b4a0a0563d am: 4688fd9074 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20499435

Change-Id: I6251ada6b0da4222bb676ac4e4b04db3e7b73717
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-17 01:41:02 +00:00
Diya Bera
4e8b9135c3 Merge "Device displays fingerprint enrollment after swiping back" into tm-qpr-dev am: dfe2bd2df2 am: 6c1eae8a1e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20497232

Change-Id: I2814b4cd69881415a5a4105058f00973b29a3000
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-17 01:38:36 +00:00
Diya Bera
4688fd9074 Merge "Remove header "When using fingerprint unlock" for Udfps" into tm-qpr-dev am: b4a0a0563d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20499435

Change-Id: I65f8405eda3e12b83a365bd469a3a0ce3f5c9f62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-17 01:13:18 +00:00
Diya Bera
6c1eae8a1e Merge "Device displays fingerprint enrollment after swiping back" into tm-qpr-dev am: dfe2bd2df2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20497232

Change-Id: I3a0bcd951ba560a25e257f3dbe4c9657a1e82134
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-17 01:12:56 +00:00
Diya Bera
b4a0a0563d Merge "Remove header "When using fingerprint unlock" for Udfps" into tm-qpr-dev 2022-11-17 00:59:35 +00:00
Diya Bera
dfe2bd2df2 Merge "Device displays fingerprint enrollment after swiping back" into tm-qpr-dev 2022-11-17 00:59:16 +00:00
TreeHugger Robot
f8b496dfd5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 73348a8859 -s ours am: c2e89dcdf8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id1e34d38d81be95be3d342e2282a3480371100ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-16 21:22:10 +00:00
Bill Yi
d8836981db [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ece082dcaf -s ours am: 3cccae71eb -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If5ce700d2e42658d1965f371103afdc76ba4750d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-16 21:21:58 +00:00
TreeHugger Robot
3a74727188 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 30522878e9 -s ours am: 2f21a74dc2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id9ec7fe0ed13b210757d3d5a2a5b0e0d7123638c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-16 21:17:50 +00:00
Bill Yi
f72ff535f2 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 544000b27b -s ours am: 34bf7191c0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I62d3571f7d3214d0a6e04d8e1dfd21e1b3eb3ae6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-16 21:17:33 +00:00
Diya Bera
68903de369 Remove header "When using fingerprint unlock" for Udfps 
Fixes: 257272989
Test: Manual - Open Fingerprint Settings and observe the UI
Change-Id: I98235e56a3537eff00490584c88f459ac755433f
 2022-11-16 21:08:04 +00:00
TreeHugger Robot
c2e89dcdf8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 73348a8859 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9a4bd0ddf5f03530d0341a999fa9f7c7957cc746
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-16 20:55:09 +00:00
Bill Yi
3cccae71eb [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ece082dcaf -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id36d81341d34e6d08f6a9c6da0465e7edab36b18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-16 20:54:54 +00:00
TreeHugger Robot
2f21a74dc2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 30522878e9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id1904498bdae09ab404a90553efd70d550dfe108
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-16 20:53:24 +00:00
Bill Yi
34bf7191c0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 544000b27b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I00eb32fcc48c524b76eb6e73da8cdebd2b088a83
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-16 20:52:56 +00:00
TreeHugger Robot
73348a8859 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-11-16 20:36:20 +00:00
TreeHugger Robot
30522878e9 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-11-16 20:18:50 +00:00
TreeHugger Robot
5520882e9c Merge "[Settings] Fix merge confliction" into stage-aosp-master am: 2904ea9410 am: 6dd4a1c56c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20490498

Change-Id: I93ad16c95c1e162d864b51399ce2c7c32275dc4f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-16 20:01:08 +00:00
Treehugger Robot
dd5e46746c Merge "Make p2p start searching after turning off airplane mode." am: adb5c5025a am: 425521478a am: 1b70bcbdc4 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2267183

Change-Id: I23c0fa56c122e7406229fc80bbe49fcba7160861
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-16 19:59:31 +00:00
Binyi Wu
c1b9db509b [automerger skipped] Merge "Update survey triggering mechanisms" into tm-qpr-dev am: d5d2dc4e22 am: 5b4cae3900 -s ours 
am skip reason: Merged-In Ibfbdd421c723158d8d317aa4a02d9b51f877316a with SHA-1 d43ecab8f7 is already in history

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

Change-Id: I7a4a5734004e6c65d315d82ab502ae78f5f0cb5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-16 19:58:23 +00:00
changbetty
7042d57136 [automerger skipped] RESTRICT AUTOMERGE Make bluetooth switch not discoverable via SliceDeepLinkTrampoline am: 3cc8db3c58 am: 8f412f14d2 -s ours am: f79bce9e6a -s ours am: 3da973ce0f -s ours am: 6244c65c24 -s ours am: 2857cae239 -s ours am: 3b388643b0 -s ours am: 125a6fcec9 -s ours am: 4252675ca5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie9168d8f830a2b14e37921eb627b4f0cd0dc00b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-16 19:58:10 +00:00
changbetty
3b481eca1a [automerger skipped] RESTRICT AUTOMERGE Make bluetooth switch not discoverable via SliceDeepLinkTrampoline am: fecf464fb4 -s ours am: 990c3d2a45 -s ours am: edc81984ac -s ours am: 0ddaaccbd0 -s ours am: 90b39af26d -s ours am: f8a47d0305 -s ours am: 29a32c0348 -s ours am: 8b7449cfd9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I595edb02289895187acc08573ed801abc3c07227
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-16 19:58:00 +00:00
changbetty
2477c5314b [automerger skipped] RESTRICT AUTOMERGE Make bluetooth switch not discoverable via SliceDeepLinkTrampoline am: c55c060361 am: 36b97edab0 -s ours am: 5fc32464aa -s ours am: fbaede66b4 -s ours am: 92dfbb3f46 -s ours am: dcf39bd877 -s ours am: a8fe473c7e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Icd28e31238f6efa6fce5d1e3959a2bfb80a1a056
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-16 19:57:50 +00:00
changbetty
63043e9c98 [automerger skipped] RESTRICT AUTOMERGE Make bluetooth switch not discoverable via SliceDeepLinkTrampoline am: 31fb7bd480 -s ours am: 1cb32c446d -s ours am: cc4dea7377 -s ours am: 6bf913c2cf -s ours am: e1f7628fd4 -s ours am: e1a9e4cd38 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4d7429505f315b821b50f64624d4d4183b64980c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-16 19:57:39 +00:00
changbetty
2d4301e1d2 [automerger skipped] RESTRICT AUTOMERGE Make bluetooth switch not discoverable via SliceDeepLinkTrampoline am: e644704bee -s ours am: 094c3df0b0 -s ours am: cf8be928f5 -s ours am: 114a948885 -s ours am: 3d7eb4fc44 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If573823c814eadd9671d8a1dbb1460c51e5330a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-16 19:57:31 +00:00
changbetty
46f36d0908 [automerger skipped] RESTRICT AUTOMERGE Make bluetooth switch not discoverable via SliceDeepLinkTrampoline am: cdbbd7bba4 am: dcbc894b01 am: 83beb1e088 am: e71be0dbcd -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3ee67d92239e34d62ad02a90cde90a5641627e6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-16 19:57:22 +00:00
Betty Chang
ba3405bd37 Merge "Make bluetooth switch not discoverable via SliceDeepLinkTrampoline" into tm-qpr-dev am: c8f6bba271 am: f200134fc4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20410007

Change-Id: If5d07a5a3ae099d1cb765a2fbb3069ab0ac00285
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-16 19:57:13 +00:00
Diya Bera
fa0c412104 Merge "Fixes loop in Fingerprint Enrollment" into tm-qpr-dev am: fe3305016a am: 507fae7cbc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20468119

Change-Id: Id8bba8a34b1101e828726d6c697d057db69e7fd7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-16 19:52:49 +00:00
Adam Bookatz
df48f2777d [automerger skipped] Merge "Introduce concept of DockUser" into tm-qpr-dev am: 9703f6a154 am: 632754a466 -s ours 
am skip reason: Merged-In If068aa79a770bed4abf3f7ca1859a95cd1eb4ecd with SHA-1 81e5f3730c is already in history

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

Change-Id: Iaffbe973acd90d54a819bd9002d8f333db5fff13
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-16 18:57:25 +00:00
Diya Bera
c4b95de536 Device displays fingerprint enrollment after swiping back 
Fixes: 259198369
Test: Manual - repro steps in bug
Change-Id: Ide7fa0d16daba795cfc3c63a5da351000f918a81
 2022-11-16 18:34:26 +00:00
Chaohui Wang
a6b0fe32fa Remove kotlin.RequiresOptIn 
Which is now enabled by default.

Bug: 253772249
Test: Presubmit
Change-Id: Ida4e35235c0bc0be973634988b037dec0ad829bc
 2022-11-17 00:01:37 +08:00
TreeHugger Robot
6dd4a1c56c Merge "[Settings] Fix merge confliction" into stage-aosp-master am: 2904ea9410 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20490498

Change-Id: Icd89903269969d665772c55f6edb42e7ffd7fbba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-16 14:28:36 +00:00
TreeHugger Robot
2904ea9410 Merge "[Settings] Fix merge confliction" into stage-aosp-master 2022-11-16 13:42:53 +00:00
Bill Yi
544000b27b Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I03421835110a4f99b59f5718e078f167c2b44443
 2022-11-16 05:10:21 -08:00
Bill Yi
6ca3143821 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I7236bbc1fc2cf971cac5361f6dd108fbb12e1e0a
 2022-11-16 05:07:08 -08:00
Bill Yi
ece082dcaf Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Iabd3b4c4146bec3960af589135f39a5e2fe96d03
 2022-11-16 05:04:31 -08:00
Bill Yi
87c94cc80b Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I1b4b6848dbeb3cb0698b7ca68ebdb02e799f1daf
 2022-11-16 05:03:11 -08:00
Treehugger Robot
1b70bcbdc4 Merge "Make p2p start searching after turning off airplane mode." am: adb5c5025a am: 425521478a 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2267183

Change-Id: I84c783493a82247653fdc60932a0383d0c74d61f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-16 09:40:56 +00:00
Treehugger Robot
425521478a Merge "Make p2p start searching after turning off airplane mode." am: adb5c5025a 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2267183

Change-Id: Idb18ef0319f4a36e49cc01f9d9fced1918d12096
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-16 09:08:59 +00:00
Treehugger Robot
adb5c5025a Merge "Make p2p start searching after turning off airplane mode." 2022-11-16 08:23:44 +00:00
Bonian Chen
20bcb7c5fb [Settings] Fix merge confliction 
Follow code reviewer's suggestion to further split the code.

Bug: 259333639
Test: build pass
Change-Id: I40ee5f92dbb4550fec7e9bea108c30a2e5a0f770
 2022-11-16 07:57:37 +00:00
Binyi Wu
5b4cae3900 Merge "Update survey triggering mechanisms" into tm-qpr-dev am: d5d2dc4e22 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20454690

Change-Id: I1b60ec07a8eb8efae0859051c923adb13bf07e81
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-16 07:55:53 +00:00
Binyi Wu
d5d2dc4e22 Merge "Update survey triggering mechanisms" into tm-qpr-dev 2022-11-16 07:13:53 +00:00
Arc Wang
6bd49c4f6d Merge "Fix can't access SD card from work profile" 2022-11-16 06:15:05 +00:00