Commit Graph

85033 Commits

Author SHA1 Message Date
Bill Yi
2098a1780e Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I8595270cabb005ca6a64f0c5503728ae2464f5a0
2021-05-20 06:02:34 +00:00
Mill Chen
ef8f5c5ca4 Fix overlapping problem for device admin page
The content of Activate device admin app is overlapping with the title
while scrolling up. That is because the collapsing toolbar needs to
work with the view that supports nested scrolling feature, and this page
hasn't updated the layout to use NestedScrollView. So that caused the
overlapping problem.

Fix: 188184864
Test: visual verified
1) Navigate to Settings > Security > Device admin apps > pick up one to
activate
2) Scrolling the content and see if the content is overlapping with the
title

Change-Id: Ide5ff9ed40202c3b217934db93c82a4861983416
2021-05-20 13:56:52 +08:00
TreeHugger Robot
b84b2c645b Merge "(2/n) Stop user from enabling OHM setting if user is using 3-button mode" into sc-dev am: 2cc1c91601 am: f154e231f9 am: 9d6fd54205
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14235150

Change-Id: Ic7009ca86aa814cfa8394caa90cd65674f02c107
2021-05-20 05:14:17 +00:00
TreeHugger Robot
9c5c63caf0 Merge "(2/n) Stop user from enabling OHM setting if user is using 3-button mode" into sc-dev am: 2cc1c91601 am: 7f7cf45879 am: 4052fcc8bf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14235150

Change-Id: I3485c6995336a54c1e33ab7ff7e4f7c162b3bf08
2021-05-20 05:12:03 +00:00
TreeHugger Robot
e637aeb59b Merge "Setting result earlier than onPause" into sc-dev am: c57c351060 am: 0925ba9f24 am: 8742209c02
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14637113

Change-Id: I6f5a5d303426221d6a2cb260c7f3109af1cbf56c
2021-05-20 05:10:31 +00:00
TreeHugger Robot
f3ee9aac82 Merge "Setting result earlier than onPause" into sc-dev am: c57c351060 am: bd016efe52 am: 33a02ecb1b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14637113

Change-Id: Ie3276d623b439293913f663d165e08a653053e54
2021-05-20 05:04:14 +00:00
Jack Yu
d7f6249946 Merge "API Review: Rename CAPABILITY_ALLOWED_NETWORK_TYPES_USED" into sc-dev am: 3616520985 am: 9c60e581e8 am: 8ebb08b699
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14554359

Change-Id: Iebcdd2f6f9b18922ee1d3961f73b30e16053afa5
2021-05-20 04:53:31 +00:00
TreeHugger Robot
9d6fd54205 Merge "(2/n) Stop user from enabling OHM setting if user is using 3-button mode" into sc-dev am: 2cc1c91601 am: f154e231f9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14235150

Change-Id: Idfc92c6211e462f861af4443cebb7b08c1263140
2021-05-20 04:48:26 +00:00
TreeHugger Robot
4052fcc8bf Merge "(2/n) Stop user from enabling OHM setting if user is using 3-button mode" into sc-dev am: 2cc1c91601 am: 7f7cf45879
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14235150

Change-Id: I32e13fb5e90283fd932e132e86daf4ba769d5df2
2021-05-20 04:46:07 +00:00
Jack Yu
0ac4d497ff Merge "API Review: Rename CAPABILITY_ALLOWED_NETWORK_TYPES_USED" into sc-dev am: 3616520985 am: a67151ad2f am: 2b2a1f8894
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14554359

Change-Id: Ia8fd7d39bc1eca409b573055830e049f32bdd056
2021-05-20 04:45:48 +00:00
TreeHugger Robot
7f7cf45879 Merge "(2/n) Stop user from enabling OHM setting if user is using 3-button mode" into sc-dev am: 2cc1c91601
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14235150

Change-Id: Ia39af2ed11d35f002eac1dba12fb35ed3c87b600
2021-05-20 04:23:01 +00:00
TreeHugger Robot
f154e231f9 Merge "(2/n) Stop user from enabling OHM setting if user is using 3-button mode" into sc-dev am: 2cc1c91601
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14235150

Change-Id: I3161025c6c61529213cf99b38306ca287f657a51
2021-05-20 04:22:06 +00:00
TreeHugger Robot
2cc1c91601 Merge "(2/n) Stop user from enabling OHM setting if user is using 3-button mode" into sc-dev 2021-05-20 03:54:57 +00:00
menghanli
b9fefba02a Apply color extraction for vision settings
Bug: 183713013
Test: Run initBCTestEnv_S.sh and apply different color
Change-Id: I2420a6af0f0f975396003e4c5531701bfb8373f4
2021-05-20 11:48:22 +08:00
Antoan Angelov
af23d7a496 Merge "Update ActionDisabledByAdminDialogHelper" into sc-dev am: eb45fd3f2a am: 57d52482cc am: 5eabf5464f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14441130

