Commit Graph

23575 Commits

Author SHA1 Message Date
Joe Bolinger
483b89c575 Merge changes from topic "unicorn-1" into sc-dev am: 0fcac8bf0d am: 30c3003696
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14972492

Change-Id: If760363bf2408e2a8aceb6183242c14386f98e65
2021-06-18 17:03:47 +00:00
Joe Bolinger
30c3003696 Merge changes from topic "unicorn-1" into sc-dev am: 0fcac8bf0d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14972492

Change-Id: I717e9492acf3f3ba054c79f0d807606e7c294e98
2021-06-18 16:41:58 +00:00
Joe Bolinger
0fcac8bf0d Merge changes from topic "unicorn-1" into sc-dev
* changes:
  Update strings for parental consent flow in setup wizard.
  Add plumbing and placeholder screens for parental consent flow.
2021-06-18 16:28:27 +00:00
SongFerng Wang
90602b73d1 Merge "Add the confirmation dialog when user disable mobile data at first time" into sc-dev am: 7e4b664df0 am: efcce7f70f am: 001395533a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15001650

Change-Id: I698df31c58cf3e545b53a48da5225dd2bc703925
2021-06-18 09:59:07 +00:00
SongFerng Wang
952e1e83d9 Merge "Add the confirmation dialog when user disable mobile data at first time" into sc-dev am: 7e4b664df0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15001650

Change-Id: I52d174530009f6f90fb15d4348291f2a6311fcd5
2021-06-18 09:50:52 +00:00
SongFerng Wang
001395533a Merge "Add the confirmation dialog when user disable mobile data at first time" into sc-dev am: 7e4b664df0 am: efcce7f70f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15001650

Change-Id: I53b5181da7fb682b00ad628b5df0b4e71d13a64f
2021-06-18 09:49:55 +00:00
SongFerng Wang
efcce7f70f Merge "Add the confirmation dialog when user disable mobile data at first time" into sc-dev am: 7e4b664df0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15001650

Change-Id: Id7c7674718446ae42f0280d7632d7a05a7d93ebb
2021-06-18 09:40:56 +00:00
SongFerng Wang
7e4b664df0 Merge "Add the confirmation dialog when user disable mobile data at first time" into sc-dev 2021-06-18 09:38:18 +00:00
PETER LIANG
a67e5a1c1d Merge "Update the Lottie images for Accessibility features." into sc-dev am: 909e3bbccf am: 07300f7a0f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14999190

Change-Id: I2f2aa66cc8e1df36fa88e10a78a70d242298f0cf
2021-06-18 08:56:22 +00:00
PETER LIANG
d412e4f1bf Merge "Update the Lottie images for Accessibility features." into sc-dev am: 909e3bbccf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14999190

Change-Id: I469b93b326f939cc6d9e8e299b8f58666514feeb
2021-06-18 08:48:00 +00:00
PETER LIANG
5883cbebdb Merge "Update the Lottie images for Accessibility features." into sc-dev am: 909e3bbccf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14999190

Change-Id: Iba20a0eb36026c2f72070ad22d2fed3c382b9453
2021-06-18 08:47:13 +00:00
PETER LIANG
07300f7a0f Merge "Update the Lottie images for Accessibility features." into sc-dev am: 909e3bbccf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14999190

Change-Id: I556deb4f2a13894af669750d4d77214c52ed6cfc
2021-06-18 08:46:53 +00:00
PETER LIANG
909e3bbccf Merge "Update the Lottie images for Accessibility features." into sc-dev 2021-06-18 08:32:55 +00:00
SongFerngWang
c9a9faf5b8 Add the confirmation dialog when user disable mobile data at first time
Bug: 189983549
Test: atest ProviderModelSliceTest
Change-Id: I83fcadb07e4f8dff5d07bc4015c0c6004c4f5de5
2021-06-18 15:58:58 +08:00
Peter_Liang
3d1f4eab3f Update the Lottie images for Accessibility features.
Features:
1.Time to take action
2.Extra dim

