Commit Graph

91032 Commits

Author SHA1 Message Date
Peter Wang
eba8857094 Add a cancel string for ToggleSubscriptionDialog to handle Tamil
translation

Bug: 185553806
Test: Build
Change-Id: I90149c9e4459747d8cd1c35d00c29f81710eb6f4
2021-06-29 15:08:00 -07:00
Curtis Belmonte
218187bcce Fix buttons and icons for fingerprint enroll intro
Updates the labels of buttons and the colors of icons shown on the
fingerprint enroll intro screen to be consistent with the face enroll
intro screen and match the latest mocks.

Note that this commit removes some unused strings but does not add any
new ones requiring l10n.

Test: Manually tested face enroll from Setup Wizard and Settings

Fixes: 192381823
Change-Id: Id991d4f29d6de82acd538f1853bc8a5e50cd2637
2021-06-29 14:05:27 -07:00
TreeHugger Robot
867384001c Merge "[Settings] Pass the system user to launch the web help page" into sc-dev am: b36bbc55d1 am: c0aab4416a am: 537027ff80
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15105946

Change-Id: I0fc17f789dd7aab542a8453461b2d117eb11aefd
2021-06-29 19:38:09 +00:00
TreeHugger Robot
516138ec37 Merge "[Settings] Pass the system user to launch the web help page" into sc-dev am: b36bbc55d1 am: 6c992bf629 am: 1b07b30a26
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15105946

Change-Id: I35fa1ab9891ab036f931db927242ac0bbd0248b1
2021-06-29 19:35:03 +00:00
TreeHugger Robot
537027ff80 Merge "[Settings] Pass the system user to launch the web help page" into sc-dev am: b36bbc55d1 am: c0aab4416a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15105946

Change-Id: Ia977ddd12de0760ecbd7089478f06f0d6a7a032d
2021-06-29 19:26:42 +00:00
TreeHugger Robot
2171d72c0d Merge "[Settings] Pass the system user to launch the web help page" into sc-dev am: b36bbc55d1 am: aa3e4f7348
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15105946

Change-Id: I710c1878e60bf6f0fb09888752e5d9b033849cfe
2021-06-29 19:25:31 +00:00
TreeHugger Robot
1b07b30a26 Merge "[Settings] Pass the system user to launch the web help page" into sc-dev am: b36bbc55d1 am: 6c992bf629
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15105946

Change-Id: I6e77669335096aa09605e461a6a056f223a1140d
2021-06-29 19:25:30 +00:00
TreeHugger Robot
c0aab4416a Merge "[Settings] Pass the system user to launch the web help page" into sc-dev am: b36bbc55d1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15105946

Change-Id: Ifc37331783f90bbb921d1eedaba9c8272a192e33
2021-06-29 19:07:51 +00:00
TreeHugger Robot
6c992bf629 Merge "[Settings] Pass the system user to launch the web help page" into sc-dev am: b36bbc55d1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15105946

Change-Id: I0504cef773ca14ff7f4b9d38a60d1e8a274c024a
2021-06-29 19:06:46 +00:00
TreeHugger Robot
aa3e4f7348 Merge "[Settings] Pass the system user to launch the web help page" into sc-dev am: b36bbc55d1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15105946

Change-Id: Ic3d9f718a805574a292ccb735ae9e80f660f31c1
2021-06-29 19:04:26 +00:00
TreeHugger Robot
b36bbc55d1 Merge "[Settings] Pass the system user to launch the web help page" into sc-dev 2021-06-29 18:55:24 +00:00
Jan Tomljanovic
b894c36d5b Merge "Enable controllers to use a custom key." into sc-dev am: 2b8678c5d4 am: d8ab97081b am: 5a67cd9bf2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15101190

Change-Id: I526cffc4addd24ec355f5c087befb95682d2ef3c
2021-06-29 16:37:23 +00:00
Jan Tomljanovic
95751ee673 Merge "Enable controllers to use a custom key." into sc-dev am: 2b8678c5d4 am: 1384459fde am: fcf8555515
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15101190