Change-Id: Iade990b7c4d0c363b8b0583d46a4112046f7e3a2
2021-05-20 02:04:58 +00:00
Antoan Angelov
d9365b8d65 Merge "Update ActionDisabledByAdminDialogHelper" into sc-dev am: eb45fd3f2a am: 8019ba0d5b am: 3bd2b1cae2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14441130

Change-Id: I13048f5d63c1f58a66605aae4f1ef1a53f94ae0e
2021-05-20 02:04:33 +00:00
ykhung
d9036d56b5 Add metric for new battery relative functions for S (1/2) am: a3d3c22a27 am: 98aafd8500 am: 587a8f9800
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14622866

Change-Id: Idad822c1574085c053ff5964cd49355d249e0496
2021-05-20 01:56:08 +00:00
ykhung
fd843b337a Add metric for new battery relative functions for S (1/2) am: a3d3c22a27 am: ae66f84815 am: 4ae06f8823
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14622866

Change-Id: I8abc984dd439f672b4f03635512e4931a358da40
2021-05-20 01:56:03 +00:00
Jason Chiu
b1757fa13d Merge "Fix NullPointerException at VolumeSliceHelper" into sc-dev am: 9f24967458 am: 817fb55032
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14622863

Change-Id: If7fde14e37b4ea9d387ac1aef5ccff79502814fd
2021-05-20 01:55:58 +00:00
Yi Jiang
4b16756bd9 Merge "Fixes ScreenTimeoutSettingsTest" into sc-dev am: 07532443ca am: f1a04d7284
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14629551

Change-Id: I047e3a3fdeafe11e2efb5ca38526067065403f1e
2021-05-20 01:55:53 +00:00
Peiyong Lin
7d73c61a16 Merge "Add Game settings support." into sc-dev am: d32d11248e am: 4e4a7f0dbd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14553339

Change-Id: I9eb8f13aaf68f586ac1068af26459e9db08f1a65
2021-05-20 01:55:47 +00:00
Weng Su
7390717d9e Merge "Introduce new Disconnect functionality for Wifi networks in Internet Panel only" into sc-dev am: 3d904eba71 am: eccb787bbb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14622856

Change-Id: I485d82ac7bfc9347def855207796f70b0ac0674b
2021-05-20 01:55:42 +00:00
Weng Su
c1382e3007 Merge "Improve discoverability of the intent & actions progress" into sc-dev am: ca5f4e4952 am: 46d3fc525e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14622857

Change-Id: If6651e153ac623305f933bee6cb57a02b753d905
2021-05-20 01:55:37 +00:00
TreeHugger Robot
d9db863dc2 Merge "Apply color extraction for Fingerprint enrollment" into sc-dev am: bac284a622 am: 08e146982b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14622855

Change-Id: If690c8a00cbfd9b4c1cc393fa7884f216c14ab65
2021-05-20 01:55:32 +00:00
TreeHugger Robot
7cb2d6db1a Merge "Visual update for FaceSettings" into sc-dev am: 2a7e608ef2 am: 80c3d12ff9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14551407

Change-Id: I4d67998883542d1aebc6d1d9d28349c35737cb68
2021-05-20 01:55:27 +00:00
TreeHugger Robot
8109a344fd Merge "Fix the text contrast for biometric header" into sc-dev am: a07eb69948 am: aaf4959555
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14605930

Change-Id: Ifdf0d1c27cfaf788513ccae8d88b6ba982619994
2021-05-20 01:55:21 +00:00
TreeHugger Robot
8492c7d2d8 Merge "Update the layout of Pattern/PIN/Password confirmation" into sc-dev am: 6d550713dd am: d3f0fc54a7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14554361

Change-Id: Ie42ed795854ffece613af6c8cc1f68b37c75be25
2021-05-20 01:55:16 +00:00
TreeHugger Robot
be234f3d1e Merge "Tweak the layout for Pattern/PIN/Password enrollment" into sc-dev am: 4a67b1c099 am: 7bb6afbfd1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14554357

Change-Id: Iece2f329fbe702dca296dd7d169cb2457003387c
2021-05-20 01:55:11 +00:00
TreeHugger Robot
91960f18ff Merge "Controls/Pay - Use new privacy setting" into sc-dev am: 4335268c81 am: ba061c91ef
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14551073

Change-Id: I0120102362ad110f7895f665f2ada9b6d03742e8
2021-05-20 01:55:06 +00:00
Chloris Kuo
4ded87ebb3 Merge "Fix NAS dialog string" into sc-dev am: 074eee332a am: 0e30c2599f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14607898

Change-Id: Icbfd2ef1b819af211bb0fbc791ea9041417dd16d
2021-05-20 01:55:00 +00:00
YUKAI HUNG
bcadb99952 Merge "Align system time 12-24 hour format in the time slot information" into sc-dev am: 80f2f43d59 am: bf06c3c5f0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14609994

