TreeHugger Robot
647e0ee2ad
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: e81db4e2f0
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14491513
Change-Id: Ic234fd718791b2790665336914b24c0b6f63c957
2021-05-11 14:49:26 +00:00
TreeHugger Robot
2231cba3d1
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 860318bab8
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14491514
Change-Id: I2204c47b4e3e25cd42fd35aff1bbad56514d39a8
2021-05-11 14:49:20 +00:00
TreeHugger Robot
5625e4b302
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 3772f9137a
-s ours am: 2da86a6163
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14498659
Change-Id: I096999a06b89d5b62b98dae0fe49ee500b078a1c
2021-05-11 14:48:35 +00:00
TreeHugger Robot
ed056a81f1
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 126fc5b912
-s ours am: 4e5a16a7d3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14500796
Change-Id: I4130b3637dbc5a404d2611c4b8324037501bee4f
2021-05-11 14:48:30 +00:00
ykhung
1422ab8a4c
Refine graph top margin and expand/collapse icon theme color am: 525659c291
am: 8febb17220
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14493692
Change-Id: I5e80b84bf0cfe7b085119a8a2ece1b5fe14bfc2e
2021-05-11 14:48:19 +00:00
TreeHugger Robot
e81db4e2f0
Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod
2021-05-11 14:35:46 +00:00
TreeHugger Robot
2da86a6163
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 3772f9137a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14498659
Change-Id: Icd3e8bf11cb721b29e66cce799a0670f1c90a50f
2021-05-11 14:32:53 +00:00
TreeHugger Robot
4e5a16a7d3
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 126fc5b912
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14500796
Change-Id: If725b62001c4de8538c44c69d26dd45f8eda4934
2021-05-11 14:32:43 +00:00
TreeHugger Robot
860318bab8
Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod
2021-05-11 14:31:55 +00:00
TreeHugger Robot
cefbb1d83a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 9d3c9dd867
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14491515
Change-Id: I402572a820a93daf549d86a3345d3d861205d302
2021-05-11 14:30:51 +00:00
TreeHugger Robot
84ed78af0a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 842c67d794
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14498657
Change-Id: Ife34138bc4382a1f63098546ffa67047d6a8e9c5
2021-05-11 14:30:44 +00:00
TreeHugger Robot
9d3c9dd867
Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev
2021-05-11 14:17:52 +00:00
TreeHugger Robot
842c67d794
Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev
2021-05-11 14:17:11 +00:00
TreeHugger Robot
3772f9137a
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-05-11 14:16:42 +00:00
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
5234e8c98d
Merge changes Ia51528f2,Id27a7809 into oc-mr1-dev am: 75e33fb315
am: 9724c735da
am: fc721d09cb
am: 94e5b18951
am: 045aa65893
am: 9ebe07d216
am: 63cc6f167a
am: d31c3649ba
am: 758ec3b5eb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419449
Change-Id: I68caa53776e5658e0a27ce39be0aec73cd8fb79b
2021-05-11 08:04:43 +00:00
Hugh Chen
f06c856b22
[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
am: f489fd641f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419449
Change-Id: I668b8a183c8c68ef40f4d14d11c48f47b21e7f11
2021-05-11 08:04:42 +00:00
TreeHugger Robot
cf63cfe7da
Merge changes Ia51528f2,Id27a7809 into pi-dev am: f9c99c40d2
am: 38a2b32e94
am: 24ef90eaaa
am: e5e19dd41a
am: 0e37bc27a2
am: a6f32496f2
am: 9ff09ba818
am: 3a8360b8a8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419448
Change-Id: Id3c06cfec8f99031b6bbb311a3c8c58de6cd00dc
2021-05-11 08:04:28 +00:00
Hugh Chen
3d67afa264
[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
am: f6a5b5fc7e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419448
Change-Id: Ic89277e42ce6de257eb0fd0e98cab6a7b25b5bc9
2021-05-11 08:04:27 +00:00
TreeHugger Robot
41cda777ef
Merge changes Ia51528f2,Id27a7809 into qt-dev am: 4074cd5e48
am: 54f47d0953
am: 16e8c4783e
am: 256de04464
am: 3942491a7f
am: e492441e16
am: ef74576517
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419447
Change-Id: I0f858c5c0595d3728e7fcf712d2115d1eae9d99b
2021-05-11 08:04:14 +00:00
Hugh Chen
17d2fe6c04
[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
am: 399b1da869
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419447
Change-Id: Ib2d4721a2286a9dc752eb3601e62895621edee3f
2021-05-11 08:04:13 +00:00
TreeHugger Robot
83e3b2c24c
Merge changes Ia51528f2,Id27a7809 into rvc-dev am: f45fa1bf85
am: e790b378c3
am: 8be84e5e36
am: dff59b4188
am: 754b34800e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419442
Change-Id: Ie9526b50c08b6e6647f5aac9ac7b1fc2281fe1b9
2021-05-11 08:03:59 +00:00
Hugh Chen
458bd36eb1
[automerger skipped] RESTRICT AUTOMERGE Fix unable to send file via OPP am: 5de62d1955
-s ours am: 933f807885
am: c740d7ad82
-s ours am: 5d7d1a6b38
am: 6b7bd492bb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419442
Change-Id: If7c228f3129ef99098f32c5f2db86a3054796067
2021-05-11 08:03:58 +00:00
TreeHugger Robot
a35dca1c75
Merge changes Ia51528f2,Id27a7809 into oc-mr1-dev am: 75e33fb315
am: 9724c735da
am: fc721d09cb
am: 94e5b18951
am: 045aa65893
am: 8b76d88e55
am: 2097ca6a73
am: 520cc8ef7d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419449
Change-Id: I617c9abe662d893f2d048ac7bf238f49ccbee0f0
2021-05-11 08:03:49 +00:00
Hugh Chen
29bd970c73
[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
am: dcb892788a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419449
Change-Id: Idc6a0e57462660ce48f155b88ab918d34ae4902e
2021-05-11 08:03:48 +00:00
TreeHugger Robot
5a357e22ff
Merge changes Ia51528f2,Id27a7809 into pi-dev am: f9c99c40d2
am: 38a2b32e94
am: 24ef90eaaa
am: e5e19dd41a
am: b2c3b4f4cb
am: 8cea64eae5
am: eb47afb169
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419448
Change-Id: I1b7f7cd387b51c7f60c76c7b40ab35b828fc7a03
2021-05-11 08:03:35 +00:00
Hugh Chen
771651c2f6
[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
am: 73809561df
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419448
Change-Id: Ia6fd283abde3187115627c9e9a91dc4599f5ec56
2021-05-11 08:03:34 +00:00
TreeHugger Robot
6e66ed699b
Merge changes Ia51528f2,Id27a7809 into qt-dev am: 4074cd5e48
am: 54f47d0953
am: 16e8c4783e
am: 85410254c7
am: 872093e29d
am: cd1451ce53
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419447
Change-Id: I53e540958fb0c290738a5ac3a1fe6b7a44fb592b
2021-05-11 08:03:14 +00:00
Hugh Chen
0922c78b70
[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
am: adecb886fb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419447
Change-Id: I7f93aeec67dcc83aeff2bba758cd1d5b225a2c3d
2021-05-11 08:03:11 +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