Change-Id: I801ed594f0a51ed138bb0a413dfe52b74996bbc8
2021-06-29 16:35:54 +00:00
Jan Tomljanovic
5a67cd9bf2 Merge "Enable controllers to use a custom key." into sc-dev am: 2b8678c5d4 am: d8ab97081b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15101190

Change-Id: Ic16390ae04fa0cfd939a0e860669b7a87c4a4adc
2021-06-29 16:27:17 +00:00
Jan Tomljanovic
fcf8555515 Merge "Enable controllers to use a custom key." into sc-dev am: 2b8678c5d4 am: 1384459fde
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15101190

Change-Id: Ia52adebb133935e95e66696da0fe530694a72d7d
2021-06-29 16:26:56 +00:00
Jan Tomljanovic
9d7cff7532 Merge "Enable controllers to use a custom key." into sc-dev am: 2b8678c5d4 am: b91878940e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15101190

Change-Id: Ieb4978ed3d1467afaff9473a7cceb34d3dcca002
2021-06-29 16:26:46 +00:00
Jan Tomljanovic
1384459fde Merge "Enable controllers to use a custom key." into sc-dev am: 2b8678c5d4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15101190

Change-Id: I310df83f7a96e4f12c559ff47cf6b595c5c5291d
2021-06-29 16:19:00 +00:00
Jan Tomljanovic
b91878940e Merge "Enable controllers to use a custom key." into sc-dev am: 2b8678c5d4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15101190

Change-Id: I97627ab436e0fd93b65a473b4fd6e86f009887f0
2021-06-29 16:18:16 +00:00
Jan Tomljanovic
d8ab97081b Merge "Enable controllers to use a custom key." into sc-dev am: 2b8678c5d4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15101190

Change-Id: If128e463dd8d4886d94bd41ed457b8c02eac8e93
2021-06-29 16:18:13 +00:00
Jan Tomljanovic
2b8678c5d4 Merge "Enable controllers to use a custom key." into sc-dev 2021-06-29 16:02:55 +00:00
TreeHugger Robot
fe4e0a0cbe Merge "[Provider Model] Fix the "Cancel" button issue in the reminder dialog" into sc-dev am: a375349c0a am: ed8c6b358b am: b1c41c0b61
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15135719

Change-Id: Ib18634830acc4ef96a3c22c666b8d3c6cf6eb96d
2021-06-29 13:53:03 +00:00
TreeHugger Robot
eeee4b55a2 Merge "[Provider Model] Hide Connectivity Subsystems when recovering" into sc-dev am: 80fd8a7cce am: 0c0eb5e6e2 am: 930ca026db
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15124033

Change-Id: I1f748c406e5059a4315d91fe6e6a45f53c76c1ee
2021-06-29 13:52:58 +00:00
TreeHugger Robot
2183efe796 Merge "Fix the multiple instences of NetworkProviderSettingsActivity issue" into sc-dev am: b121a52359 am: 31abfa4b1b am: 7e987da903
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15135727

Change-Id: I70076254f726a38eadf435274fd53f02bd688148
2021-06-29 13:52:51 +00:00
TreeHugger Robot
fe24f36634 Merge "[Provider Model] Fix the "Cancel" button issue in the reminder dialog" into sc-dev am: a375349c0a am: ba2a3a8e09 am: 825811a9b4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15135719

Change-Id: Ie1bdc5b2e0882935cd70a0568fd22c8310ce0432
2021-06-29 13:52:44 +00:00
TreeHugger Robot
34398b34cf Merge "[Provider Model] Hide Connectivity Subsystems when recovering" into sc-dev am: 80fd8a7cce am: 19fe74f9af am: 5ec625631b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15124033