Change-Id: I2db00287ba2d4799ac6d20786f0cf90588fa282d
2021-05-20 01:54:55 +00:00
TreeHugger Robot
f392526fb5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 7659a826c3 -s ours am: 1aed128b64 -s ours am: 3ea9148b47 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7480540a37e1072722e308338847e774a6a7a6b7
2021-05-20 01:54:50 +00:00
Bill Yi
1fa3df8016 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9afa4248cc -s ours am: 0ee82f4c33 -s ours am: e8d6f07126 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7f34fa65c91f96daf0dde3a4e0804a0fac8197b9
2021-05-20 01:54:45 +00:00
TreeHugger Robot
6bd4b4ccd9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 6ab5e4327c -s ours am: 6ac3c7186a -s ours am: f68e687f10 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Idae0e11457d7bef101c2cb3ea8235010f24a7e6d
2021-05-20 01:54:41 +00:00
Bill Yi
dd85c7526c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8cecd68c0c -s ours am: 712b1d5b4a -s ours am: 5bf187ec27 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia8c841545f74717cec9ecfb63680a5d479058edc
2021-05-20 01:54:36 +00:00
TreeHugger Robot
bfdc8c1295 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 0af7445e78 -s ours am: f075886ddf -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia82321996bf2dddd2ddc969e40a59f8c74e09002
2021-05-20 01:54:32 +00:00
TreeHugger Robot
8310f88f31 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 583c25da1f -s ours am: a82ce0e247 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I103b9138478a7bda81ddacd9505ccbc32a855111
2021-05-20 01:54:27 +00:00
TreeHugger Robot
914136591b Merge "Update style name" into sc-dev am: db6c7211e4 am: fe9d014c8c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14547063

Change-Id: Ia9356b4823ce829eb93e8899646caab7451e2045
2021-05-20 01:53:42 +00:00
Arc Wang
5e9b6c85e0 Merge "Add "This device" string for default internal storage" into sc-dev am: 7c3adee295 am: cf32a78aa9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14609995

Change-Id: I72a0c63ed6de2f3f6aab973e948ed716b38c20a8
2021-05-20 01:51:20 +00:00
Betty Chang
180d113e43 Merge "[GAR] Change the text color for Private DNS Summary to follow the GAR" into sc-dev am: 78031d82b7 am: 597d2a157c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14609992

Change-Id: I7d30bfa4b435cf2e767b9dd2f033e1971eab9f5b
2021-05-20 01:51:13 +00:00
Betty Chang
93d44674ad Merge "[GAR] Set selectable attribute to W+ network preference" into sc-dev am: 2d3487f704 am: 0853f28f5a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14609990

Change-Id: I9d9454e38e1af3749d2b78a715a8f627cf631477
2021-05-20 01:51:07 +00:00
ykhung
f22ae10b9b Add metric for battery defender am: 6590b368f2 am: 7acf3fc852
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14554360

Change-Id: I7271cb28f899eaa816d1243795dde3e8d91766b5
2021-05-20 01:51:00 +00:00
Menghan Li
7bc8f4101c Merge "Fix flake issue on SettingsRoboTests" into sc-dev am: cadd868911 am: 47dc191940
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14609993

Change-Id: Ic79a2434024351288534e0faa2c2dcffaae525d1
2021-05-20 01:50:54 +00:00
TreeHugger Robot
06e5421dbe Merge "Fix search highlight issues" into sc-dev am: 03099c04bd am: 66675b3e50
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14519527

Change-Id: I30cd01bcd5bfde167a7a495b89e8293db642cd0a
2021-05-20 01:50:48 +00:00
Evan Severson
a988c56a25 Merge "Update the settings privacy page to the latest mocks" into sc-dev am: 39e7cb2721 am: 1f2542e62c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14215739

Change-Id: I2b55b8e2be72c50fb51c9f97fb6cab0c3e7c0584
2021-05-20 01:50:42 +00:00
TreeHugger Robot
58b7334199 Merge "Expose Lock screen settings page." into sc-dev am: cbb2bd6d13 am: 80b90cfadf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14544233

Change-Id: Ifbfb627d760c7f4aeb0e6e692443f8df7a54830c
2021-05-20 01:50:35 +00:00
YUKAI HUNG
4ee71b0d29 Merge "Fix legacy failed unit test for BatteryInfoLoader" into sc-dev am: 10559fb9de am: c0ab21eaa3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14554353

Change-Id: I411b4a3f82ba8e0db4df8380a7de74a588af1294
2021-05-20 01:50:28 +00:00
Menghan Li
de8f4193a0 Merge "Remove above divider of main switch" into sc-dev am: c6e056b7f4 am: d5c5b6606d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14554350

Change-Id: I891834adc7438bc7f752c6666ae15927a47dfd06
2021-05-20 01:50:21 +00:00
Menghan Li
728dfaceb2 Merge "Fix “Learn more” link not working on Magnification shortcut page from Vision Settings" into sc-dev am: 94ac5181ba am: b11c11196c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14554349

Change-Id: I4cc27a0e25897dc6e77a8dc0e3f47b36f76a5ce1
2021-05-20 01:50:15 +00:00
Arc Wang
0052f7f46a Rename audios to audio am: 6062b6491d am: 9c191a1018
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14518465

Change-Id: I274afecba4917ab6cc52274943f7132b7fa44e5c
2021-05-20 01:50:08 +00:00