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
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
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
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
TreeHugger Robot
8b76d88e55
Merge changes Ia51528f2,Id27a7809 into oc-mr1-dev am: 75e33fb315
am: 9724c735da
am: fc721d09cb
am: 94e5b18951
am: 045aa65893
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419449
Change-Id: I65aef0c493f78d5befdbf2f7dba3455d646c9381
2021-05-11 06:51:54 +00:00
Hugh Chen
68f4157827
[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
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419449
Change-Id: I69ea5188cea5989c20262a29e446672ffbc2ad49
2021-05-11 06:51:54 +00:00
TreeHugger Robot
b2c3b4f4cb
Merge changes Ia51528f2,Id27a7809 into pi-dev am: f9c99c40d2
am: 38a2b32e94
am: 24ef90eaaa
am: e5e19dd41a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419448
Change-Id: Ifbb726ed6d30422a7dcade197553740a32f11da0
2021-05-11 06:51:45 +00:00
Hugh Chen
0248e7b7cf
[automerger skipped] RESTRICT AUTOMERGE Fix unable to send file via OPP am: f727d5cf2a
-s ours am: 8a4f60b143
am: 3607e825b9
-s ours am: 392fb7a4f7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419448
Change-Id: I2dd1a71af29c8f1f680d0d7339a1b29cb7c75240
2021-05-11 06:51:44 +00:00
TreeHugger Robot
85410254c7
Merge changes Ia51528f2,Id27a7809 into qt-dev am: 4074cd5e48
am: 54f47d0953
am: 16e8c4783e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419447
Change-Id: I84c496c66f968a2d4efac98aa2db61723db228b9
2021-05-11 06:51:36 +00:00
Hugh Chen
ac30bfef8c
[automerger skipped] RESTRICT AUTOMERGE Fix unable to send file via OPP am: 51755e9a33
am: 7b05629834
-s ours am: effac8a0c1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419447
Change-Id: I6e234e32dc4c51a3fd4bccdf8bce71a0fe65577d
2021-05-11 06:51:35 +00:00
TreeHugger Robot
a5d3b8a45c
Merge changes Ia51528f2,Id27a7809 into rvc-dev am: f45fa1bf85
am: cb2b575a9d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419442
Change-Id: Ieff4517231297944d0e8ea8234863944b38e4aa2
2021-05-11 06:41:34 +00:00
Hugh Chen
810abfc77b
[automerger skipped] RESTRICT AUTOMERGE Fix unable to send file via OPP am: 5de62d1955
am: e914289a2c
-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: I69468fc4b6059967865fe3f0aa7f003d5b56914b
2021-05-11 06:41:32 +00:00
TreeHugger Robot
9ebe07d216
Merge changes Ia51528f2,Id27a7809 into oc-mr1-dev am: 75e33fb315
am: 9724c735da
am: fc721d09cb
am: 94e5b18951
am: 045aa65893
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419449
Change-Id: I338cea4bb8314f2490ef37b982d82c4f7f4e35ba
2021-05-11 06:41:09 +00:00
Hugh Chen
e90fdbf747
[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
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419449
Change-Id: Icf7882fc0640bf49580efee8d38170869af50847
2021-05-11 06:41:08 +00:00
TreeHugger Robot
0e37bc27a2
Merge changes Ia51528f2,Id27a7809 into pi-dev am: f9c99c40d2
am: 38a2b32e94
am: 24ef90eaaa
am: e5e19dd41a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419448
Change-Id: I3b95a45ef89a2c7d3c651e67f01dabd45897331d
2021-05-11 06:41:01 +00:00
Hugh Chen
425430345d
[automerger skipped] RESTRICT AUTOMERGE Fix unable to send file via OPP am: f727d5cf2a
-s ours am: 8a4f60b143
am: 3607e825b9
-s ours am: 392fb7a4f7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419448
Change-Id: I739376349571d5d917a34eabf121f1347626379a
2021-05-11 06:41:00 +00:00
TreeHugger Robot
256de04464
Merge changes Ia51528f2,Id27a7809 into qt-dev am: 4074cd5e48
am: 54f47d0953
am: 16e8c4783e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419447
Change-Id: I8462c36866641491631cfcc8aed8bdde8b5ea984
2021-05-11 06:40:53 +00:00
Hugh Chen
6fee770ea0
[automerger skipped] RESTRICT AUTOMERGE Fix unable to send file via OPP am: 51755e9a33
am: 7b05629834
-s ours am: effac8a0c1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419447
Change-Id: I7fdb4bbb527008c0f64cab9d8c101f4301f92c62
2021-05-11 06:40:52 +00:00
TreeHugger Robot
e790b378c3
Merge changes Ia51528f2,Id27a7809 into rvc-dev am: f45fa1bf85
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419442
Change-Id: Ic3753ba1c4945113050f87feb611f23d1cd5b79e
2021-05-11 06:40:46 +00:00
Hugh Chen
933f807885
[automerger skipped] RESTRICT AUTOMERGE Fix unable to send file via OPP am: 5de62d1955
-s ours
...
am skip reason: skipped by user hughchen
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419442
Change-Id: I27a2ef608420e73b9ae797cbcdc73d82228312c5
2021-05-11 06:40:46 +00:00
TreeHugger Robot
045aa65893
Merge changes Ia51528f2,Id27a7809 into oc-mr1-dev am: 75e33fb315
am: 9724c735da
am: fc721d09cb
am: 94e5b18951
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419449
Change-Id: I3a7d52f4c65391196464641f9cf20436b58762c1
2021-05-11 06:32:20 +00:00
Hugh Chen
8dbc94fcbe
[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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419449
Change-Id: I31dde5548cb9ae735e8f342548b8e6fb799b0104
2021-05-11 06:32:19 +00:00
TreeHugger Robot
e5e19dd41a
Merge changes Ia51528f2,Id27a7809 into pi-dev am: f9c99c40d2
am: 38a2b32e94
am: 24ef90eaaa
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419448
Change-Id: I8cc36a74ea8abdaa25bc0876e4e4ce9218808d3b
2021-05-11 06:32:12 +00:00
Hugh Chen
392fb7a4f7
[automerger skipped] RESTRICT AUTOMERGE Fix unable to send file via OPP am: f727d5cf2a
-s ours am: 8a4f60b143
am: 3607e825b9
-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: I2afcbd48ae913e348764246122dc0f0fef03ec46
2021-05-11 06:32:11 +00:00
TreeHugger Robot
16e8c4783e
Merge changes Ia51528f2,Id27a7809 into qt-dev am: 4074cd5e48
am: 54f47d0953
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419447
Change-Id: I474d15a6db416860a5a34253a7a0ed000912bafc
2021-05-11 06:32:04 +00:00
Hugh Chen
effac8a0c1
[automerger skipped] RESTRICT AUTOMERGE Fix unable to send file via OPP am: 51755e9a33
am: 7b05629834
-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: Ib65fe3dd30eb3dd84a2f4949de6eaa32f2b24146
2021-05-11 06:32:02 +00:00
TreeHugger Robot
94e5b18951
Merge changes Ia51528f2,Id27a7809 into oc-mr1-dev am: 75e33fb315
am: 9724c735da
am: fc721d09cb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419449
Change-Id: I0deadd94935bad2a6cae221c11054eb33557f22e
2021-05-11 06:24:14 +00:00
Hugh Chen
fe87f1ac34
[automerger skipped] RESTRICT AUTOMERGE Fix unable to send file via OPP am: 2deb2829ea
-s ours am: 53ff99b8b4
-s ours am: 9bbcb55a23
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419449
Change-Id: I668163c48cd6de7ac9236a878550d7a80eb9c7ac
2021-05-11 06:24:14 +00:00
TreeHugger Robot
24ef90eaaa
Merge changes Ia51528f2,Id27a7809 into pi-dev am: f9c99c40d2
am: 38a2b32e94
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419448
Change-Id: If31a9fca9d45ae3d0408874a34427f8ca8984f49
2021-05-11 06:24:06 +00:00
Hugh Chen
3607e825b9
[automerger skipped] RESTRICT AUTOMERGE Fix unable to send file via OPP am: f727d5cf2a
-s ours am: 8a4f60b143
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419448
Change-Id: I223f7a495fa5640217ee7de19a24fa6490918336
2021-05-11 06:24:06 +00:00