Yuri Ufimtsev
40c8b629c7
Merge "Remove title of Smart Lock / Trust Agents preference category" into tm-dev am: 4dcf05657e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17471746
Change-Id: I036943258043567991aa24d6d4a9665c42cc106f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-30 10:19:57 +00:00
Yuri Ufimtsev
4dcf05657e
Merge "Remove title of Smart Lock / Trust Agents preference category" into tm-dev
2022-03-30 10:03:52 +00:00
TreeHugger Robot
738644e2f1
Merge "Fix flickers on the Location page" into tm-dev am: a8eabc6ada
am: c9ea940a37
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17447104
Change-Id: Id4826a5bfeac089ffc0751b39c78b5c46d1d880a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-30 09:57:05 +00:00
TreeHugger Robot
c9ea940a37
Merge "Fix flickers on the Location page" into tm-dev am: a8eabc6ada
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17447104
Change-Id: Ia63428939b5f9329d3f59965391ce33d5888ec6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-30 09:34:22 +00:00
TreeHugger Robot
72d54f7007
Merge "Fix flickers on the Location page" into tm-dev am: a8eabc6ada
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17447104
Change-Id: If884b3bbc0449ce1e5a232d734fae35883470bf9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-30 09:34:17 +00:00
TreeHugger Robot
a8eabc6ada
Merge "Fix flickers on the Location page" into tm-dev
2022-03-30 09:17:53 +00:00
Jason Chiu
e60dd45156
Merge "Refine layouts for large screen" into tm-dev am: 51316c13a1
am: 187b39edc2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17374489
Change-Id: I525dbf313c7865746f33425a85052dc73a51f41e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-30 08:22:22 +00:00
Yuri Ufimtsev
075f6d8b2f
Merge "Fix typo in Preference definition for Security Advanced Settings" into tm-dev am: addc9c06bc
am: 4a7394041c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17474923
Change-Id: I9d0eeda10de700d276045afc5ad2bd8e925f7b48
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-30 08:22:12 +00:00
Anna Bauza
ee23152051
Fix "Remove Guest" option shows "Reset Guest" dialog
...
If the guest user was not auto created, removing the user from settings message was wrongly worded. Small refactor to reuse the same wording in different modules has been done.
Bug: 225314166
Test: manual
Change-Id: Ia1871efc6aeeb2d3604c2fc4fd98a2a3a500953b
2022-03-30 08:20:04 +00:00
Jason Chiu
187b39edc2
Merge "Refine layouts for large screen" into tm-dev am: 51316c13a1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17374489
Change-Id: I58366792b3bb490d5131b28b5218ef8486988971
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-30 08:13:57 +00:00
Jason Chiu
51316c13a1
Merge "Refine layouts for large screen" into tm-dev
2022-03-30 08:10:42 +00:00
Yuri Ufimtsev
4a7394041c
Merge "Fix typo in Preference definition for Security Advanced Settings" into tm-dev am: addc9c06bc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17474923
Change-Id: I5389c1897386eac6f23fc33e4f56ff71286cb392
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-30 08:06:13 +00:00
Yuri Ufimtsev
a800f1f9e7
Merge "Fix typo in Preference definition for Security Advanced Settings" into tm-dev am: addc9c06bc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17474923
Change-Id: I7a1d703af18bde8311e32190b3920fa6d3e2cbf3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-30 08:06:10 +00:00
Yuri Ufimtsev
b388ccfc70
Remove title of Smart Lock / Trust Agents preference category
...
Test: manual
Bug: 191735388
Change-Id: I49a0f8138dc06e4bc4ab945116bde5e2e83ffaff
2022-03-30 07:57:38 +00:00
Yuri Ufimtsev
addc9c06bc
Merge "Fix typo in Preference definition for Security Advanced Settings" into tm-dev
2022-03-30 07:48:16 +00:00
Weng Su
7f293907ee
[automerger skipped] Restrict secondary users to share Wi-Fi network am: 4c4a1f58c1
am: a30d123e12
am: 7abffe0057
am: 4026f4134f
-s ours am: 1c60264236
-s ours am: 76a3954c18
-s ours
...
am skip reason: Merged-In Ic434f0583cba557228c72508a501347ffa3141e1 with SHA-1 4c4a1f58c1
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17397180
Change-Id: Ifafce87dc3e2a2a1886c9e32cb5dcd96159b0abc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-30 07:27:01 +00:00
Weng Su
76a3954c18
[automerger skipped] Restrict secondary users to share Wi-Fi network am: 4c4a1f58c1
am: a30d123e12
am: 7abffe0057
am: 4026f4134f
-s ours am: 1c60264236
-s ours
...
am skip reason: Merged-In Ic434f0583cba557228c72508a501347ffa3141e1 with SHA-1 4c4a1f58c1
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17397180
Change-Id: Ie90a01f637e5b88aa7ad882443c329591d1baff0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-30 07:11:13 +00:00
Weng Su
ed743470a9
[automerger skipped] Restrict secondary users to share Wi-Fi network am: 4c4a1f58c1
am: a30d123e12
am: 7abffe0057
am: 4026f4134f
-s ours am: 1c60264236
-s ours
...
am skip reason: Merged-In Ic434f0583cba557228c72508a501347ffa3141e1 with SHA-1 4c4a1f58c1
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17397180
Change-Id: Ib9ba9792a2ee6f15118020ed1edc0ff0f2e5cb44
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-30 07:11:10 +00:00
Weng Su
198e2e6375
[automerger skipped] Restrict secondary users to share Wi-Fi network am: 4c4a1f58c1
am: 95ff0f1453
-s ours am: a2e5b7b7cb
-s ours am: 33138dfc48
-s ours
...
am skip reason: Merged-In Ic434f0583cba557228c72508a501347ffa3141e1 with SHA-1 876f691377
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17397180
Change-Id: I831cb162bb1db9f714b92139e3688bdccc4d01b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-30 07:04:22 +00:00
Weng Su
1c60264236
[automerger skipped] Restrict secondary users to share Wi-Fi network am: 4c4a1f58c1
am: a30d123e12
am: 7abffe0057
am: 4026f4134f
-s ours
...
am skip reason: Merged-In Ic434f0583cba557228c72508a501347ffa3141e1 with SHA-1 4c4a1f58c1
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17397180
Change-Id: Ia69461e39acae0c5a685b9901e1fc2b265ec1eb8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-30 06:56:02 +00:00
Weng Su
33138dfc48
[automerger skipped] Restrict secondary users to share Wi-Fi network am: 4c4a1f58c1
am: 95ff0f1453
-s ours am: a2e5b7b7cb
-s ours
...
am skip reason: Merged-In Ic434f0583cba557228c72508a501347ffa3141e1 with SHA-1 876f691377
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17397180
Change-Id: I2de07abbbdb4de1ff49a5ac497ab4d7b67db4080
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-30 06:41:26 +00:00
Weng Su
4a865ce7fc
[automerger skipped] Restrict secondary users to share Wi-Fi network am: 4c4a1f58c1
am: 95ff0f1453
-s ours am: a2e5b7b7cb
-s ours
...
am skip reason: Merged-In Ic434f0583cba557228c72508a501347ffa3141e1 with SHA-1 876f691377
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17397180
Change-Id: I8b22ff00a7d143673c9108264412ff72c731d5f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-30 06:41:18 +00:00
Weng Su
4026f4134f
Restrict secondary users to share Wi-Fi network am: 4c4a1f58c1
am: a30d123e12
am: 7abffe0057
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17397180
Change-Id: I17625880bf59eb632cc0dcdbc222c60a516d119e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-30 06:40:51 +00:00
Jason Hsu
a0524e53ad
Merge "Set title to the hearing aid pair instruction dialog" into tm-dev am: abd4fd54b1
am: 3f88b72bea
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17291806
Change-Id: I0942b354fc69207764ef671001907340335f1477
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-30 06:34:32 +00:00
Weng Su
7abffe0057
Restrict secondary users to share Wi-Fi network am: 4c4a1f58c1
am: a30d123e12
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17397180
Change-Id: If2619c93286363f268bb7021af1037195fcba4be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-30 06:26:59 +00:00
Weng Su
a2e5b7b7cb
[automerger skipped] Restrict secondary users to share Wi-Fi network am: 4c4a1f58c1
am: 95ff0f1453
-s ours
...
am skip reason: Merged-In Ic434f0583cba557228c72508a501347ffa3141e1 with SHA-1 876f691377
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17397180
Change-Id: Ic37d4df464b13fdc23737b1fec9ec9894718a693
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-30 06:26:53 +00:00
Jason Hsu
3f88b72bea
Merge "Set title to the hearing aid pair instruction dialog" into tm-dev am: abd4fd54b1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17291806
Change-Id: I5b2ee4e522c86d0494ef3587b9c551d790fd1098
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-30 06:19:31 +00:00
Jason Hsu
33a5139d0e
Merge "Set title to the hearing aid pair instruction dialog" into tm-dev am: abd4fd54b1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17291806
Change-Id: I5cfa8a58fb3a3f204b3978b473fe993091e9826a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-30 06:17:46 +00:00
Weng Su
a30d123e12
Restrict secondary users to share Wi-Fi network am: 4c4a1f58c1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17397180
Change-Id: I4d1bf49f4eab2ce72148cd308b5c217d814ab75c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-30 06:11:32 +00:00
Weng Su
95ff0f1453
Restrict secondary users to share Wi-Fi network am: 4c4a1f58c1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17397180
Change-Id: I28a8e979130dc61c3cfdbe5b90bfc8ad905d1d35
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-30 06:10:23 +00:00
Jason Hsu
abd4fd54b1
Merge "Set title to the hearing aid pair instruction dialog" into tm-dev
2022-03-30 06:03:00 +00:00
Jason Chiu
680fce3acd
Refine layouts for large screen
...
- Support dynamic paddings depending on app's screen width
- Add round corners to homepage ripple effect to improve the transition
of being highlighted
- Add an interface to support dynamic split layout for suggestion cards
Bug: 223300824
Test: robotest, manual
Change-Id: Iaca6b4fd3f7369179416ef084a800d7eb2ee4640
2022-03-30 04:54:30 +00:00
Kevin Han
23a0d79e4c
Merge "Update hibernation toggle title to have "if unused"" into tm-dev am: c4c923d1eb
am: 1f21417702
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17450694
Change-Id: I6743175adf787a662466781bb6b87186aff1a5de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-29 20:13:39 +00:00
Kevin Han
1f21417702
Merge "Update hibernation toggle title to have "if unused"" into tm-dev am: c4c923d1eb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17450694
Change-Id: Ic478dc38f408b02762afbac4539d9b7e5ee61e51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-29 19:30:03 +00:00
Kevin Han
1ffe33ed78
Merge "Update hibernation toggle title to have "if unused"" into tm-dev am: c4c923d1eb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17450694
Change-Id: I81709e0acbdc0a9cf75d2dc7020b87e6df6f91f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-29 19:18:25 +00:00
Kevin Han
959e5796b3
[automerge] Update hibernation toggle title to have "if unused" 2p: 3cfc87cc05
am: 03a87f460b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17450694
Change-Id: Iae410252fc9f1fb809bbbaf1d0b516fffbff1439
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-29 19:17:51 +00:00
Kevin Han
c4c923d1eb
Merge "Update hibernation toggle title to have "if unused"" into tm-dev
2022-03-29 18:55:35 +00:00
TreeHugger Robot
d60e7161fd
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 1f881c6e86
-s ours am: 8c6668cd03
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17463092
Change-Id: I95b6265ed61b739aca160e0ebf166ac9a7e2e9a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-29 18:54:43 +00:00
Bill Yi
a17944a0e6
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ac9baaee08
-s ours am: 346d3a8459
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17463092
Change-Id: I44e5cbfd6ad67066b01518d19e1c3d296c1a138b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-29 18:54:39 +00:00
Kevin Han
03a87f460b
[automerge] Update hibernation toggle title to have "if unused" 2p: 3cfc87cc05
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17450694
Bug: 227235454
Change-Id: I61350d752c0324b3672193dcbbf364f4696ec786
2022-03-29 18:38:18 +00:00
TreeHugger Robot
7e82f77aed
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 1f881c6e86
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17463092
Change-Id: I1a74afc8b96709b225c760986ae3bdcb215f6713
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-29 18:18:21 +00:00
Bill Yi
c15c29851a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ac9baaee08
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17463092
Change-Id: I08938b246f731d42fbe481a554eb275e7b38e13f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-29 18:18:08 +00:00
TreeHugger Robot
8c6668cd03
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 1f881c6e86
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17463092
Change-Id: I7e50a31578e4289e72d932fc9df3edb4e8297150
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-29 18:17:31 +00:00
Bill Yi
346d3a8459
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ac9baaee08
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17463092
Change-Id: I27cc7eb93246429765820f51c926f12a72a4adfe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-29 18:17:30 +00:00
TreeHugger Robot
7a387514d8
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 3c7d6ac0e5
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17463644
Change-Id: Ia42e9687c386dd2828fce0b4b2904508ff9adf11
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-29 18:10:43 +00:00
Bill Yi
8973feec74
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b387657974
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17463644
Change-Id: I9e146b75a399d0523b4df567931d98a391d94270
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-29 18:10:23 +00:00
TreeHugger Robot
1f881c6e86
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
2022-03-29 17:54:31 +00:00
TreeHugger Robot
3c7d6ac0e5
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod
2022-03-29 17:51:45 +00:00
Aaron Liu
c138118d48
Home Controls: Add conditional copy for setting.
...
Add conditional copy for when allow trivial devices setting is disabled.
Add guidance on how to enable it.
Bug: 227344249
Test: Manual and unit test
Change-Id: I0f2f6dc933804ee6ba15dc180dc717d2a5b729a5
2022-03-29 17:27:17 +00:00
Treehugger Robot
bde7565383
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: d35c876857
-s ours am: 178ba3e57d
-s ours am: 0818a1c62b
-s ours am: 997bdcf8f8
-s ours am: 8c98f0296d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2045918
Change-Id: I74b3a8329128eb11d1f9cd5d25ab2d325379c627
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-29 16:33:28 +00:00