TreeHugger Robot
c7174aaed4
Merge "Add placeholder values to placeholder settings" into sc-dev am: fb2e8837f1
am: 570ef9d8da
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14356125
Change-Id: I8441107d0a0f5ecba342e28f404f5c3d61e03cc5
2021-04-30 14:50:04 +00:00
TreeHugger Robot
570ef9d8da
Merge "Add placeholder values to placeholder settings" into sc-dev am: fb2e8837f1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14356125
Change-Id: I5d43b367191f3c17bc9560c97dbe583a29585a72
2021-04-30 14:27:14 +00:00
TreeHugger Robot
fb2e8837f1
Merge "Add placeholder values to placeholder settings" into sc-dev
2021-04-30 14:12:51 +00:00
TreeHugger Robot
520800b85b
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 01aeea2e4a
-s ours am: b1802372ab
-s ours am: c830499aa5
-s ours am: 390d29bf2c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14356624
Change-Id: If9e107fe140b71790bba3069ebd50de49b085816
2021-04-30 04:25:01 +00:00
Bill Yi
11d3658112
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 090db24c56
-s ours am: b702fdea6d
-s ours am: 226146afee
-s ours am: c9b99fbf00
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14356374
Change-Id: I1f8baa66849f9ccaa11a054bd00a00b9dec63329
2021-04-30 04:24:58 +00:00
TreeHugger Robot
5f9b1866df
Merge "Retain and restore showSystem state when rotated" into sc-dev am: 8f8666e3d0
am: 56a3e57991
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14356126
Change-Id: Iab6ea833508abc55e2a7f80d0e303a30a310a39f
2021-04-30 04:24:53 +00:00
TreeHugger Robot
765a422ef8
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: fb47f1e143
-s ours am: bf0ef5b73a
-s ours am: 26fb969e07
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14356372
Change-Id: I711eecc70d19b4b7be820f063392e378a492a4a0
2021-04-30 04:24:35 +00:00
Bill Yi
6e48fa7abf
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6bb78b6d1b
-s ours am: ff5e910f46
-s ours am: 7ed3955572
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14356373
Change-Id: I1bcb7f064b72c3fc99815aea5d11b89e388dfc3c
2021-04-30 04:23:15 +00:00
TreeHugger Robot
390d29bf2c
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 01aeea2e4a
-s ours am: b1802372ab
-s ours am: c830499aa5
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14356624
Change-Id: I375b48c07cb8fcaf4918df2ceecff3b85f22a746
2021-04-30 03:35:49 +00:00
Bill Yi
c9b99fbf00
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 090db24c56
-s ours am: b702fdea6d
-s ours am: 226146afee
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14356374
Change-Id: Ie9f5187ea30e04493e66c0c31d9c5777d28c2f9a
2021-04-30 03:35:45 +00:00
TreeHugger Robot
56a3e57991
Merge "Retain and restore showSystem state when rotated" into sc-dev am: 8f8666e3d0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14356126
Change-Id: If955050791d645bdc3d5b31ce2935d232918d3ea
2021-04-30 03:35:38 +00:00
TreeHugger Robot
26fb969e07
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: fb47f1e143
-s ours am: bf0ef5b73a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14356372
Change-Id: I765d5f3379961cdd85f6ec0fedd8710bd34a7c0a
2021-04-30 03:35:28 +00:00
Bill Yi
7ed3955572
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6bb78b6d1b
-s ours am: ff5e910f46
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14356373
Change-Id: I98f81abfb8cfe94c0b1d0b0fb21d53cc65943bcf
2021-04-30 03:34:34 +00:00
TreeHugger Robot
c830499aa5
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 01aeea2e4a
-s ours am: b1802372ab
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14356624
Change-Id: Ib085fa7ee497c60cf2822898d086df8474b51565
2021-04-30 03:24:55 +00:00
TreeHugger Robot
b32fd28bc0
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 6c7771a521
-s ours am: 016f441365
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14356378
Change-Id: If041c85e192426ad5adc85ddeb87b9c832929abf
2021-04-30 03:24:34 +00:00
Bill Yi
226146afee
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 090db24c56
-s ours am: b702fdea6d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14356374
Change-Id: I6bb725127c897cead36281c2e7f483425a11de2f
2021-04-30 03:24:24 +00:00
TreeHugger Robot
58bc66b149
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 041b99ccd5
-s ours am: e30f685d83
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14356625
Change-Id: Iaf925bcfc2a6d543310c036252fe94983d705a30
2021-04-30 03:22:49 +00:00
TreeHugger Robot
8f8666e3d0
Merge "Retain and restore showSystem state when rotated" into sc-dev
2021-04-30 03:19:41 +00:00
TreeHugger Robot
bf0ef5b73a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: fb47f1e143
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14356372
Change-Id: Id4e60f2c23a41d97a346fa2dc13b233217f54cdc
2021-04-30 03:07:42 +00:00
Bill Yi
ff5e910f46
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6bb78b6d1b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14356373
Change-Id: I437a411a2a7e2691520722955b963699c6710511
2021-04-30 03:05:22 +00:00
TreeHugger Robot
016f441365
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 6c7771a521
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14356378
Change-Id: I52d508ee6476430e6bc48ed732505a11073d96ab
2021-04-30 02:59:48 +00:00
TreeHugger Robot
e30f685d83
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 041b99ccd5
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14356625
Change-Id: Ib05c6186fcc1752800cd65f83b311ec2ab84dbf2
2021-04-30 02:58:37 +00:00
TreeHugger Robot
b1802372ab
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 01aeea2e4a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14356624
Change-Id: Ic2ad52edf6ccdea95b351c1c20ee333307753a9e
2021-04-30 02:56:47 +00:00
Bill Yi
b702fdea6d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 090db24c56
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14356374
Change-Id: Ic9e3f7394d14440fc23b25b34547ebf492df66a7
2021-04-30 02:56:10 +00:00
TreeHugger Robot
fb47f1e143
Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod
2021-04-30 02:35:40 +00:00
TreeHugger Robot
6c7771a521
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-04-30 02:30:38 +00:00
TreeHugger Robot
041b99ccd5
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-04-30 02:23:38 +00:00
TreeHugger Robot
01aeea2e4a
Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev
2021-04-30 02:21:29 +00:00
Menghan Li
a52bf99fd1
Merge "Improve search by adding the settings keywords for supported framework feautres" into sc-dev am: 1576980095
am: 3e0080956d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14299189
Change-Id: Icbd6b911a29aac29b41f21b45bd24e507ff9e0fe
2021-04-30 00:12:58 +00:00
Menghan Li
3e0080956d
Merge "Improve search by adding the settings keywords for supported framework feautres" into sc-dev am: 1576980095
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14299189
Change-Id: Ic5d918e2ee2ffced61e5ab9f1011411c4e95094a
2021-04-29 23:52:07 +00:00
Menghan Li
1576980095
Merge "Improve search by adding the settings keywords for supported framework feautres" into sc-dev
2021-04-29 23:23:34 +00:00
Yu-Han Yang
c2ea62d1f8
Retain and restore showSystem state when rotated
...
Bug: 182275573
Test: on device
Change-Id: I8a7e2d1ceb715cb6df470d7e3131b82d12ba6fa1
2021-04-29 15:39:28 -07:00
Bill Yi
f8b4a0e963
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ia4358bb5d5d07fb2401926298d083bc716834c5f
2021-04-29 21:10:54 +00:00
Bill Yi
8c5796014f
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I0a606fcf13d894d280306449b80991be0f3234e5
2021-04-29 21:03:06 +00:00
Bill Yi
090db24c56
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I10014f28a6678e3510e293bde00e2ccd909406f7
2021-04-29 20:58:45 +00:00
Bill Yi
98cbf6d0a9
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I2c4d8200a195a4c1ec9b7d140254085e6762219d
2021-04-29 20:55:07 +00:00
Bill Yi
6bb78b6d1b
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I273a20694088e7716213b38d7983319fc10ef3fb
2021-04-29 20:52:24 +00:00
Bill Yi
9b1f0ab131
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I97875f1775c63f4a62f82808da766d37da190f2f
2021-04-29 20:48:53 +00:00
Julia Reynolds
c16c0d4628
Add placeholder values to placeholder settings
...
So there are no animations when the real data is available.
Test: manually view notification paget
Fixes: 186494741
Fixes: 182232213
Fixes: 183177992
Change-Id: Ic210fa1b545537689df9b69eb5fe6b990f65ad13
2021-04-29 16:38:53 -04:00
Almaz Mingaleev
af9aa076df
Merge "Place GeoTZ toggle under auto time zone toggle." into sc-dev am: c51cefb2b9
am: e291bcfdd8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14353668
Change-Id: If2adfb297a40cdc4decdd183092a514f56fb46d0
2021-04-29 20:11:51 +00:00
Almaz Mingaleev
e291bcfdd8
Merge "Place GeoTZ toggle under auto time zone toggle." into sc-dev am: c51cefb2b9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14353668
Change-Id: Ib087abea81bfb49d0ebd6b30a8ac96de4bd1d989
2021-04-29 19:49:46 +00:00
Almaz Mingaleev
c51cefb2b9
Merge "Place GeoTZ toggle under auto time zone toggle." into sc-dev
2021-04-29 19:09:37 +00:00
Almaz Mingaleev
ac584f2911
Place GeoTZ toggle under auto time zone toggle.
...
This moves the two toggles that control the time zone detection
behavior next to each other, rather than having them either side
of the current device time zone. This is intended to making it
clear they are both influencing detection behavior. It will ensure
that future text we put under the auto time zone toggle for the
tablet use case (where there is no telephony detection) explaining
that "Use location to set time zone" has to be on will be right
next to the toggle that needs to change.
Bug: 152746236
Bug: 186625820
Test: flashed device, checked manually
Change-Id: Ifd43db3d5cc7e764b12f8da20e552b1a5479ac4a
2021-04-29 18:43:27 +00:00
Yi Jiang
240ef2d1e1
Merge "Fixes 'no ripple effect' issue for screen attention setting" into sc-dev am: 16b0f660ae
am: 2b25a6cec4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14114425
Change-Id: I0b72a2f0dc742efad756a84212786820c4cb22dc
2021-04-29 17:47:42 +00:00
Amit Mahajan
93b4b46cf2
Merge "Fix incorrect logging." into sc-dev am: 6402ac45e6
am: 748bbd8a06
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14330728
Change-Id: If36d6a5884bfbc76ebf52736b864cc50ecaf6ff9
2021-04-29 17:46:56 +00:00
Yi Jiang
2b25a6cec4
Merge "Fixes 'no ripple effect' issue for screen attention setting" into sc-dev am: 16b0f660ae
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14114425
Change-Id: I1e5b63729f31d7d0e9fdd64c2b8bf500fe25edba
2021-04-29 17:23:43 +00:00
Yi Jiang
16b0f660ae
Merge "Fixes 'no ripple effect' issue for screen attention setting" into sc-dev
2021-04-29 17:19:34 +00:00
Amit Mahajan
748bbd8a06
Merge "Fix incorrect logging." into sc-dev am: 6402ac45e6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14330728
Change-Id: I19bdf202606748de850fc68fa2abf7c1b58ab197
2021-04-29 17:16:13 +00:00
Amit Mahajan
6402ac45e6
Merge "Fix incorrect logging." into sc-dev
2021-04-29 16:54:06 +00:00
Matt Pietal
d17b6d022a
Merge "SUW - Apply theme to FRP PIN pages" into sc-dev am: 0ddacf1152
am: eadf475e12
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14339991
Change-Id: I566e454c3ff2349f34574f9aa9bd423295167bd8
2021-04-29 12:36:28 +00:00