Bill Yi
23c2c7dc7f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5ced13c831
-s ours am: d32b02b4b4
-s ours am: 8d2d27953d
-s ours am: 07eb180b1a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14469860
Change-Id: I0ce25c84adcecdc4c7a9c154aeaa94b49a197b30
2021-05-07 23:59:54 +00:00
TreeHugger Robot
af8c6c83da
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 2450eeb436
-s ours am: fc9217fca5
-s ours am: b3c02e1811
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14469644
Change-Id: Ib59e3e7ae0b2bf1dc266fd332c4cf9b615cf4d02
2021-05-07 23:59:47 +00:00
Bill Yi
e9e254a992
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b5d257a72d
-s ours am: bd905bff88
-s ours am: cc4940cc2a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14469653
Change-Id: Ibd2c549b9645c510466d1cbd2544739a72a81008
2021-05-07 23:59:11 +00:00
Bill Yi
07eb180b1a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5ced13c831
-s ours am: d32b02b4b4
-s ours am: 8d2d27953d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14469860
Change-Id: I7464ef189a859de3e7e0f3ef8bd23433fcd16afd
2021-05-07 23:46:19 +00:00
TreeHugger Robot
b3c02e1811
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 2450eeb436
-s ours am: fc9217fca5
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14469644
Change-Id: Iab045fcf3c6f030d4099e2b1a47fea175eb976ba
2021-05-07 23:46:16 +00:00
Bill Yi
cc4940cc2a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b5d257a72d
-s ours am: bd905bff88
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14469653
Change-Id: Ia081b7aeb60617f1197379cd78c6019b5f1ebbca
2021-05-07 23:46:13 +00:00
Bill Yi
8d2d27953d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5ced13c831
-s ours am: d32b02b4b4
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14469860
Change-Id: I82d19d77c91088c415ec95a3c9ecf794893eac2a
2021-05-07 23:36:52 +00:00
TreeHugger Robot
fc9217fca5
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 2450eeb436
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14469644
Change-Id: Ie591b4ce89aaf28b338d6f854f06e13444e5acd7
2021-05-07 23:28:02 +00:00
Bill Yi
bd905bff88
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b5d257a72d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14469653
Change-Id: If064a2ddcfb826ccfacfe5b9ec2b96ad89d04384
2021-05-07 23:27:34 +00:00
Bill Yi
d32b02b4b4
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5ced13c831
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14469860
Change-Id: I9e49484d667bbe12c60fc975be09cf477e090877
2021-05-07 23:19:11 +00:00
TreeHugger Robot
2450eeb436
Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod
2021-05-07 23:17:12 +00:00
TreeHugger Robot
5bdef1f980
Merge "Prevent multi-sensor enrollment from doing nothing." into sc-dev am: 0842cc9adc
am: 4fbf1990bf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14463204
Change-Id: I02630a93f9cba60dc7368dca2a819c24903225ee
2021-05-07 21:00:31 +00:00
TreeHugger Robot
4fbf1990bf
Merge "Prevent multi-sensor enrollment from doing nothing." into sc-dev am: 0842cc9adc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14463204
Change-Id: I2d828a873e008d056f453053dac8e921599c5ac8
2021-05-07 20:43:21 +00:00
TreeHugger Robot
0842cc9adc
Merge "Prevent multi-sensor enrollment from doing nothing." into sc-dev
2021-05-07 20:25:35 +00:00
ykhung
246884a4e9
Fix corner case IndexOutOfBound exception for null content am: bf5dd80d4f
am: 985c9a3d42
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14456006
Change-Id: Ib9b9497532285903f7a931432c7a2a5cff622f38
2021-05-07 18:08:43 +00:00
ykhung
985c9a3d42
Fix corner case IndexOutOfBound exception for null content am: bf5dd80d4f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14456006
Change-Id: Iec922589d53bad35cc4aab891850f05948a28f55
2021-05-07 17:52:13 +00:00
ykhung
bf5dd80d4f
Fix corner case IndexOutOfBound exception for null content
...
Bug: 184807417
Test: make SettingsRoboTests
Change-Id: Icf35b4084bcea62c2879a100d1b35b5448d8276d
2021-05-08 01:15:21 +08:00
Bill Yi
5ced13c831
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I77632e0a713314bd782dfaa3256e5181078ef332
2021-05-07 16:57:00 +00:00
Bill Yi
b5d257a72d
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ib60837c4552e1516120c5c6f988fc4b103788f4a
2021-05-07 16:50:54 +00:00
Bill Yi
3bc6bf4361
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I33d29fb6c9a4362b326a72b354aa44a219b813ba
2021-05-07 16:47:30 +00:00
Alex Stetson
74e9845ba2
Merge "Use shared model for non-system overlay toggle" into sc-dev am: 413893244d
am: 2f3826948a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14441754
Change-Id: I5c49a8381b21ffe11c349254ffe26a1728eaca71
2021-05-07 14:21:55 +00:00
Alex Stetson
2f3826948a
Merge "Use shared model for non-system overlay toggle" into sc-dev am: 413893244d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14441754
Change-Id: Ida104293c42790f4bfcbb88f8f75237cfb8ed10f
2021-05-07 14:15:05 +00:00
Alex Stetson
413893244d
Merge "Use shared model for non-system overlay toggle" into sc-dev
2021-05-07 14:08:52 +00:00
TreeHugger Robot
d4ddfe7496
Merge "Refine the interpolation rule and clip the usage time data" into sc-dev am: 180051cf05
am: adfbb68838
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14455999
Change-Id: I8545dbf4459c1b60a34e899aab7e2056a34c8e29
2021-05-07 10:07:39 +00:00
TreeHugger Robot
adfbb68838
Merge "Refine the interpolation rule and clip the usage time data" into sc-dev am: 180051cf05
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14455999
Change-Id: If33d0ec952dbf09416507db253493ce890ee00a0
2021-05-07 09:53:41 +00:00
TreeHugger Robot
180051cf05
Merge "Refine the interpolation rule and clip the usage time data" into sc-dev
2021-05-07 09:35:35 +00:00
TreeHugger Robot
e2608c118b
Merge "Turn on the transition flag" into sc-dev am: ac1b7661ad
am: 3fb211bc4e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14456000
Change-Id: I81047287cc44f058d03a3209d82f9985ab30a3c2
2021-05-07 09:29:46 +00:00
Yanting Yang
aa904a9ea2
Merge "Add summary back to the homepage" into sc-dev am: c37abc9edb
am: f94fe0e86c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14442216
Change-Id: I5412278f4ddafec5f700498db2bf2043f6cad663
2021-05-07 09:29:01 +00:00
TreeHugger Robot
3fb211bc4e
Merge "Turn on the transition flag" into sc-dev am: ac1b7661ad
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14456000
Change-Id: I80c2fc6bcf6863bee4636a151c018af38511d4f3
2021-05-07 09:16:14 +00:00
Yanting Yang
f94fe0e86c
Merge "Add summary back to the homepage" into sc-dev am: c37abc9edb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14442216
Change-Id: I7058a16e5d50badbd4f18fdf7545328421475f50
2021-05-07 09:15:42 +00:00
TreeHugger Robot
ac1b7661ad
Merge "Turn on the transition flag" into sc-dev
2021-05-07 09:01:00 +00:00
Yanting Yang
c37abc9edb
Merge "Add summary back to the homepage" into sc-dev
2021-05-07 09:00:32 +00:00
Syaoran Kuo
bdb5723002
Merge "Remove wifi related test." into sc-dev am: 7dd05a8c05
am: 84dfab789e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14441410
Change-Id: I4ee81e10bbb70dcb9a8fbf813a2f424aeac4677b
2021-05-07 08:52:49 +00:00
ykhung
4280a7f897
Refine the interpolation rule and clip the usage time data
...
Bug: 184807417
Test: make SettingsRoboTests
Change-Id: I6c115beed34abd393e5c615cc59d3c4c323dfa0b
2021-05-07 16:36:56 +08:00
Syaoran Kuo
84dfab789e
Merge "Remove wifi related test." into sc-dev am: 7dd05a8c05
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14441410
Change-Id: I28fa9b25ec03e5323198e81837bf266f28f2b02c
2021-05-07 08:30:50 +00:00
Syaoran Kuo
7dd05a8c05
Merge "Remove wifi related test." into sc-dev
2021-05-07 07:54:25 +00:00
Syaoran Kuo
bc1e5321ab
Remove wifi related test.
...
To add these case back, add a success case to avoid empty test error.
Bug: 186372528
Test: atest SettingsComponentTest
Change-Id: I6d973a244338f67e3d35e9657d1d46eba8ba4501
2021-05-07 13:44:08 +08:00
Yi-Ling Chuang
1be773da62
Turn on the transition flag
...
Test: robotests
Bug: 186701900
Change-Id: I09c821e17fca88ee532f6535031a52c4c832a1e8
2021-05-07 13:21:42 +08:00
TreeHugger Robot
b2baeba56a
Merge "Wallet/controls - Migrate existing settings" into sc-dev am: db624992ed
am: 1b2bf94780
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14353975
Change-Id: Ib0a948a3325525242c9ffaa939107b3ad0688f1b
2021-05-07 05:19:38 +00:00
Edgar Wang
116b57797b
Merge "Add personal dictionary summary text" am: 0cbc974638
am: 7106d10dd0
am: b4ada164a0
am: febe901c8e
am: 2b301c466f
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1683874
Change-Id: I013ca0564c44b3713752bfb8271d20f06834f6c7
2021-05-07 05:19:14 +00:00
TreeHugger Robot
1b2bf94780
Merge "Wallet/controls - Migrate existing settings" into sc-dev am: db624992ed
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14353975
Change-Id: I9a72d99adc6efb84a6f48df261564d802ddde25f
2021-05-07 05:06:19 +00:00
Edgar Wang
2b301c466f
Merge "Add personal dictionary summary text" am: 0cbc974638
am: 7106d10dd0
am: b4ada164a0
am: febe901c8e
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1683874
Change-Id: I0851b47122f67956784b36d2fd06075dd1e9f6e8
2021-05-07 05:05:57 +00:00
TreeHugger Robot
db624992ed
Merge "Wallet/controls - Migrate existing settings" into sc-dev
2021-05-07 05:05:34 +00:00
Edgar Wang
febe901c8e
Merge "Add personal dictionary summary text" am: 0cbc974638
am: 7106d10dd0
am: b4ada164a0
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1683874
Change-Id: If3b1222631f8ed62b4499f6be5d3a4947a86f5cf
2021-05-07 04:49:18 +00:00
Joe Bolinger
955c8349ed
Prevent multi-sensor enrollment from doing nothing.
...
Fix: 186499864
Test: manual (setup with managed account)
Change-Id: If2b2623b2e348ef9d335c81189dbe23e4fe5f003
2021-05-06 21:41:43 -07:00
TreeHugger Robot
3bfdd162a8
Merge "Fix the battery usage screen left alignment issue" into sc-dev am: 8642ee35ad
am: 947f4d458a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14455997
Change-Id: I81e768c6d277bc40b831267e3d4428f21af4149d
2021-05-07 04:36:08 +00:00
Treehugger Robot
3a39be999a
Merge "Move myself to the emeritus section" am: 9119105da9
am: 27a27acb2c
am: 026ecdd388
am: e24cba9b59
am: 151435a12f
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1697923
Change-Id: Id67f3b2620a905b0b05c696fb629afd2d1d5ec15
2021-05-07 04:34:19 +00:00
Edgar Wang
b4ada164a0
Merge "Add personal dictionary summary text" am: 0cbc974638
am: 7106d10dd0
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1683874
Change-Id: I9e7e25716d18b62a38250d6b02c2794cc2046886
2021-05-07 04:32:55 +00:00
Edgar Wang
7106d10dd0
Merge "Add personal dictionary summary text" am: 0cbc974638
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1683874
Change-Id: Ie7686e0df4f0e44bdb1dcb2d55a21e0c957d65b2
2021-05-07 04:18:17 +00:00
TreeHugger Robot
947f4d458a
Merge "Fix the battery usage screen left alignment issue" into sc-dev am: 8642ee35ad
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14455997
Change-Id: I173b8e677bf99e9d120604678ba1ceb79e29737c
2021-05-07 04:13:40 +00:00