Commit Graph

102122 Commits

Author SHA1 Message Date
Bill Yi
22a01ff15e Merge changes from topic "presubmit-am-13220b28dc894f18bfa659ed22407a5c" into tm-dev am: 7702e0efbc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17353734

Change-Id: Ib81820c43345ff7287465cf2789739452d48cd21
2022-03-24 15:49:30 +00:00
Bill Yi
7fe94b8369 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: f2b3e82be3 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I23c8d8fb149017df8fc043c2cfce78b7d6f58687
2022-03-24 15:49:16 +00:00
Bill Yi
319bd78f00 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ab0bfefb6c -s ours
am skip reason: subject contains skip directive

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

Change-Id: I82f983fa370683250f0d288e54399540c8e5b766
2022-03-24 15:49:00 +00:00
Bill Yi
6141b22325 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 4480b8c160 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I60e56f55378c2f2666b33aba1bcaf873b4b3695c
2022-03-24 15:48:56 +00:00
Bill Yi
50f176dc7f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c2e03b0a34 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I214d5d5a583610246a5e14998fa43e7cd3d745e8
2022-03-24 15:48:52 +00:00
Bill Yi
7919cd24cb Merge changes from topic "presubmit-am-13220b28dc894f18bfa659ed22407a5c" into tm-mainline-prod am: de5db762b9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17353734

Change-Id: I0aacfd6fd0c7cf902fc4d1b72250ef1a42024f7a
2022-03-24 15:48:44 +00:00
Bill Yi
702726b042 Merge changes from topic "presubmit-am-506ed0de8ea142bfad638ac768dad4cd" into tm-mainline-prod am: 79cc005ee3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17352026