Change-Id: I9ee7e97176960207dab7f351fa5c10df41c3ae96
2021-06-29 13:52:21 +00:00
TreeHugger Robot
f13f4bd24e Merge "Fix the multiple instences of NetworkProviderSettingsActivity issue" into sc-dev am: b121a52359 am: 61c5877a26 am: a6c8b9f837
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15135727

Change-Id: I14e71c52fd29977c630019af73026d3465e68803
2021-06-29 13:51:52 +00:00
TreeHugger Robot
b1c41c0b61 Merge "[Provider Model] Fix the "Cancel" button issue in the reminder dialog" into sc-dev am: a375349c0a am: ed8c6b358b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15135719

Change-Id: I0f91d3ca23c16548d9f3dc94d6c67e036636aa4b
2021-06-29 13:40:26 +00:00
TreeHugger Robot
930ca026db Merge "[Provider Model] Hide Connectivity Subsystems when recovering" into sc-dev am: 80fd8a7cce am: 0c0eb5e6e2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15124033

Change-Id: Icfe588c89b66080d3799a16591d4411dd99f9315
2021-06-29 13:40:20 +00:00
TreeHugger Robot
7e987da903 Merge "Fix the multiple instences of NetworkProviderSettingsActivity issue" into sc-dev am: b121a52359 am: 31abfa4b1b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15135727

Change-Id: I983f6e8adaa06d6143b59bb835ea38c549a089b3
2021-06-29 13:40:05 +00:00
TreeHugger Robot
825811a9b4 Merge "[Provider Model] Fix the "Cancel" button issue in the reminder dialog" into sc-dev am: a375349c0a am: ba2a3a8e09
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15135719

Change-Id: I902c54716904c50c9e782a2d90f1c600a27823c0
2021-06-29 13:39:38 +00:00
TreeHugger Robot
5ec625631b Merge "[Provider Model] Hide Connectivity Subsystems when recovering" into sc-dev am: 80fd8a7cce am: 19fe74f9af
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15124033

Change-Id: Ic95449de889dab619bd64021e6ff75a39ee59756
2021-06-29 13:39:35 +00:00
TreeHugger Robot
a6c8b9f837 Merge "Fix the multiple instences of NetworkProviderSettingsActivity issue" into sc-dev am: b121a52359 am: 61c5877a26
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15135727

Change-Id: I9806c7a00dac4321f84a599822524f91f604d842
2021-06-29 13:39:30 +00:00
TreeHugger Robot
555f390b69 Merge "[Provider Model] Fix the "Cancel" button issue in the reminder dialog" into sc-dev am: a375349c0a am: a1743644bd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15135719

Change-Id: Idbee65ea3b5e20e1ac743e7dcf6c40b2c9fcc645
2021-06-29 13:39:28 +00:00
TreeHugger Robot
1d69f1c0e1 Merge "[Provider Model] Hide Connectivity Subsystems when recovering" into sc-dev am: 80fd8a7cce am: 2a56929f62
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15124033

Change-Id: I4e76656f5cfefe4dca6a432929e9c8ac756c34db
2021-06-29 13:39:21 +00:00
TreeHugger Robot
49ab6f7ba5 Merge "Fix the multiple instences of NetworkProviderSettingsActivity issue" into sc-dev am: b121a52359 am: 87baaeb505
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15135727

Change-Id: I1d3fd2c6ded732e4815d0c5dc913fbd11a205a07
2021-06-29 13:39:08 +00:00
TreeHugger Robot
ba2a3a8e09 Merge "[Provider Model] Fix the "Cancel" button issue in the reminder dialog" into sc-dev am: a375349c0a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15135719

Change-Id: I86985727346a7c0e6cfd3e8876d9b6b5a5541809
2021-06-29 13:26:14 +00:00
TreeHugger Robot
19fe74f9af Merge "[Provider Model] Hide Connectivity Subsystems when recovering" into sc-dev am: 80fd8a7cce
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15124033

