PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
122,291 Commits 1 Branch 0 Tags
680f91b58d62669b284b2324dc8fcebb62ef51cc
Commit Graph

122291 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Hao Dong
ee8252b56b Show a dialog preventing fingerprint enrollment in split mode. 
Test: atest CombinedBiometricProfileSettingsTest
Test: atest FingerprintSettingsFragmentTest
Test: manaul test- go to split screen mode and try to enroll
fingerprint
Bug: 246247132

Change-Id: I12357d197f2ceda8c1f1f582cdecb20fd18e30f7
 2023-04-03 18:02:22 +00:00
Chaohui Wang
ecd8ffb08b Fix App battery usage crash 
userContext.getApplicationContext() returns null, which cause crash.

Use context instead to fix.

userContext was used to support multiple profiles, since the app's user
id is also passed to getAppBatteryUsageData(), userContext is not need.

Fix: 269545838
Fix: 275957358
Test: Manually check the battery usage is still correct if an app is
      installed on two profiles
Change-Id: I41a80e4c6edc338affb6eec0cf12da3c438cd7fd
 2023-04-04 00:15:29 +09:00
Bill Yi
eea2a19c9a [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 7a4e68d269 
Blank merge reason: commit message contains skip directive

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

Change-Id: I9a8f41aeff3f2d7585d46e1618449b06eec732ff
 2023-04-03 14:35:51 +00:00
Bill Yi
7d4a0514cf [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 4c6c727262 
Blank merge reason: commit message contains skip directive

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

Change-Id: I11461a7dba648fbdd5a952aa6b1d2a2809058bc2
 2023-04-03 14:35:31 +00:00
Chalard Jean
f5747ba857 Only admin users may change private DNS settings 
Bug: 237289258
Test: manual
Change-Id: Ia2875fb8c628642daebc48fc6aec99aaf30e64be
 2023-04-03 03:27:29 +00:00
Bill Yi
e29a9fb4ea Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I2d9f04335f9d38e35c8bebd63d32c2eddf7f5661
 2023-04-02 17:54:23 -07:00
Bill Yi
179fdda8d3 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I9687e3f6e8e0adb69d87cedd36926f91f0fd732c
 2023-04-02 17:52:31 -07:00
Bill Yi
f44c0bafd5 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ib25a02c4a90baad11c0f8febb39f677d38cddb78
 2023-04-02 17:50:19 -07:00
Bill Yi
92d09c8de3 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ib64f4f2df916279a9c06d6a718a46bbfde5750bf
 2023-04-02 17:48:09 -07:00
Bill Yi
4c6c727262 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ie6806ae2768788dbef4a8dcff5f418970731ebb6
 2023-04-02 17:46:34 -07:00
Bill Yi
7a4e68d269 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ieb9881a34662fb6c68038a3702b7e26907e25ef0
 2023-04-02 17:45:04 -07:00
Bill Yi
10dcb7b74a Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I26773573f3bd95ca50b4020ed338568b589771bb
 2023-04-02 16:52:48 -07:00
Bill Yi
baad0b1a23 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I80aace7a5461f4c19ddeb31c0e4626dbeb69a12c
 2023-04-02 16:42:42 -07:00
Bill Yi
34efab58d3 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I7bab6057f3a9ac9fba376e7731891a100aa97632
 2023-04-02 16:37:48 -07:00
Bill Yi
4040f0dc33 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: a3af1db910 -s ours am: c7918b9ac3 -s ours am: 506a9b317d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibc29247ba16c40f178f62e859ff05b259519fcf0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-02 19:21:39 +00:00
Bill Yi
4038fae85a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a2f4c8bd49 -s ours am: 2309f00455 -s ours am: 7555bb81d1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1b3b83e996d0298c1bf7c0d800ce04b9f2484b23
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-02 19:21:30 +00:00
Bill Yi
2379404b47 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: f884a037be -s ours am: 2a19621591 -s ours am: 3c525dc4e3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iea2e6091924d2422ec9a9144142041799c47a12b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-02 19:21:12 +00:00
Bill Yi
25207a98ff [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5847bd476f -s ours am: 107129903a -s ours am: bdd7345e26 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6a621fb6a3a000bcf34229f6abc7808bee61fc07
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-02 19:20:51 +00:00
Bill Yi
506a9b317d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: a3af1db910 -s ours am: c7918b9ac3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7357483d255938670c6ff10ebd22f72f76e6bf0e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-02 19:18:32 +00:00
Bill Yi
7555bb81d1 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a2f4c8bd49 -s ours am: 2309f00455 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I39e92ab880ff65c6c2893df671cbc48fcec92028
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-02 19:18:24 +00:00
Bill Yi
3c525dc4e3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: f884a037be -s ours am: 2a19621591 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib4af7b662cd2a8e5087376cbbd619efaf951ca75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-02 19:18:08 +00:00
Bill Yi
bdd7345e26 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5847bd476f -s ours am: 107129903a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I55532e33ae7ecf812d8cc54acbe9dbd3d94f40d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-02 19:17:41 +00:00
Bill Yi
c7918b9ac3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: a3af1db910 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0c078e0ceafb27e2c05505aa140a34909dea7f06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-02 18:46:13 +00:00
Bill Yi
2309f00455 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a2f4c8bd49 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0b507ab323bccf47d2b145c5842a18809e312215
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-02 18:46:03 +00:00
Bill Yi
2a19621591 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: f884a037be -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7c878063b45fbbc1003be421c27c6b809db10051
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-02 18:45:48 +00:00
Bill Yi
107129903a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5847bd476f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ica28fa658d4b2992a86850c9d126585cd18c9f0d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-02 18:45:21 +00:00
Bill Yi
a3af1db910 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2023-04-02 18:22:50 +00:00
Bill Yi
f884a037be Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2023-04-02 18:22:50 +00:00
Angela Wang
3e304f9e1f Merge "Improves Settings search result of Flash Notifications" into udc-dev am: 4fb7c76213 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22323070

Change-Id: I4ffcbfb99d718f96be27e93bcf6eb49ea4ebe7c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-02 06:31:19 +00:00
Angela Wang
4fb7c76213 Merge "Improves Settings search result of Flash Notifications" into udc-dev 2023-04-02 05:59:32 +00:00
Bonian Chen
fa3e0fcded [automerger skipped] [Settings] Avoid from user without sufficient permission to change WiFi am: 61e6c46fa7 am: e8b96d4b25 -s ours am: 432886441f -s ours 
am skip reason: Merged-In I4fadaf2bdc55b97419f9e6abbd3cfa63af034f6a with SHA-1 a1d3fe061e is already in history

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

Change-Id: I909590559f738ababa21d3d9fb9783c402fa46a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-01 08:36:54 +00:00
Bonian Chen
432886441f [automerger skipped] [Settings] Avoid from user without sufficient permission to change WiFi am: 61e6c46fa7 am: e8b96d4b25 -s ours 
am skip reason: Merged-In I4fadaf2bdc55b97419f9e6abbd3cfa63af034f6a with SHA-1 a1d3fe061e is already in history

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

Change-Id: I9668251485a221e6ae646dd403db27ed45d7740e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-01 08:02:26 +00:00
Bonian Chen
e8b96d4b25 [Settings] Avoid from user without sufficient permission to change WiFi am: 61e6c46fa7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21373178

Change-Id: I2f29593b98a41fe4ced1f72dd9523be341850c6e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-01 07:32:05 +00:00
Bill Yi
a2f4c8bd49 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ie5e4ab0bbea59e5f05353776da8d5ae625767d93
 2023-03-31 17:03:07 -07:00
Bill Yi
5847bd476f Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I9609f118fd4a653fd4a5a62fe786691d489e1d83
 2023-03-31 16:56:15 -07:00
Candice Lo
c96e19f819 Merge "Announce scaled value for font scaling seekbar in Talkback" into udc-dev am: 470dbd6884 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22347809

Change-Id: I76dfd28a5bbed12adde56a94564ebfb440ff804b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-31 23:42:34 +00:00
Candice Lo
470dbd6884 Merge "Announce scaled value for font scaling seekbar in Talkback" into udc-dev 2023-03-31 23:17:48 +00:00
Bill Yi
e9faa25ab9 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev 2023-03-31 22:19:18 +00:00
Bill Yi
abec88bf3d Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev 2023-03-31 22:19:18 +00:00
Bill Yi
9ccc6527a5 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev 2023-03-31 22:19:18 +00:00
Darrell Shi
a86614db74 Hide timeout to user0 pref when switching blocked. 
Do not show the "timeout to admin user" settings preference when user
switching is blocked on the current user, e.g. in demo mode.

Test: atest SettingsRoboTests:TimeoutToDockUserPreferenceControllerTest
Bug: 255277938
Change-Id: Ibd0944c69254000a453f477eb72a0ba5832e9793
 2023-03-31 22:14:35 +00:00
Chris Antol
4b37ad1a3d Merge "Enable hover states for SeekBarPreference" into udc-dev am: ca08af3ff6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22361715

Change-Id: I99c742e3c75dc04afe3024ab57188a13213e436f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-31 21:28:00 +00:00
Chris Antol
ca08af3ff6 Merge "Enable hover states for SeekBarPreference" into udc-dev 2023-03-31 20:57:16 +00:00
Bill Yi
85d005509a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: cadf15af82 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2f5d2fe9aaf05fc3c84d839e69be905710188306
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-31 20:34:20 +00:00
Bill Yi
193005bd26 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 31c51eb0d6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I515957d595c68d67db5012855e1f8efc42943c7f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-31 20:34:18 +00:00
Bill Yi
2943bc5df8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 126b81097a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0976563fce956aebefc8e1d5a8fb86ab0d3c48ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-31 20:34:17 +00:00
Bill Yi
0591345d4b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 55e5d7a9c7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0749e6087f708b446854ef7295ffee0568589aa8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-31 20:34:11 +00:00
Bill Yi
14a1ecbf35 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 3a355835db -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2f41f512cc8326ca16a7912c20e676790ad9b507
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-31 20:34:10 +00:00
Bill Yi
ee1f78854e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ea4029233f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I31c86cd50bc0d62fb63b92cfab587a2ad8b17ca4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-31 20:26:42 +00:00
Hao Dong
322df0454f Show Class 3 consent screen in enrollment with strong face. 
Test: atest FaceEnrollIntroductionTest
Bug: 271903097
Change-Id: I1959a82862790ff918571145b3651d164aa118b6
 2023-03-31 20:11:44 +00:00