TreeHugger Robot
0ca5c9526b
Merge "[Wi-Fi] Add WifiNetworkDetailsFragment2 unit test cases"
2020-06-12 12:58:04 +00:00
Jason Chiu
40c5e77949
Merge "Fix Slice not pinned error" into rvc-dev am: 8cbee49d28
am: 7b40a59fd1
am: adad56d9e2
am: 69c4d619b9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11833849
Change-Id: I8eecb178c5a541376471a305b88a0db8408b190f
2020-06-12 12:34:06 +00:00
Automerger Merge Worker
c320c99ffe
Merge "Merge "Fix Slice not pinned error" into rvc-dev am: 8cbee49d28
am: 6eca50ddf0
am: 981d30f49e" into rvc-qpr-dev-plus-aosp am: a3e8536cc5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11833849
Change-Id: I59236c16b832f951666fba602199b0f60f9d9cde
2020-06-12 12:33:30 +00:00
Jason Chiu
f5eb561872
Merge "Fix Slice not pinned error" into rvc-dev am: 8cbee49d28
am: 7b40a59fd1
am: e6eb3775ac
am: 963ab5d9c5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11833849
Change-Id: I5d1d72d381234a45c48146cf398e44039f09e0fd
2020-06-12 12:32:50 +00:00
Jason Chiu
69c4d619b9
Merge "Fix Slice not pinned error" into rvc-dev am: 8cbee49d28
am: 7b40a59fd1
am: adad56d9e2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11833849
Change-Id: I1e58ff556be7cc0467b37651a2c56b2ada9fbebe
2020-06-12 12:22:15 +00:00
Automerger Merge Worker
a3e8536cc5
Merge "Merge "Fix Slice not pinned error" into rvc-dev am: 8cbee49d28
am: 6eca50ddf0
am: 981d30f49e" into rvc-qpr-dev-plus-aosp
2020-06-12 12:21:42 +00:00
Jason Chiu
947ab95fef
Merge "Fix Slice not pinned error" into rvc-dev am: 8cbee49d28
am: 6eca50ddf0
am: 981d30f49e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11833849
Change-Id: Ida948a7aa59f8ce6e3e50333a57e6edbd41a9c3c
2020-06-12 12:21:33 +00:00
Jason Chiu
963ab5d9c5
Merge "Fix Slice not pinned error" into rvc-dev am: 8cbee49d28
am: 7b40a59fd1
am: e6eb3775ac
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11833849
Change-Id: I08c7a4dc4c024044442cd1ea63e5885ce63e05b7
2020-06-12 12:21:32 +00:00
Jason Chiu
adad56d9e2
Merge "Fix Slice not pinned error" into rvc-dev am: 8cbee49d28
am: 7b40a59fd1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11833849
Change-Id: I391ad1f65f6d1fe328254a80540cb75bd2babacf
2020-06-12 12:05:53 +00:00
Jason Chiu
981d30f49e
Merge "Fix Slice not pinned error" into rvc-dev am: 8cbee49d28
am: 6eca50ddf0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11833849
Change-Id: Iafe23935be9d14dc6f9ea05a638e50630b1630ec
2020-06-12 12:05:36 +00:00
Jason Chiu
e6eb3775ac
Merge "Fix Slice not pinned error" into rvc-dev am: 8cbee49d28
am: 7b40a59fd1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11833849
Change-Id: I4b982cfb1b71506ce45b02ee3b7cfea8c04fb673
2020-06-12 12:05:24 +00:00
Jason Chiu
7b40a59fd1
Merge "Fix Slice not pinned error" into rvc-dev am: 8cbee49d28
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11833849
Change-Id: I1e4d0fd72093d6674f8960e9af500adaa9d8f36a
2020-06-12 11:44:12 +00:00
Jason Chiu
6eca50ddf0
Merge "Fix Slice not pinned error" into rvc-dev am: 8cbee49d28
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11833849
Change-Id: Iba28857a715609cb332f9f50884a4de9ba81e5cb
2020-06-12 11:43:24 +00:00
govenliu
688946b7af
[Wi-Fi] Add WifiNetworkDetailsFragment2 unit test cases
...
Add new unit test file: WifiNetworkDetailsFragment2Test.java
Bug: 151696220
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiNetworkDetailsFragment2Test
Change-Id: I41d8a6b2c645ec5ca88dc2e1f894be0ac8887555
2020-06-12 19:38:46 +08:00
Jason Chiu
8cbee49d28
Merge "Fix Slice not pinned error" into rvc-dev
2020-06-12 11:31:23 +00:00
SongFerng Wang
c3703cb4fe
Revert "Mainline: removed legacy UI for network selection mode."
...
This reverts commit 521ebeafd3
.
Reason for revert: to fix b/157880043
Bug: 157880043
Test: test legacy UI. PASS
Change-Id: I4116457a1f7fc0a3be142671c5d0439cd6bdf11d
2020-06-12 19:03:54 +08:00
Tim Peng
9bdeef43fd
Refine layout for output switcher panel
...
1. only make the output switcher tall enough to show 6.5 devices
2. enlarge album art to 52*52 and keep same size on group panel
3. reduce panel header top padding
4. enlarge slice first item top padding
5. update slider bar right padding
6. update panel height
7. align slice title item left with panel title icon
8. enlarge slice end item right padding
Bug: 156045699
Test: manual test
Change-Id: I51321d98ef483665689b7e258d6071df76382759
2020-06-12 15:15:00 +08:00
Automerger Merge Worker
1fc9de2ee7
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 05103c79d1
-s ours am: bf139f4a58
-s ours" into rvc-d1-dev-plus-aosp am: d1cc88ce31
-s ours am: 4cb3c84d26
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11844686
Change-Id: Id977f6b1b6af5c8cb304a11205339a3076dcc40c
2020-06-12 06:02:43 +00:00
Automerger Merge Worker
23bb94d091
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 05103c79d1
-s ours am: 8215f663ed
-s ours" into rvc-d1-dev-plus-aosp am: cab87fe707
-s ours am: cf9a2fa4c0
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11844686
Change-Id: I4eb2e8f1ad14a5f2003bd2a4a1e18f1c771d1f30
2020-06-12 06:02:36 +00:00
TreeHugger Robot
1470f39625
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 05103c79d1
-s ours am: bf139f4a58
-s ours am: 005448ab04
-s ours am: be2b9edcd4
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11844686
Change-Id: I48e8ed12b31b74fa7f0c19c00e4cf6fb1b824fc7
2020-06-12 06:02:28 +00:00
Automerger Merge Worker
102e9b7788
Merge "Merge "Output switcher panel requires large title icon for Slice slider style" into rvc-dev am: c21406a0a2
am: b2ab3dfff2" into rvc-d1-dev-plus-aosp am: ee1cfddac8
am: 3e1ae056bc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11818502
Change-Id: Ic467cf019dc70fb9c74db7d77647e471dd09e671
2020-06-12 06:02:15 +00:00
Automerger Merge Worker
3559d7614c
Merge "Merge "Output switcher panel requires large title icon for Slice slider style" into rvc-dev am: c21406a0a2
am: b2ab3dfff2
am: 94cc0775d9" into rvc-qpr-dev-plus-aosp am: a583f0c74a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11818502
Change-Id: Iba3815dfa8022570d7f178a6a42fd1d91ec725f3
2020-06-12 06:02:01 +00:00
tim peng
518d5d15b8
Merge "Output switcher panel requires large title icon for Slice slider style" into rvc-dev am: c21406a0a2
am: de8b0ada5f
am: 1d4e2258a2
am: 8115a2a109
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11818502
Change-Id: Id8ab7bdb15c42ffd484a59f43f79b1b72104fc3b
2020-06-12 06:01:40 +00:00
Automerger Merge Worker
4cb3c84d26
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 05103c79d1
-s ours am: bf139f4a58
-s ours" into rvc-d1-dev-plus-aosp am: d1cc88ce31
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11844686
Change-Id: Ieefdcc16dafac09c0a5c394b40098655fce88ad7
2020-06-12 05:47:47 +00:00
Automerger Merge Worker
cf9a2fa4c0
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 05103c79d1
-s ours am: 8215f663ed
-s ours" into rvc-d1-dev-plus-aosp am: cab87fe707
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11844686
Change-Id: Ic17933e51fba70af98dea1d10248bb23903f4a57
2020-06-12 05:47:40 +00:00
TreeHugger Robot
be2b9edcd4
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 05103c79d1
-s ours am: bf139f4a58
-s ours am: 005448ab04
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11844686
Change-Id: I06af42a2f31bfa4d284aefec0dda241b4044553e
2020-06-12 05:47:30 +00:00
Automerger Merge Worker
3e1ae056bc
Merge "Merge "Output switcher panel requires large title icon for Slice slider style" into rvc-dev am: c21406a0a2
am: b2ab3dfff2" into rvc-d1-dev-plus-aosp am: ee1cfddac8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11818502
Change-Id: Ie985a8ed6d9e7e0abf5b29556ef1d9527694a392
2020-06-12 05:47:24 +00:00
Automerger Merge Worker
a583f0c74a
Merge "Merge "Output switcher panel requires large title icon for Slice slider style" into rvc-dev am: c21406a0a2
am: b2ab3dfff2
am: 94cc0775d9" into rvc-qpr-dev-plus-aosp
2020-06-12 05:47:16 +00:00
tim peng
9e8f2a1e4e
Merge "Output switcher panel requires large title icon for Slice slider style" into rvc-dev am: c21406a0a2
am: b2ab3dfff2
am: 94cc0775d9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11818502
Change-Id: I980e169a32d488e3073ab928b9adeeb2c037a099
2020-06-12 05:47:09 +00:00
tim peng
8115a2a109
Merge "Output switcher panel requires large title icon for Slice slider style" into rvc-dev am: c21406a0a2
am: de8b0ada5f
am: 1d4e2258a2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11818502
Change-Id: I5d521387bd686ef446856442ca177193d56a12cd
2020-06-12 05:46:59 +00:00
Automerger Merge Worker
d1cc88ce31
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 05103c79d1
-s ours am: bf139f4a58
-s ours" into rvc-d1-dev-plus-aosp
2020-06-12 05:25:24 +00:00
Automerger Merge Worker
cab87fe707
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 05103c79d1
-s ours am: 8215f663ed
-s ours" into rvc-d1-dev-plus-aosp
2020-06-12 05:25:19 +00:00
TreeHugger Robot
337d64b985
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 05103c79d1
-s ours am: bf139f4a58
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11844686
Change-Id: I52f0cb116a5bcc73947bd775747d7e4499ba3e96
2020-06-12 05:25:19 +00:00
TreeHugger Robot
7483b01c8e
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 05103c79d1
-s ours am: 8215f663ed
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11844686
Change-Id: I2a2ad5dbc5d89c7e8a7ff791a3b1952bf505337f
2020-06-12 05:25:15 +00:00
Automerger Merge Worker
ee1cfddac8
Merge "Merge "Output switcher panel requires large title icon for Slice slider style" into rvc-dev am: c21406a0a2
am: b2ab3dfff2" into rvc-d1-dev-plus-aosp
2020-06-12 05:25:14 +00:00
TreeHugger Robot
005448ab04
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 05103c79d1
-s ours am: bf139f4a58
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11844686
Change-Id: Ia24a58b220fb67cc562a2acb8cf641e5c6b57ac0
2020-06-12 05:25:13 +00:00
tim peng
1d4e2258a2
Merge "Output switcher panel requires large title icon for Slice slider style" into rvc-dev am: c21406a0a2
am: de8b0ada5f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11818502
Change-Id: I7103136caa2b9139e2c598826d6ae7494678c6c0
2020-06-12 05:25:08 +00:00
tim peng
ae2f75a060
Merge "Output switcher panel requires large title icon for Slice slider style" into rvc-dev am: c21406a0a2
am: b2ab3dfff2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11818502
Change-Id: Ia8bafba6aa8fe7042be82288a11b48ec4d3e1839
2020-06-12 05:25:08 +00:00
tim peng
94cc0775d9
Merge "Output switcher panel requires large title icon for Slice slider style" into rvc-dev am: c21406a0a2
am: b2ab3dfff2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11818502
Change-Id: I769ad89870ac16016683e8cfaed2488e4a6d78a7
2020-06-12 05:25:06 +00:00
TreeHugger Robot
8215f663ed
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 05103c79d1
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11844686
Change-Id: I14d51e59d67ded733a532e7d8d15d65269db4c1e
2020-06-12 05:10:44 +00:00
TreeHugger Robot
bf139f4a58
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 05103c79d1
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11844686
Change-Id: Ia06d4c03304efea0593eef48b565f99795add280
2020-06-12 05:10:41 +00:00
tim peng
de8b0ada5f
Merge "Output switcher panel requires large title icon for Slice slider style" into rvc-dev am: c21406a0a2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11818502
Change-Id: I62a7dfd8d9693d15eb6cf6012418c3ba5cc1efd1
2020-06-12 05:10:37 +00:00
tim peng
b2ab3dfff2
Merge "Output switcher panel requires large title icon for Slice slider style" into rvc-dev am: c21406a0a2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11818502
Change-Id: Id609ee38c9b5230def2c8d1cffb7aac8e209e4e6
2020-06-12 05:10:33 +00:00
TreeHugger Robot
05103c79d1
Merge "Import translations. DO NOT MERGE" into rvc-dev
2020-06-12 05:09:30 +00:00
tim peng
c21406a0a2
Merge "Output switcher panel requires large title icon for Slice slider style" into rvc-dev
2020-06-12 04:58:04 +00:00
Bill Yi
a891edabdb
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Change-Id: Ibb02d904bcceffdd07fb13dec9b62e72e89ea32d
2020-06-12 03:50:41 +00:00
Automerger Merge Worker
1b6f923659
Merge "Merge "rename "Emergency Alert" to "Public Warning" per IT requirements" into rvc-dev am: 6ebe9ae0ff
am: e5c24841f8" into rvc-d1-dev-plus-aosp am: 50d595d4ee
am: ee850698e9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11814763
Change-Id: Id529a43ef40176deb7a36bd30f8f7842e67c7e53
2020-06-12 03:31:00 +00:00
Automerger Merge Worker
159a029b4f
Merge "Merge "rename "Emergency Alert" to "Public Warning" per IT requirements" into rvc-dev am: 6ebe9ae0ff
am: 34a3ec22f4" into rvc-d1-dev-plus-aosp am: 860e66242a
am: 273123fa02
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11814763
Change-Id: Id32495e5cc39a383a660f1d39dadd68cc0b37e81
2020-06-12 03:30:53 +00:00
Automerger Merge Worker
da698e3908
Merge "Merge "rename "Emergency Alert" to "Public Warning" per IT requirements" into rvc-dev am: 6ebe9ae0ff
am: 34a3ec22f4
am: 8db9c072cf" into rvc-qpr-dev-plus-aosp am: 56aed228ff
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11814763
Change-Id: I6c8cef4ac40a631a3579d513a2986a37700c0e7a
2020-06-12 03:30:44 +00:00
Automerger Merge Worker
9afa101329
Merge "Merge "Unicode-wrap app names for default apps summary." into rvc-dev am: 6791e1c09b
am: 72041754a5" into rvc-d1-dev-plus-aosp am: 9100e94c03
am: 5308f86511
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11844071
Change-Id: I28103236e20f1a9b0f3039a4519b0b8661b1bdc7
2020-06-12 03:30:33 +00:00