Change-Id: I3c15656e901f8bbcc90fd6ce484c45556925eb0c
2022-03-24 15:48:34 +00:00
Bill Yi
20edf5e0eb [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: ffae5712b4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I111985b8e39e8dd78cd2f8be72d3738f34a4d9d6
2022-03-24 15:48:15 +00:00
Bill Yi
21377c29a1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 752d4d5d72 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6b29a66c010bf94a5d2aeb1921948231f3283d81
2022-03-24 15:48:04 +00:00
Bill Yi
d96b66598b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e2bd7d9886 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id0763fa2379eb008db7ff39ba8bd781b0fcc18f2
2022-03-24 15:47:57 +00:00
Bill Yi
9245907454 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: ffae5712b4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7cd65f3567fb967ee2f413c41d718ed534d97bdd
2022-03-24 15:47:57 +00:00
Bill Yi
c3cba53dfd [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: a2aacc0aac am: 5a15b32995 -s ours
am skip reason: subject contains skip directive

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

Change-Id: If0c08275a0d9d45646cfd7b5d035bf66824aff6e
2022-03-24 15:47:44 +00:00
Bill Yi
4480b8c160 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2022-03-24 15:34:45 +00:00
Bill Yi
a3085b407f Merge "Import translations. DO NOT MERGE ANYWHERE" 2022-03-24 15:31:37 +00:00
Bill Yi
952e19e324 Merge "Import translations. DO NOT MERGE ANYWHERE" 2022-03-24 15:31:00 +00:00
Bill Yi
752d4d5d72 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2022-03-24 15:30:38 +00:00
Bill Yi
d91297b13a Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2022-03-24 15:26:09 +00:00
Bill Yi
e459f96c51 Merge changes from topic "presubmit-am-657b7840e5794e0fb9c6510cdf202ded"
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2aec804097
  Import translations. DO NOT MERGE ANYWHERE
2022-03-24 15:26:09 +00:00
Bill Yi
f2b3e82be3 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2022-03-24 15:25:55 +00:00
Bill Yi
8d8253a1a7 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-03-24 15:24:20 +00:00
Bill Yi
7702e0efbc Merge changes from topic "presubmit-am-13220b28dc894f18bfa659ed22407a5c" into tm-dev
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: ff73238f91
  Import translations. DO NOT MERGE ANYWHERE
2022-03-24 15:23:51 +00:00
Bill Yi
de5db762b9 Merge changes from topic "presubmit-am-13220b28dc894f18bfa659ed22407a5c" into tm-mainline-prod
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: ff73238f91 2p: d8a0564189
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: ff73238f91
  Import translations. DO NOT MERGE ANYWHERE
2022-03-24 15:23:51 +00:00
Bill Yi
753a3079ee Merge changes from topic "presubmit-am-13220b28dc894f18bfa659ed22407a5c"
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d8a0564189 2p: bb28476c84
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: ff73238f91 2p: d8a0564189
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: ff73238f91
  Import translations. DO NOT MERGE ANYWHERE
2022-03-24 15:23:51 +00:00
Bill Yi
79cc005ee3 Merge changes from topic "presubmit-am-506ed0de8ea142bfad638ac768dad4cd" into tm-mainline-prod
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 70d210b974
  Import translations. DO NOT MERGE ANYWHERE
2022-03-24 15:23:29 +00:00
Bill Yi
ffae5712b4 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-03-24 15:23:29 +00:00
Bill Yi
50b7955679 Merge changes from topic "presubmit-am-506ed0de8ea142bfad638ac768dad4cd"
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 70d210b974 2p: 03a0e1f76e
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 70d210b974
  Import translations. DO NOT MERGE ANYWHERE
2022-03-24 15:23:29 +00:00
PETER LIANG
795aee9ac5 Merge "Fix that strings have the similar color as the background in preview section." into tm-dev am: 03ecb4f4a6 am: 796ecbc7bb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17341687

Change-Id: Ic2154c0c984a5cca83e033f2dd4edffd053979cc
2022-03-24 14:02:04 +00:00
PETER LIANG
796ecbc7bb Merge "Fix that strings have the similar color as the background in preview section." into tm-dev am: 03ecb4f4a6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17341687

Change-Id: Ife1aaa337d4c9ac47a424256c32eb7548d6f6d3d
2022-03-24 13:44:29 +00:00
PETER LIANG
9f5b50644e Merge "Fix that strings have the similar color as the background in preview section." into tm-dev am: 03ecb4f4a6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17341687

Change-Id: Iee50c8fb778fc88803b3f6f373fc138df546b8ea
2022-03-24 13:44:16 +00:00
TreeHugger Robot
1d1bf5a7c4 Merge "Update enable toggle processing." into tm-dev am: e6b4297cc3 am: 4e5dd0de9e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17262737

Change-Id: Ia773839dd8e7a42bfb05cfc25ed4a67cc84ec114
2022-03-24 13:41:31 +00:00
PETER LIANG
03ecb4f4a6 Merge "Fix that strings have the similar color as the background in preview section." into tm-dev 2022-03-24 13:41:05 +00:00
TreeHugger Robot
6af48e515d Merge changes from topic "presubmit-am-fcba31f692964114b53e9fb9168a57af" into tm-mainline-prod am: 2e2b5e1e1e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17262737

Change-Id: If1463556016a77956a2b4fe6be5a04225d132fec
2022-03-24 13:40:39 +00:00
TreeHugger Robot
b2bd9e78d4 Merge "Update enable toggle processing." into tm-dev am: e6b4297cc3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17262737

Change-Id: I0244eceeacb3262a35bdd288bbbc6e8246983538
2022-03-24 13:39:02 +00:00
TreeHugger Robot
4e5dd0de9e Merge "Update enable toggle processing." into tm-dev am: e6b4297cc3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17262737

Change-Id: Ie38f09b199b8a833432cf02a386139c2c6cc7cdd
2022-03-24 13:38:00 +00:00
Kedar Chitnis
993371d476 Merge "Revert "Guest mode UX flow updates to user settings"" 2022-03-24 13:25:21 +00:00
TreeHugger Robot
e6b4297cc3 Merge "Update enable toggle processing." into tm-dev 2022-03-24 13:20:57 +00:00
TreeHugger Robot
2e2b5e1e1e Merge changes from topic "presubmit-am-fcba31f692964114b53e9fb9168a57af" into tm-mainline-prod
* changes:
  [automerge] Update enable toggle processing. 2p: 058796b7eb
  Update enable toggle processing.
2022-03-24 13:20:57 +00:00
TreeHugger Robot
815af402fc Merge changes from topic "presubmit-am-fcba31f692964114b53e9fb9168a57af"
* changes:
  [automerge] Update enable toggle processing. 2p: 058796b7eb 2p: 9b0a2c7612
  [automerge] Update enable toggle processing. 2p: 058796b7eb
  Update enable toggle processing.
2022-03-24 13:20:57 +00:00
Kedar Chitnis
ed45e8c56a Revert "Guest mode UX flow updates to user settings"
Revert submission 16545010-kedarc-ephemeral-guest

Reason for revert: A conflicting CL got merged after presubmits were triggerred, will rebase and push again
Reverted Changes:
I86a5a1571:Guest mode updates to resolve privacy concerns in ...
I7cf205883:Guest mode UX flow updates to user settings

Change-Id: Ia09ab082bb7088831d81e10fd555cecfc8b239f3
2022-03-24 12:45:25 +00:00
Yasin Kilicdere
016cc1e811 Merge "Singularization of duplicated multi user strings." into tm-dev am: b724929454 am: 49003ed77f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17246083

Change-Id: I67de7f1f085573358c64450a152f52611bc4eb2f
2022-03-24 12:28:40 +00:00
Yasin Kilicdere
49003ed77f Merge "Singularization of duplicated multi user strings." into tm-dev am: b724929454
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17246083

Change-Id: I0c19242b2fbf1d3c7a3d0efacca95f90149e9b90
2022-03-24 12:22:52 +00:00
Yasin Kilicdere
4cf64ee736 Merge changes from topic "[settings] duplicated-multiuser-strings" into tm-mainline-prod am: e6ae1dbe4d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17246083

Change-Id: Ic84d42475b156cfb4ac8f1f2220abf11042f6605
2022-03-24 12:22:45 +00:00
Yasin Kilicdere
7b2da1134e Merge "Singularization of duplicated multi user strings." into tm-dev am: b724929454
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17246083

Change-Id: I4a930794f2f63190437273dcae18a2159f862d24
2022-03-24 12:21:20 +00:00
Weng Su
b844a7a920 Fix Wi-Fi hotspot switch UI issue
- The Wi-Fi hotspot switch only handles the click event from the UI.

- Use the onSwitchChanged callback to handle click and swipe events.

Bug: 218891956
Test: manual test
make RunSettingsRoboTests \
  ROBOTEST_FILTER=WifiTetherSwitchBarControllerTest

Change-Id: Ie4136443845489be295a8ee0f3058f493a3b5829
2022-03-24 20:09:29 +08:00
Yasin Kilicdere
b724929454 Merge "Singularization of duplicated multi user strings." into tm-dev 2022-03-24 12:03:29 +00:00
Yasin Kilicdere
e6ae1dbe4d Merge changes from topic "[settings] duplicated-multiuser-strings" into tm-mainline-prod
* changes:
  [automerge] Singularization of duplicated multi user strings. 2p: 4564bce03c
  Singularization of duplicated multi user strings.
2022-03-24 12:03:29 +00:00
Yasin Kilicdere
442f94b1a6 Merge changes from topic "[settings] duplicated-multiuser-strings"
* changes:
  [conflict] Singularization of duplicated multi user strings. 2p: 4564bce03c 2p: 39ef1579ef
  [automerge] Singularization of duplicated multi user strings. 2p: 4564bce03c
  Singularization of duplicated multi user strings.
2022-03-24 12:03:29 +00:00
Kedar Chitnis
c33384d653 Merge "Guest mode UX flow updates to user settings" 2022-03-24 11:55:17 +00:00
TreeHugger Robot
5dbf3b17cf Merge "Update data_usage_bytes_editor spinner background" into tm-dev am: d1c349c572 am: 17e6118c96
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17312731

Change-Id: I6aecb0c1932bd5c2f8ac3604968a71fefc10ea11
2022-03-24 11:09:45 +00:00
TreeHugger Robot
6a2a6479e3 Merge "Enhance Settings deep link transition" into tm-dev am: 73d2d07d1e am: 6f5e9072ae
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17290004

Change-Id: I68398f2d02efd5eb457c44a92eb9ce77278e1efd
2022-03-24 11:09:04 +00:00