TreeHugger Robot
126fc5b912
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-05-11 14:10:55 +00:00
Hai Zhang
6bf47f6274
Don't add SettingsLib to static_libs in Settings unit test.
...
Adding them results in duplicate classes and causes conflict for the R
classes and resource loading.
Meanwhile, correctly removing the SettingsLibSettingsSpinner resulted
in the test failing to find the getSelectedItem() method which is
unused inside Settings app. This is an inherent issue when unit
testing an optimized (and shrunk) app, and since there's no other way
for the test to get the current selected item, this change simply
changes the Settings code to invoke getSelectedItem() as well. This
has exactly the same effect because SettingsSpinnerPreference updates
its mPosition right before calling the OnItemSelectedListener in its
implementation.
Bug: 183340630
Bug: 177638625
Bug: 183342958
Test: atest SettingsSliderPreferenceControllerTest
Test: atest PrivateVolumeForgetTest
Change-Id: Ia26ca923369b41291614fb9bd50dfbd2aac2f0fa
2021-05-11 03:33:08 -07:00
Arc Wang
65d3f45606
Set storage volume spinner not clickable when only 1 volume
...
Bug: 187801712
Test: manual
Click the spinner when there is only default volume.
Click the spinner when there is USB drive connected.
Change-Id: Ifbd26c96f467757ffcfef750bd80533834123f82
2021-05-11 18:06:47 +08:00
ykhung
8febb17220
Refine graph top margin and expand/collapse icon theme color am: 525659c291
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14493692
Change-Id: I96b4ba0c2504045c7c04905ac4e9bf27f1b32a3c
2021-05-11 09:25:51 +00:00
Bill Yi
7218ff4ef6
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I0e280f8e60612add9cd19a47b4b01ac40d827977
2021-05-11 09:08:53 +00:00
Bill Yi
c41ebbc1f5
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I95ae7049d4ab0bfb41198277cd351f2c3f0e12d7
2021-05-11 09:01:32 +00:00
Bill Yi
90b6d35a97
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ic4a811f25ada99c36d1a521a6086cc940d81449c
2021-05-11 08:57:23 +00:00
Bill Yi
99513c4e86
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I72187de3a8b04a71d8ea473d599dc33258717b2f
2021-05-11 08:54:08 +00:00
Bill Yi
1049f62bbc
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ia2f4a6a4eae5398fa27312f5791430b3e5f69e09
2021-05-11 08:51:33 +00:00
Bill Yi
3cb47bf569
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I78ee3396d3507915233d96c294a22077a1c196bf
2021-05-11 08:48:18 +00:00
ykhung
525659c291
Refine graph top margin and expand/collapse icon theme color
...
Bug: 187767343
Test: make SettingsRoboTests
Change-Id: I5084affd49169de1f43a308acbe192f55454d0f7
2021-05-11 08:22:38 +00:00
TreeHugger Robot
758ec3b5eb
Merge changes Ia51528f2,Id27a7809 into oc-mr1-dev am: 75e33fb315
am: 9724c735da
am: fc721d09cb
am: 94e5b18951
am: 045aa65893
am: 9ebe07d216
am: 63cc6f167a
am: d31c3649ba
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419449
Change-Id: Ifdee0f7d96aa9f7bbbcee775703c52f0a1cae024
2021-05-11 07:34:28 +00:00
Hugh Chen
f489fd641f
[automerger skipped] RESTRICT AUTOMERGE Fix unable to send file via OPP am: 2deb2829ea
-s ours am: 53ff99b8b4
-s ours am: 9bbcb55a23
am: fe87f1ac34
-s ours am: 8dbc94fcbe
am: e90fdbf747
am: 445869a724
-s ours am: 0f74d4831c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419449
Change-Id: I764cae01f793afc62ad86950dcc5cecb754579a0
2021-05-11 07:34:27 +00:00
TreeHugger Robot
3a8360b8a8
Merge changes Ia51528f2,Id27a7809 into pi-dev am: f9c99c40d2
am: 38a2b32e94
am: 24ef90eaaa
am: e5e19dd41a
am: 0e37bc27a2
am: a6f32496f2
am: 9ff09ba818
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419448
Change-Id: I54943b23464b8eca54a7f7acdc660174856fb822
2021-05-11 07:34:15 +00:00
Hugh Chen
f6a5b5fc7e
[automerger skipped] RESTRICT AUTOMERGE Fix unable to send file via OPP am: f727d5cf2a
-s ours am: 8a4f60b143
am: 3607e825b9
-s ours am: 392fb7a4f7
am: 425430345d
am: 47666c2d15
-s ours am: 33228acc37
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419448
Change-Id: Ie8a0f738fbc898bde08697b56908f41bc0d4eb19
2021-05-11 07:34:13 +00:00
TreeHugger Robot
ef74576517
Merge changes Ia51528f2,Id27a7809 into qt-dev am: 4074cd5e48
am: 54f47d0953
am: 16e8c4783e
am: 256de04464
am: 3942491a7f
am: e492441e16
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419447
Change-Id: I3c0b1cc78d6794cf3cb3982e7326a40dd6cf0307
2021-05-11 07:34:01 +00:00
Hugh Chen
399b1da869
[automerger skipped] RESTRICT AUTOMERGE Fix unable to send file via OPP am: 51755e9a33
am: 7b05629834
-s ours am: effac8a0c1
am: 6fee770ea0
am: 8bf67a7f4b
-s ours am: 0bc5e289a4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419447
Change-Id: I4622c9f198cbbb5d9a38c8af906bfc132dcfdf9c
2021-05-11 07:33:56 +00:00
TreeHugger Robot
754b34800e
Merge changes Ia51528f2,Id27a7809 into rvc-dev am: f45fa1bf85
am: e790b378c3
am: 8be84e5e36
am: dff59b4188
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419442
Change-Id: I5f78bcd0116e8a309e31922fd4d316285d94e87d
2021-05-11 07:33:45 +00:00
Hugh Chen
6b7bd492bb
[automerger skipped] RESTRICT AUTOMERGE Fix unable to send file via OPP am: 5de62d1955
-s ours am: 933f807885
am: c740d7ad82
-s ours am: 5d7d1a6b38
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419442
Change-Id: Ife31d6034958a0b9e5643af4e1705c8b16c27216
2021-05-11 07:33:45 +00:00
TreeHugger Robot
520cc8ef7d
Merge changes Ia51528f2,Id27a7809 into oc-mr1-dev am: 75e33fb315
am: 9724c735da
am: fc721d09cb
am: 94e5b18951
am: 045aa65893
am: 8b76d88e55
am: 2097ca6a73
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419449
Change-Id: Ibf69b5fe0451c017801fa318dfdb4c227c75e44c
2021-05-11 07:33:37 +00:00
Hugh Chen
dcb892788a
[automerger skipped] RESTRICT AUTOMERGE Fix unable to send file via OPP am: 2deb2829ea
-s ours am: 53ff99b8b4
-s ours am: 9bbcb55a23
am: fe87f1ac34
-s ours am: 8dbc94fcbe
am: 68f4157827
-s ours am: 628a92c252
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419449
Change-Id: I41e7a9265b9b2bd0cc7792a041962db321e3c1bd
2021-05-11 07:33:36 +00:00
TreeHugger Robot
eb47afb169
Merge changes Ia51528f2,Id27a7809 into pi-dev am: f9c99c40d2
am: 38a2b32e94
am: 24ef90eaaa
am: e5e19dd41a
am: b2c3b4f4cb
am: 8cea64eae5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419448
Change-Id: Ifd9374918e6177bc63a5b43996dfd082c8122ebf
2021-05-11 07:33:25 +00:00
Hugh Chen
73809561df
[automerger skipped] RESTRICT AUTOMERGE Fix unable to send file via OPP am: f727d5cf2a
-s ours am: 8a4f60b143
am: 3607e825b9
-s ours am: 392fb7a4f7
am: 0248e7b7cf
-s ours am: caf59cbbcf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419448
Change-Id: Id81103bb429caed7c6a7016445f0b8f25f6d5890
2021-05-11 07:33:24 +00:00
TreeHugger Robot
cd1451ce53
Merge changes Ia51528f2,Id27a7809 into qt-dev am: 4074cd5e48
am: 54f47d0953
am: 16e8c4783e
am: 85410254c7
am: 872093e29d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419447
Change-Id: I930d9febb69b49748f3e570b69b075d7c27710ec
2021-05-11 07:33:14 +00:00
Hugh Chen
adecb886fb
[automerger skipped] RESTRICT AUTOMERGE Fix unable to send file via OPP am: 51755e9a33
am: 7b05629834
-s ours am: effac8a0c1
am: ac30bfef8c
-s ours am: 7eeee9be6a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419447
Change-Id: I91e63235f8d8abe629d5dc2c882509808be4b9fa
2021-05-11 07:33:13 +00:00
TreeHugger Robot
d31c3649ba
Merge changes Ia51528f2,Id27a7809 into oc-mr1-dev am: 75e33fb315
am: 9724c735da
am: fc721d09cb
am: 94e5b18951
am: 045aa65893
am: 9ebe07d216
am: 63cc6f167a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419449
Change-Id: Iedfec3d03168c06279513180f28364c19ff66523
2021-05-11 07:24:14 +00:00
Hugh Chen
0f74d4831c
[automerger skipped] RESTRICT AUTOMERGE Fix unable to send file via OPP am: 2deb2829ea
-s ours am: 53ff99b8b4
-s ours am: 9bbcb55a23
am: fe87f1ac34
-s ours am: 8dbc94fcbe
am: e90fdbf747
am: 445869a724
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419449
Change-Id: I0fc9fa40c357c059669a175580a16a12b01ed4be
2021-05-11 07:24:12 +00:00
TreeHugger Robot
9ff09ba818
Merge changes Ia51528f2,Id27a7809 into pi-dev am: f9c99c40d2
am: 38a2b32e94
am: 24ef90eaaa
am: e5e19dd41a
am: 0e37bc27a2
am: a6f32496f2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419448
Change-Id: Idb3b2d6fa662277e1fe0a47fc2c0318d50e20fa3
2021-05-11 07:24:03 +00:00
Hugh Chen
33228acc37
[automerger skipped] RESTRICT AUTOMERGE Fix unable to send file via OPP am: f727d5cf2a
-s ours am: 8a4f60b143
am: 3607e825b9
-s ours am: 392fb7a4f7
am: 425430345d
am: 47666c2d15
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419448
Change-Id: I41d8312c0be058fe9d94f1fa4e745bfa0e4e3002
2021-05-11 07:24:02 +00:00
TreeHugger Robot
e492441e16
Merge changes Ia51528f2,Id27a7809 into qt-dev am: 4074cd5e48
am: 54f47d0953
am: 16e8c4783e
am: 256de04464
am: 3942491a7f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419447
Change-Id: I19201e368b99d8306c34643bfbc8fe6297965968
2021-05-11 07:23:53 +00:00
Hugh Chen
0bc5e289a4
[automerger skipped] RESTRICT AUTOMERGE Fix unable to send file via OPP am: 51755e9a33
am: 7b05629834
-s ours am: effac8a0c1
am: 6fee770ea0
am: 8bf67a7f4b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419447
Change-Id: I3a9cabe53576b44a9a42f75b5db72099b96f4771
2021-05-11 07:23:51 +00:00
TreeHugger Robot
dff59b4188
Merge changes Ia51528f2,Id27a7809 into rvc-dev am: f45fa1bf85
am: e790b378c3
am: 8be84e5e36
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419442
Change-Id: I73cf736a109fcfd867136e5869953194fb32e5e2
2021-05-11 07:23:40 +00:00
Hugh Chen
5d7d1a6b38
[automerger skipped] RESTRICT AUTOMERGE Fix unable to send file via OPP am: 5de62d1955
-s ours am: 933f807885
am: c740d7ad82
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419442
Change-Id: Iebf5692b629b1b52107c622fe1987898b0cc2369
2021-05-11 07:23:38 +00:00
TreeHugger Robot
2097ca6a73
Merge changes Ia51528f2,Id27a7809 into oc-mr1-dev am: 75e33fb315
am: 9724c735da
am: fc721d09cb
am: 94e5b18951
am: 045aa65893
am: 8b76d88e55
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419449
Change-Id: I3ca562a87d5c650d7ef347bccb70483f14f05fe6
2021-05-11 07:07:32 +00:00
Hugh Chen
628a92c252
[automerger skipped] RESTRICT AUTOMERGE Fix unable to send file via OPP am: 2deb2829ea
-s ours am: 53ff99b8b4
-s ours am: 9bbcb55a23
am: fe87f1ac34
-s ours am: 8dbc94fcbe
am: 68f4157827
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419449
Change-Id: I6aeb0de955b997191148bead7794af66ee3bfa94
2021-05-11 07:07:31 +00:00
TreeHugger Robot
8cea64eae5
Merge changes Ia51528f2,Id27a7809 into pi-dev am: f9c99c40d2
am: 38a2b32e94
am: 24ef90eaaa
am: e5e19dd41a
am: b2c3b4f4cb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419448
Change-Id: Idaa69e727648cf5a8083078b23c4905d347a2e87
2021-05-11 07:07:23 +00:00
Hugh Chen
caf59cbbcf
[automerger skipped] RESTRICT AUTOMERGE Fix unable to send file via OPP am: f727d5cf2a
-s ours am: 8a4f60b143
am: 3607e825b9
-s ours am: 392fb7a4f7
am: 0248e7b7cf
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419448
Change-Id: I3071e369f5c750e56e7e0d4d5819f2abf7887d5b
2021-05-11 07:07:21 +00:00
TreeHugger Robot
872093e29d
Merge changes Ia51528f2,Id27a7809 into qt-dev am: 4074cd5e48
am: 54f47d0953
am: 16e8c4783e
am: 85410254c7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419447
Change-Id: I910069997b36967f62986543d99a4a7c822aae68
2021-05-11 07:07:12 +00:00
Hugh Chen
7eeee9be6a
[automerger skipped] RESTRICT AUTOMERGE Fix unable to send file via OPP am: 51755e9a33
am: 7b05629834
-s ours am: effac8a0c1
am: ac30bfef8c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419447
Change-Id: I3433db790942e4b64ee00dbfe6636a2fbfd53841
2021-05-11 07:07:10 +00:00
TreeHugger Robot
78f4bcf7d8
Merge changes Ia51528f2,Id27a7809 into rvc-dev am: f45fa1bf85
am: cb2b575a9d
am: a5d3b8a45c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419442
Change-Id: I57a8a5ea80fe5c154de04944d36b19c2fcbe5d31
2021-05-11 07:00:20 +00:00
Hugh Chen
c6a9224864
[automerger skipped] RESTRICT AUTOMERGE Fix unable to send file via OPP am: 5de62d1955
am: e914289a2c
-s ours am: 810abfc77b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419442
Change-Id: I9719be9db53236fe9c5960bc06ed9341aedff94c
2021-05-11 07:00:19 +00:00
Wesley.CW Wang
58c34f2ce3
Fix color check error am: 7a8d2f4486
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14493679
Change-Id: I5d140970c335d8f55ac1102fd64d00b0850463fb
2021-05-11 07:00:04 +00:00
TreeHugger Robot
63cc6f167a
Merge changes Ia51528f2,Id27a7809 into oc-mr1-dev am: 75e33fb315
am: 9724c735da
am: fc721d09cb
am: 94e5b18951
am: 045aa65893
am: 9ebe07d216
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419449
Change-Id: I9807b38cc41d0a6318ba6514e850320472f4eac4
2021-05-11 06:58:44 +00:00
Hugh Chen
445869a724
[automerger skipped] RESTRICT AUTOMERGE Fix unable to send file via OPP am: 2deb2829ea
-s ours am: 53ff99b8b4
-s ours am: 9bbcb55a23
am: fe87f1ac34
-s ours am: 8dbc94fcbe
am: e90fdbf747
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419449
Change-Id: Ie8f2d68082238c1a5f67cef2fcb31b5228e4baf6
2021-05-11 06:58:43 +00:00
TreeHugger Robot
a6f32496f2
Merge changes Ia51528f2,Id27a7809 into pi-dev am: f9c99c40d2
am: 38a2b32e94
am: 24ef90eaaa
am: e5e19dd41a
am: 0e37bc27a2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419448
Change-Id: I72ec88755fd1d41d47d2850f6b7bc33de49601c1
2021-05-11 06:58:33 +00:00
Hugh Chen
47666c2d15
[automerger skipped] RESTRICT AUTOMERGE Fix unable to send file via OPP am: f727d5cf2a
-s ours am: 8a4f60b143
am: 3607e825b9
-s ours am: 392fb7a4f7
am: 425430345d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419448
Change-Id: If5e9c837a6abe536c14c4714ceb853cafc760052
2021-05-11 06:58:32 +00:00
TreeHugger Robot
3942491a7f
Merge changes Ia51528f2,Id27a7809 into qt-dev am: 4074cd5e48
am: 54f47d0953
am: 16e8c4783e
am: 256de04464
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419447
Change-Id: Ie069b79899d0f1ec2804eb73a6a6c61f66dcfe17
2021-05-11 06:58:23 +00:00
Hugh Chen
8bf67a7f4b
[automerger skipped] RESTRICT AUTOMERGE Fix unable to send file via OPP am: 51755e9a33
am: 7b05629834
-s ours am: effac8a0c1
am: 6fee770ea0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419447
Change-Id: I1067439941b49387c0c12d7945a1741a622c5dae
2021-05-11 06:58:22 +00:00
TreeHugger Robot
8be84e5e36
Merge changes Ia51528f2,Id27a7809 into rvc-dev am: f45fa1bf85
am: e790b378c3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419442
Change-Id: Iad2d26bd6f41cb3aead971faa398a889db384b29
2021-05-11 06:58:14 +00:00
Hugh Chen
c740d7ad82
[automerger skipped] RESTRICT AUTOMERGE Fix unable to send file via OPP am: 5de62d1955
-s ours am: 933f807885
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419442
Change-Id: If30e312d4b6c4e1d738f2549ff83455e942c3157
2021-05-11 06:58:12 +00:00