Change-Id: Ib48c4e0e5a1199702bec018e79d043c9cbe89f6b
2021-06-29 13:26:10 +00:00
TreeHugger Robot
61c5877a26 Merge "Fix the multiple instences of NetworkProviderSettingsActivity issue" into sc-dev am: b121a52359
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15135727

Change-Id: I6330137e9a33d7eea27b6a2993571c6c611528bc
2021-06-29 13:26:05 +00:00
TreeHugger Robot
a1743644bd Merge "[Provider Model] Fix the "Cancel" button issue in the reminder dialog" into sc-dev am: a375349c0a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15135719

Change-Id: I880b69aaa223899c7838a11d257bdcb164d2abfa
2021-06-29 13:25:28 +00:00
TreeHugger Robot
2a56929f62 Merge "[Provider Model] Hide Connectivity Subsystems when recovering" into sc-dev am: 80fd8a7cce
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15124033

Change-Id: I41129960093a168d8e4683a8aa3a548b87a18419
2021-06-29 13:25:23 +00:00
TreeHugger Robot
87baaeb505 Merge "Fix the multiple instences of NetworkProviderSettingsActivity issue" into sc-dev am: b121a52359
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15135727

Change-Id: Idf7b4b486dbc2066a9a7d7e85af5969fdf9de204
2021-06-29 13:25:18 +00:00
TreeHugger Robot
ed8c6b358b Merge "[Provider Model] Fix the "Cancel" button issue in the reminder dialog" into sc-dev am: a375349c0a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15135719

Change-Id: I0812260ec7ca5c4e27e40ed0b3cbd725f1024f7c
2021-06-29 13:24:49 +00:00
TreeHugger Robot
0c0eb5e6e2 Merge "[Provider Model] Hide Connectivity Subsystems when recovering" into sc-dev am: 80fd8a7cce
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15124033

Change-Id: I224d04fcf4afb0596e3910673582f68aa0088192
2021-06-29 13:24:42 +00:00
TreeHugger Robot
31abfa4b1b Merge "Fix the multiple instences of NetworkProviderSettingsActivity issue" into sc-dev am: b121a52359
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15135727

Change-Id: I3aebcdad1bd6e81aa648562edaa043e5d007117e
2021-06-29 13:24:31 +00:00
TreeHugger Robot
a375349c0a Merge "[Provider Model] Fix the "Cancel" button issue in the reminder dialog" into sc-dev 2021-06-29 13:13:04 +00:00
TreeHugger Robot
80fd8a7cce Merge "[Provider Model] Hide Connectivity Subsystems when recovering" into sc-dev 2021-06-29 13:11:14 +00:00
TreeHugger Robot
b121a52359 Merge "Fix the multiple instences of NetworkProviderSettingsActivity issue" into sc-dev 2021-06-29 13:10:54 +00:00
Wesley Wang
9bd02f8b58 Merge "Remove unnecessary converting us to ms in BatteryInfo" am: f4ababa50b am: 8d7f25430b am: 8ca39b70d0 am: 4cd9b740a3
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1749740

Change-Id: I373fd285b82bd95d765f849b141ab2d995ae1929
2021-06-29 10:29:52 +00:00
TreeHugger Robot
38eeb31e27 Merge "Improve pointerSpeedPreference a11y content description" into sc-dev am: c8abbc4d8d am: 1e3e91945e am: 61b99d2670
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15126432

Change-Id: Ib6b18468f21074cc7a5ef9099b7d344f73429379
2021-06-29 10:29:46 +00:00
Stanley Wang
23e15ab440 Merge "Fix the problem that the ToggleSubscriptionDialogActivity appears twice when switch changed." into sc-dev am: 09134b237c am: c07f4dfd38 am: 6557eb9dd2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15093552

Change-Id: Iaae75e1e189305d2b59bbdc22d2892eb1ed99ab2
2021-06-29 10:29:40 +00:00