TreeHugger Robot
9bad64997d
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 31e0f46d87
-s ours am: 2332a37557
-s ours am: 0c847ab549
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14469856
Change-Id: Icfeedc843fc3e0bd1d140d355a4207c76ac5a83f
2021-05-07 23:45:17 +00:00
Bill Yi
b5a424b154
[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: I06ba39f37f68c027e3675a643508ffb4c316eef1
2021-05-07 23:45:00 +00:00
TreeHugger Robot
2991325544
[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: I21fb35dbe46b46231eb914cabd17df92a73df59b
2021-05-07 23:44:48 +00:00
Bill Yi
abfbda2698
[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: I435c33132f9c0d7f46dd813fc9edbdc7b5299ea3
2021-05-07 23:44:33 +00:00
TreeHugger Robot
0c847ab549
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 31e0f46d87
-s ours am: 2332a37557
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14469856
Change-Id: I1ac1d36b4343b3d008d21090ee9ac69caae48460
2021-05-07 23:36:59 +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
TreeHugger Robot
2332a37557
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 31e0f46d87
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14469856
Change-Id: I3b468892d531003b9ada3fac1ffb0b54866e61e9
2021-05-07 23:19:54 +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
31e0f46d87
Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev
2021-05-07 23:07:35 +00:00
TreeHugger Robot
4b12334524
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: Ibe6d65df7be6a66db8c6fd8d29f22b81d9af569f
2021-05-07 20:42:38 +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
dc424283be
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: Ie0d7ecbc943442473dd540bc6962966f67c8098c
2021-05-07 17:49:51 +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
51221d77f7
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I830341ac6e908b358eb878baa11e62ebbf4fcfd9
2021-05-07 16:53:34 +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
b693c7949e
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: I88f9322ad1b7d886bfbf597070232d6bf6002174
2021-05-07 14:13:07 +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
e5ba5c68e1
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: Ie643498fd6df7d1a4bb6e96335ca98fe5bdd8387
2021-05-07 09:51:27 +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
4af703e2ae
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: Id40d542dcb170670037ef5dfbddadbda6d0f64ee
2021-05-07 09:14:36 +00:00
Yanting Yang
eecd27406c
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: Ida5e3fec18839e4ba2ce266aa5b4d2424b65ef3a
2021-05-07 09:14:08 +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
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
dcffe72b50
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: I884c941b0da10127ec9e05cd91d3134ad5f93b57
2021-05-07 08:28:37 +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
e1c74cc330
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: Iaf6750c802f825b48b40e0f539f578969a9213fd
2021-05-07 05:11:19 +00:00
TreeHugger Robot
db624992ed
Merge "Wallet/controls - Migrate existing settings" into sc-dev
2021-05-07 05:05:34 +00:00
Edgar Wang
bd495e0413
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: I873b6f6ada4e87aca2231259b5701aef940323d0
2021-05-07 05:03:51 +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
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
94fc21d00a
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: I7c7f25049044e894725c9622d7e6c1b1dbe77fdf
2021-05-07 04:11:56 +00:00
Treehugger Robot
23c3a67321
Merge "Move myself to the emeritus section" am: 9119105da9
am: 27a27acb2c
am: 026ecdd388
am: e24cba9b59
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1697923
Change-Id: I3a497f119a4ba9a85db257ca78062001151e83b6
2021-05-07 04:11:33 +00:00
Edgar Wang
0cbc974638
Merge "Add personal dictionary summary text"
2021-05-07 04:02:00 +00:00
TreeHugger Robot
8642ee35ad
Merge "Fix the battery usage screen left alignment issue" into sc-dev
2021-05-07 03:59:13 +00:00
Treehugger Robot
e24cba9b59
Merge "Move myself to the emeritus section" am: 9119105da9
am: 27a27acb2c
am: 026ecdd388
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1697923
Change-Id: If7854bb03db1b001bb6dfd35f28f074a66b77abe
2021-05-07 03:39:34 +00:00
Treehugger Robot
026ecdd388
Merge "Move myself to the emeritus section" am: 9119105da9
am: 27a27acb2c
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1697923
Change-Id: I8aa67688d4c88a64c549e1094f3311ec4a4b2499
2021-05-07 03:11:46 +00:00
TreeHugger Robot
2ec9be2d6b
Merge "Add require scrolling button for FingerprintEnrolling intro" into sc-dev am: b1b7029fa6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14441409
Change-Id: I6fd5cc40bcbfed8ccb9f2c09f7a09d5d7f8b165e
2021-05-07 03:10:41 +00:00
Betty Chang
700b881701
Merge "Change Network detail string form TYPE to Type" into sc-dev am: 19f21656a1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14441413
Change-Id: I77b698e9f9cfdf6ae06ce2b659d47f793aa574de
2021-05-07 03:10:17 +00:00
TreeHugger Robot
139745d11b
Merge "Adopt new battery history map with interpolation method" into sc-dev am: b7ffc45052
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14441406
Change-Id: I32b338b48aceb00536b208421ac17a802e81adbf
2021-05-07 03:10:10 +00:00
TreeHugger Robot
b1b7029fa6
Merge "Add require scrolling button for FingerprintEnrolling intro" into sc-dev
2021-05-07 02:58:16 +00:00