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

118710 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sam Dubey
c536eb4dc4 Revert "Add configuration for defaulting notification behavior" am: a2d06273c1 am: 48eae58586 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20505171

Change-Id: I0e2693f89594f6c473c5c2e9dbb6a34ea6bf5864
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-17 14:29:58 +00:00
Sam Dubey
48eae58586 Revert "Add configuration for defaulting notification behavior" am: a2d06273c1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20505171

Change-Id: Ic9b89ba7d709e09be8217252485adcfc49575d70
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-17 14:01:32 +00:00
Jason Chang
966ffa1b2a Add pad animation for STAGE_CENTER & STAGE_GUIDED 
1. STAGE_CENTER reference
   - String : security_settings_sfps_enroll_finger_center_title
   - raw : udfps_center_hint_lottie

2. STAGE_GUIDED
   - String : security_settings_fingerprint_enroll_repeat_message
   - raw : udfps_center_hint_lottie (Same with STAGE_CENTER)

Bug: 228100413

Test: manually verified on Settings > Security > Face & Fingerprint
Unlock > Fingerprint Unlock > Touch & Hold fingerprint sensor page

Test: make RunSettingsRoboTests ROBOTEST_FILTER=
"com.android.settings.biometrics.fingerprint
.FingerprintEnrollEnrollingTest"

Change-Id: Ic308b9bffee32b36f7280cf263c67adc3ca31c66
 2022-11-17 10:13:10 +00:00
Neil Fuller
00b549f75a Merge "Track changes in frameworks/base" 2022-11-17 09:28:37 +00:00
Zaiyue Xue
a08d22aab5 Merge "Refoactor 2 util functions from DatabaseUtil to BatteyUtils." 2022-11-17 09:13:42 +00:00
Bonian Chen
7dc161dcc8 [Settings] configuration for hidding SIM related UI 
Add overriable configuration for hidding SIM related UI.

Bug: 240515161
Test: test cases and local testing
Merged-In: I03d17beac0fb85a3d17acd7d0d581feb35e9582b
Merged-In: I8d7ddd18861a696830da39f040dfb14b9ed46726
Merged-In: I45b7898da440c36045aec64a0a86fb804116cd9d
Merged-In: Ie00bdce2fad429f2ed343e1d7aea4967bcaddf5a
Change-Id: Id5ea14ca888f0cfc6ed5a7df3f77a8176232ef4f
 2022-11-17 09:01:09 +00:00
Sam Dubey
a2d06273c1 Revert "Add configuration for defaulting notification behavior" 
Likely causing b/259499400

This reverts commit a92688d642.

Change-Id: I781a7ecf9139eca11e1db895f86268b893258543
 2022-11-17 07:33:18 +00:00
Chaohui Wang
125baab6ec Merge "Remove lifecycle-extensions from Settings" 2022-11-17 07:15:00 +00:00
Milton Wu
a174486803 Fix face enroll introduction crash after 10mins 
When requestGatekeeperHat() throws exception in FaceEnrollIntroduction
page, remove gk_pw_handle and recreate activity to trigger confirmLock.

Test: robotest for FaceEnrollIntroductionTest
Bug: 234437174
Change-Id: Ie1dd6f36e4deb3f776e3b39acd165fc47d04f526
 2022-11-17 06:57:21 +00:00
Sayak Dutta
e274c85474 Merge "Modify call to Header function of Glif Layout to disable autosize" into tm-qpr-dev am: 03ed8c0477 am: 3765a09a58 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20472167

Change-Id: Ic88e98b23b7724e99eb322b446e901d27bcb97fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-17 06:47:33 +00:00
Zaiyue Xue
bc1f4798a6 Refoactor 2 util functions from DatabaseUtil to BatteyUtils. 
Bug: 252407178
Test: presubmit
Change-Id: I393777186cc308298f0a8b76af4672b9012ed681
 2022-11-17 14:25:10 +08:00
Sayak Dutta
3765a09a58 Merge "Modify call to Header function of Glif Layout to disable autosize" into tm-qpr-dev am: 03ed8c0477 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20472167

Change-Id: I580b3e0944fe2d232a11e73a7e349c6564debd48
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-17 06:19:40 +00:00
Sayak Dutta
03ed8c0477 Merge "Modify call to Header function of Glif Layout to disable autosize" into tm-qpr-dev 2022-11-17 06:07:12 +00:00
Kuan Wang
1493fa2fea Database restructure: use protobuf to save battery information fields. 
This patch only updates the existing fields.
There will be 2 following patches to:
1. Expose the new fields (foreground / foreground service / background x
   usage time / power consumption) to UI.
2. Get the full charge cycle start time from Database and remove the
   SharedPreference.

Test: make RunSettingsRoboTests + manual
Bug: 253553141
Change-Id: Iee02dc7e671f97899cb1495323acfa0173e31df2
 2022-11-17 06:06:54 +00:00
Bill Yi
45c9b11655 Merge "Import translations. DO NOT MERGE ANYWHERE" 2022-11-17 05:24:20 +00:00
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
271d59bec4 Update for MoreOptionsAction 
Bug: 259492166
Test: Manually with Settings
Change-Id: I0b0b570a456d9464043a221a628ed33c19d780df
 2022-11-17 13:05:12 +08: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
Florian Mayer
00307bdbbe Add separate system property to control user toggle 
This allows to ship the developer toggle independent of the settings
toggle. This also allows other parts of the system to query whether the
settings toggle is available.

Bug: 244290023
Change-Id: I1a6b6457974a7107711cd4f7d990a6fe61bf340f
 2022-11-16 14:14:12 -08: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
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