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
TreeHugger Robot
420a446be9
Merge "Update data_usage_bytes_editor spinner background" into tm-dev am: d1c349c572
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17312731
Change-Id: I03e7c7ba4ea33e133bddfb08eb762d75a732a3ab
2022-03-24 10:38:34 +00:00
TreeHugger Robot
17e6118c96
Merge "Update data_usage_bytes_editor spinner background" into tm-dev am: d1c349c572
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17312731
Change-Id: I24e99cd17f2427f1ea29c74b8d5fd60305080e00
2022-03-24 10:37:40 +00:00
TreeHugger Robot
2ddb627c77
Merge "Enhance Settings deep link transition" into tm-dev am: 73d2d07d1e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17290004
Change-Id: Ie78032f2edb7a3e0081b79cb95886f0c375d0a02
2022-03-24 10:37:14 +00:00
TreeHugger Robot
6f5e9072ae
Merge "Enhance Settings deep link transition" into tm-dev am: 73d2d07d1e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17290004
Change-Id: I2d60265473c2a785850d77cc38bd3603e60a5986
2022-03-24 10:36:40 +00:00
TreeHugger Robot
d1c349c572
Merge "Update data_usage_bytes_editor spinner background" into tm-dev
2022-03-24 10:28:17 +00:00
Philip Junker
860d07f4e8
Merge "Add special app access for turning on the screen." into tm-dev am: bf4878c877
am: ff5f6bb47f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17182673
Change-Id: If76fd2ddc0fe1f1314064c3db47e4834a3befaf9
2022-03-24 10:21:56 +00:00
TreeHugger Robot
73d2d07d1e
Merge "Enhance Settings deep link transition" into tm-dev
2022-03-24 10:16:46 +00:00
Philip Junker
ff5f6bb47f
Merge "Add special app access for turning on the screen." into tm-dev am: bf4878c877
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17182673
Change-Id: I7ef3eda5c9cc14fe03eb025750982d9696f5bec0
2022-03-24 10:07:20 +00:00
Philip Junker
c4648f276b
Merge "Add special app access for turning on the screen." into tm-dev am: bf4878c877
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17182673
Change-Id: Ia91f563137a21fe5628ca98564d2cc8669d52807
2022-03-24 10:07:12 +00:00
Philip Junker
bf4878c877
Merge "Add special app access for turning on the screen." into tm-dev
2022-03-24 10:02:49 +00:00
Betty Chang
0ce7b1df97
Merge "Move the QrCodeGenerator from Settings to SettingsLib for Wifi and BT" into tm-dev am: 0ef919db7e
am: 687a9405e9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17348585
Change-Id: If5a1d37ae658a17bdc61c5b24e93e948ce8bad5a
2022-03-24 09:23:05 +00:00
Yuri Ufimtsev
4c45e0d19b
Merge "Postpone getting Metrics Category until it is needed" into tm-dev am: bdf31dd9dd
am: e770b6a717
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17352025
Change-Id: Ic08c8d69ab5fe7960ea71cc680d1a01c5d6a33a7
2022-03-24 08:56:04 +00:00
TreeHugger Robot
e2b0da6d40
[automerger skipped] Merge "Moves battery saver warning message below Screen Attention setting." into tm-dev am: 5b9c125bb7
am: 309fc1b00c
-s ours
...
am skip reason: Merged-In Ib51a0d73c13700c981d1ca789d2ab669e57d814d with SHA-1 8edf692915
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17359096
Change-Id: I45fad9b1527b4b5afe3ba3108e47caf77402bae0
2022-03-24 08:55:50 +00:00
Yuri Ufimtsev
87ad62e7b3
Merge changes from topic "presubmit-am-828990c34a2f4d19a5e198e98437febc" into tm-mainline-prod am: 08e26559c4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17352025
Change-Id: I96b1ed099b79cc92d65c00f81d5dfe52698e32b4
2022-03-24 08:55:26 +00:00
Betty Chang
687a9405e9
Merge "Move the QrCodeGenerator from Settings to SettingsLib for Wifi and BT" into tm-dev am: 0ef919db7e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17348585
Change-Id: I0a4bdff9583b7a265e1a595947ad4fb2615b31c8
2022-03-24 08:48:37 +00:00
Betty Chang
5ff1a5e1d8
Merge "Move the QrCodeGenerator from Settings to SettingsLib for Wifi and BT" into tm-dev am: 0ef919db7e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17348585
Change-Id: I7413e9ecb53dc9326392097593d6363ebe5b16b4
2022-03-24 08:48:35 +00:00
Yuri Ufimtsev
e770b6a717
Merge "Postpone getting Metrics Category until it is needed" into tm-dev am: bdf31dd9dd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17352025
Change-Id: I1977142ab8d580b75f70b980c96d1d86fd77b258
2022-03-24 08:48:09 +00:00
Yuri Ufimtsev
cb838c8c8a
Merge "Postpone getting Metrics Category until it is needed" into tm-dev am: bdf31dd9dd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17352025
Change-Id: I58169e565030a05b13a932e5aabcf930b71800be
2022-03-24 08:47:59 +00:00
TreeHugger Robot
309fc1b00c
Merge "Moves battery saver warning message below Screen Attention setting." into tm-dev am: 5b9c125bb7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17359096
Change-Id: I6dedc6788f514ff518bff8b666ef9b6742dc04b8
2022-03-24 08:47:54 +00:00
TreeHugger Robot
32904462f6
[automerger skipped] Merge "Moves battery saver warning message below Screen Attention setting." into tm-dev am: 5b9c125bb7
-s ours
...
am skip reason: Merged-In Ib51a0d73c13700c981d1ca789d2ab669e57d814d with SHA-1 70128d9016
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17359096
Change-Id: Iddce69d48e133c8f104c9d94e8f33ee4b3b3f43c
2022-03-24 08:47:49 +00:00
Yi Jiang
ece863162c
[automerger skipped] Moves battery saver warning message below Screen Attention setting. am: 8edf692915
-s ours
...
am skip reason: Merged-In Ib51a0d73c13700c981d1ca789d2ab669e57d814d with SHA-1 70128d9016
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17359096
Change-Id: Iee7d56ad36129bcdcdf0f54af1751e462f80db00
2022-03-24 08:47:47 +00:00
Betty Chang
0ef919db7e
Merge "Move the QrCodeGenerator from Settings to SettingsLib for Wifi and BT" into tm-dev
2022-03-24 08:21:16 +00:00
Alan Huang
2f2b648693
Fix group cast volume slider not disabled after switching to group
...
devices.
Test: manual build and verify
Bug: 222443976
Change-Id: Ie9f126bb2f4cbc3c6148f41092ada4bfdfa29f99
2022-03-24 08:12:40 +00:00
Yuri Ufimtsev
08e26559c4
Merge changes from topic "presubmit-am-828990c34a2f4d19a5e198e98437febc" into tm-mainline-prod
...
* changes:
[automerge] Postpone getting Metrics Category until it is needed 2p: af22553089
Postpone getting Metrics Category until it is needed
2022-03-24 07:56:27 +00:00
Yuri Ufimtsev
bdf31dd9dd
Merge "Postpone getting Metrics Category until it is needed" into tm-dev
2022-03-24 07:56:27 +00:00