Bill Yi
8234ea3375
Merge changes from topic "tc_change_23040307_27" into udc-dev
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 7a4e68d269
Import translations. DO NOT MERGE ANYWHERE
2023-04-04 04:33:23 +00:00
Quang Luong
d6d560ff6e
Don't overwrite security params when editing saved config
...
WifiConfigController2 sets the security params of a saved config, which
may overwrite @hide fields like SecurityParams#mIsAddedByAutoUpgrade. To
prevent this, only set the security params for a new config, and use the
existing security params for existing configs.
Bug: 262312532
Test: atest WifiConfigController2Test
Change-Id: I9ef5eb8ce2b4208e1fad27bd68fc4f0fad7d1008
2023-04-04 00:55:13 +00:00
Bill Yi
fa4e2c72af
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ia388647234a08b6a569c4fb853ae6702eba75927
2023-04-03 15:43:43 -07:00
Bill Yi
0fcfd96c98
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 179fdda8d3
-s ours am: 076cc4fc6c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22425018
Change-Id: I1926d30af3c09df9c8393eea049c7a2a675a8e41
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-03 21:27:53 +00:00
Hao Dong
5a2ba07f63
Merge "Show a dialog preventing fingerprint enrollment in split mode." into udc-dev
2023-04-03 21:14:37 +00:00
Hao Dong
637ae9d983
Merge "Show Class 3 consent screen in enrollment with strong face." into udc-dev
2023-04-03 21:06:40 +00:00
Bill Yi
076cc4fc6c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 179fdda8d3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22425018
Change-Id: I035cb268a83cfbdae6eca6c1c4b3f43306b5dc2b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-03 20:58:59 +00:00
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
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
4fb7c76213
Merge "Improves Settings search result of Flash Notifications" into udc-dev
2023-04-02 05:59:32 +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
470dbd6884
Merge "Announce scaled value for font scaling seekbar in Talkback" into udc-dev
2023-03-31 23:17:48 +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
ca08af3ff6
Merge "Enable hover states for SeekBarPreference" into udc-dev
2023-03-31 20:57:16 +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
Bill Yi
cadf15af82
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev
2023-03-31 19:51:51 +00:00
Bill Yi
126b81097a
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev
2023-03-31 19:51:51 +00:00
Bill Yi
3a355835db
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev
2023-03-31 19:51:51 +00:00
Aurélien Pomini
649c5082c6
Add contrast setting in dev options
...
See the attached video from b/266071578#comment2 to see how the setting
looks like.
Bug: 266071578
Test: atest ContrastDialogTest
Test: atest ContrastDialogControllerTest
Change-Id: Id9fc31a0562059814d4e342ea8095adc5b53d5f3
2023-03-31 19:35:08 +00:00
TreeHugger Robot
8ae1abecc1
Merge "Moves lock screen shortcuts summary loading to the background." into udc-dev
2023-03-31 18:48:29 +00:00
Candice Lo
d2c53a2085
Announce scaled value for font scaling seekbar in Talkback
...
1. Keeping state descriptions for the seekbar as an array in the
PreviewSizeSeekBarController when we would like to customize the
state description.
2. Setting the scaled value to be the state description for the font
scaling seekbar when there is a progress change to the seekbar.
Bug: 269212483
Test: manually - attach videos to the bug
Test: make RunSettingsRoboTests ROBOTEST_FILTER=PreviewSizeSeekBarControllerTest
Change-Id: I8e9e3681a0174f454cac871ebf62d785962c7165
2023-03-31 17:38:14 +00:00
Jan Tomljanovic
d082c0aa4c
Merge "Change page title of More security & privacy settings" into udc-dev
2023-03-31 16:25:47 +00:00
Yuri Ufimtsev
df9c660ed6
Merge "Change Biometric preferences summary when not enrolled" into udc-dev
2023-03-31 14:36:55 +00:00
Yuri Ufimtsev
55b8e1818f
Change page title of More security & privacy settings
...
Test: manual
Bug: 275730450
Change-Id: I7d6a36aba08b8b61d0de0e2d34bcd828cf30abd4
2023-03-31 14:23:27 +00:00
SongFerng Wang
378c2cf87b
Merge "UI add more log" into udc-dev
2023-03-31 14:12:17 +00:00
Marcelo Arteiro
0102eb84ec
Merge "Automated Token Alignment Android/Material" into udc-dev
2023-03-31 13:18:38 +00:00
TreeHugger Robot
34947069f6
Merge "Improve dialog and system dialog UI" into udc-dev
2023-03-31 11:43:07 +00:00
Marcelo Arteiro
c5631b45b2
Automated Token Alignment Android/Material
...
Resubmiting reverted CL Ia1f84669090e04b3a2aaac82bb5971032d74a125.
Reson: Bug was found in another CL (in this topic)
Test: Treehugger
Bug: 268682423
Change-Id: I0fead8915b2bb6281e29b32f7426c35b0138b10e
2023-03-31 10:53:24 +00:00