Bug: 186065724
Test: manual test
Change-Id: Ia1a6dbd703545ce70310d8c076e6ac4079a08daa
2021-06-18 14:01:49 +08:00
Menghan Li
39826881b1 Merge "Add strings for use accessibility gesture" into sc-dev am: 7159bd4330 am: 09f24b05a5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016135

Change-Id: I55a63307bf98f4566b4685c27e2f2afb80495af7
2021-06-18 04:29:55 +00:00
Menghan Li
add465f4b1 Merge "Add strings for use accessibility gesture" into sc-dev am: 7159bd4330
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016135

Change-Id: I39e921d220af9a3c9029fd717910ad48865fa58b
2021-06-18 04:17:45 +00:00
Menghan Li
a8f639f6df Merge "Add strings for use accessibility gesture" into sc-dev am: 7159bd4330
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016135

Change-Id: I1771c20a4dc490f5cc125d78199e8cb209190924
2021-06-18 04:17:01 +00:00
Menghan Li
09f24b05a5 Merge "Add strings for use accessibility gesture" into sc-dev am: 7159bd4330
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016135

Change-Id: Ic731068c14a32bf3acbf4c746bd992c49752b0af
2021-06-18 04:16:57 +00:00
Menghan Li
7159bd4330 Merge "Add strings for use accessibility gesture" into sc-dev 2021-06-18 04:07:12 +00:00
menghanli
d013763aac Add strings for use accessibility gesture
Bug: 190563948
Test: Manual test
Change-Id: Idbd796d3102d404341a0b75b406151e4f0bd57fd
2021-06-18 10:48:47 +08:00
TreeHugger Robot
0e809b8b40 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2021-06-18 01:25:06 +00:00
TreeHugger Robot
77e40459d7 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2021-06-18 01:19:50 +00:00
TreeHugger Robot
a7703602b0 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-06-18 01:07:32 +00:00
TreeHugger Robot
a23758349e Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-06-18 01:06:12 +00:00
Bill Yi
08386bd061 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I1f25f1144169f8b43cd6154d9e63a56f1a00823e
2021-06-17 23:57:02 +00:00
Bill Yi
1809285e19 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ieae8de32be4db5d051cab939e23327b3f533cb8f
2021-06-17 23:53:26 +00:00
Peter Wang
b9bb8254e7 Merge "Use ICU style for choose_sim_text to handle special cases in RU" into sc-dev am: 2c5788b533 am: 307c47eb16
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14942801

Change-Id: If43af6f6d3005214a800daa2b446c4900a35b089
2021-06-17 22:46:58 +00:00
Peter Wang
70fec74fe6 Merge "Use ICU style for choose_sim_text to handle special cases in RU" into sc-dev am: 2c5788b533
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14942801

Change-Id: Id08d349c376211cb3530009945c58cdcd31b0f46
2021-06-17 22:27:19 +00:00
Peter Wang
2c5788b533 Merge "Use ICU style for choose_sim_text to handle special cases in RU" into sc-dev 2021-06-17 22:14:50 +00:00
Bill Yi
d2b3465c91 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ie592748281a9b71c92a89a4051249a1e1960d21f
2021-06-17 15:07:01 -07:00
Bill Yi
5cc770aba5 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I63596bc5b219e1992b38afcb6ebdfdf5e28d3ae0
2021-06-17 15:03:16 -07:00
Joe Bolinger
4af5a3644d Update strings for parental consent flow in setup wizard.
Bug: 188847063
Test: manual
Change-Id: I044be874818f6563a47c3f7c8c5011b3cab31ae9
2021-06-17 14:53:56 -07:00
Julia Reynolds
472f80cfd9 Merge "Add a11y text for disappearing preference" into sc-dev am: 848f7a8796 am: bd8cdf25af
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15013597

Change-Id: Idb581ab4966ad2fa3f141f0150f4b9bf5c8dec63
2021-06-17 16:36:11 +00:00
Julia Reynolds
35e339f6e3 Merge "Add a11y text for disappearing preference" into sc-dev am: 848f7a8796
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15013597

