PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
118,279 Commits 1 Branch 0 Tags
fd39b53f5184f1222beb18c87b6733c53e561b0c
Commit Graph

118279 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Florian Mayer
be2f4612dc Add "beta" to Advanced memory protection. 
Bug: 245624194
Bug: 258550150
Change-Id: I9f4cef4898c603bfc9c46072762c9bf0f0db5194
 2022-11-16 20:41:11 +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
Bill Yi
3bdac12470 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: cfc5674c1d 
Blank merge reason: commit message contains skip directive

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

Change-Id: Ib578a3f421221729baad33077eac94acd3a3c97f
 2022-11-16 18:23:37 +00:00
Bill Yi
da84b3e37b [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 214458021a 
Blank merge reason: commit message contains skip directive

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

Change-Id: I6c93048f65fea7876ae9a1591d6cef96280b4b4e
 2022-11-16 18:21:00 +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
Neil Fuller
0bae37ef9c Track changes in frameworks/base 
TimeZoneCapabilitiesAndConfig has a new constructor argument.

Bug: 236624675
Test: m SettingsRoboTests
Test: m RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.datetime"
Change-Id: I2b6178809ca09f280b3a22a4696b8f2575b3f703
 2022-11-16 14:22:02 +00:00
TreeHugger Robot
2904ea9410 Merge "[Settings] Fix merge confliction" into stage-aosp-master 2022-11-16 13:42:53 +00:00
Bill Yi
183818df2a Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Iead290e83b164ed3088f8cd782eb200397dd3a67
 2022-11-16 05:14:01 -08: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
Bill Yi
214458021a Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I2646026ea0e51a19263a70d62fa005c0145acfc2
 2022-11-16 05:00:57 -08:00
Bill Yi
cfc5674c1d Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I4bf6a2cf9c086e55f14d7633d0c8d5e7a3a12a52
 2022-11-16 04:58:01 -08:00
Chaohui Wang
f55f9932d9 Remove lifecycle-extensions from Settings 
Bug: 259352947
Test: Make Settings
Change-Id: Ide9749494ae89ca401120eb5ffee9c0d87043c48
 2022-11-16 18:56:05 +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
5c595b3789 [Settings] configuration for hidding SIM notification UI 
Hide SIM notification UI based on configuraion.

Bug: 240515161
Test: test cases and local testing
Merged-In: I07d9ddeb96ca590decf28126ce97fba4c1783304
Merged-In: I7a912a3393694155d29614d325796e08598985bf
Merged-In: I0a7e0e9826a301f2aa0ca34f40b5570f0e384b4f
Change-Id: I1b88f0f70f1b7487163849abfce93dbbc35c9ff9
 2022-11-16 08:09:37 +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
Pasty Chang
1d4e011f41 Migrate ambiguous getId method into getLink 
The method name getId in setup library LinkSpane would be changed to the name getLink, so migrate the app that is used to getId to getLink.

Bug: 256095678
Change-Id: I2f9d58d82d99775575249e9e245949a0bc1d553e
Test: manual
 2022-11-16 07:18:01 +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
changbetty
4252675ca5 [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 skip reason: subject contains skip directive

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

Change-Id: I66144451350bd1bc891f5285f5762e970cfd3c93
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-16 05:33:57 +00:00
changbetty
8b7449cfd9 [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 skip reason: subject contains skip directive

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

Change-Id: I68a6ec209e332d1e9aa94e3d5fa1e29043bff30c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-16 05:33:48 +00:00
changbetty
a8fe473c7e [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 skip reason: subject contains skip directive

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

Change-Id: Ie81e3b5168e08cdcd765d446e5159962deb834fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-16 05:33:41 +00:00
changbetty
e1a9e4cd38 [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 skip reason: subject contains skip directive

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

Change-Id: Ic2f6b32955056ba7095b2bb1c0c5b3371bfa8163
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-16 05:33:34 +00:00