Change-Id: I15a1e3ca1492a82605db85d030548ed64865ab34
2021-06-17 16:21:23 +00:00
Sally Yuen
7e9dd59211 Merge "Add labels to intensity slider and flip labels" into sc-dev am: afd77763b9 am: a1c3689199
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14970080

Change-Id: Id25a4844c64f348127c7c92bcef3e8a82477c8bb
2021-06-17 16:06:13 +00:00
Julia Reynolds
848f7a8796 Merge "Add a11y text for disappearing preference" into sc-dev 2021-06-17 16:03:25 +00:00
Sally Yuen
9281ab108a Merge "Add labels to intensity slider and flip labels" into sc-dev am: afd77763b9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14970080

Change-Id: I94773c1e42aedeaad78cd8b539cdccb43591e336
2021-06-17 15:51:41 +00:00
Sally Yuen
afd77763b9 Merge "Add labels to intensity slider and flip labels" into sc-dev 2021-06-17 15:37:32 +00:00
Julia Reynolds
0d937afbb8 Add a11y text for disappearing preference
Test: Talkback
Fixes: 182241259
Change-Id: I99c1ce635c5717e22ee28bc86b51bd3be4b83d91
2021-06-17 14:28:35 +00:00
TreeHugger Robot
fe0d0b76d4 Merge "Fix dialog color problem in night mode." into sc-dev am: f026108de5 am: 352b6e1b24
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15008367

Change-Id: Icbd87ac0a3e0c2db497938d21746ddc0c9e5655e
2021-06-17 11:21:20 +00:00
TreeHugger Robot
b001f45b3a Merge "Fix dialog color problem in night mode." into sc-dev am: f026108de5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15008367

Change-Id: I7d06f1009b0f94bf2b8143416790e675493b1a0c
2021-06-17 11:16:40 +00:00
TreeHugger Robot
f026108de5 Merge "Fix dialog color problem in night mode." into sc-dev 2021-06-17 11:13:33 +00:00
TreeHugger Robot
cfc9742ed4 Merge "Fix Learn more link placement is wrong problem" into sc-dev am: 152a82ebb2 am: 890f113ca4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15008365

Change-Id: I71af6081f3705773408d2cc32acfa1055f4b1a9e
2021-06-17 11:12:21 +00:00
TreeHugger Robot
d921ba9f19 Merge "Fix Learn more link placement is wrong problem" into sc-dev am: 152a82ebb2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15008365

Change-Id: I9d6f994cbe95d1d747adc7a89c853724b91dc57a
2021-06-17 11:00:34 +00:00
TreeHugger Robot
152a82ebb2 Merge "Fix Learn more link placement is wrong problem" into sc-dev 2021-06-17 10:59:14 +00:00
Tsung-Mao Fang
1e8a907d91 Fix dialog color problem in night mode.
Assign the suface light and dark color for Dialog.

Test: Rebuilt apk, and see color works well on wifi dialog.
Fix: 190142194
Change-Id: I43d010c70e22639a29a571bfadb4351f41e1a240
2021-06-17 10:08:32 +00:00
Menghan Li
6852486ca0 Merge "Fix "Left" & "Right" in the wrong sides for LTR language" into sc-dev am: 88c518b2ca am: 9904d585ff
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14980889

Change-Id: I76f91938990e0beec3122862ed9254623aa0c05f
2021-06-17 09:27:16 +00:00
Menghan Li
8989c203fd Merge "Fix "Left" & "Right" in the wrong sides for LTR language" into sc-dev am: 88c518b2ca
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14980889

Change-Id: I890ff57a26978e113df381f15716cf4f5edb13f9
2021-06-17 09:15:01 +00:00
Menghan Li
88c518b2ca Merge "Fix "Left" & "Right" in the wrong sides for LTR language" into sc-dev 2021-06-17 09:00:39 +00:00