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
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
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
Tim Peng
27b0ef6eb3
Output switcher panel requires large title icon for Slice slider style
...
-Add "VIEW_TYPE_SLIDER_LARGE_ICON" to be a new panel type which would enlarge its title icon
-Set "VIEW_TYPE_SLIDER_LARGE_ICON" to MediaOutputPanel and MediaOutputGroupPanel
-Extend slider style and add customized icon size
-Add test cases
Bug: 157208551
Test: make -j42 RunSettingsRoboTests
Change-Id: I9b4de4aa552e8b26e766411f7eff93ea1a2d1910
2020-06-12 11:22:17 +08:00
Automerger Merge Worker
ee850698e9
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
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11814763
Change-Id: Ie9fc8a73c94bede0304d3ea2afbcc268486ee5c2
2020-06-12 03:12:17 +00:00
Automerger Merge Worker
273123fa02
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
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11814763
Change-Id: I71bce2f3a7ce13456ac990152cc671d5fdebe284
2020-06-12 03:12:01 +00:00
Automerger Merge Worker
56aed228ff
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
2020-06-12 03:11:56 +00:00
Automerger Merge Worker
5308f86511
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
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11844071
Change-Id: Icfe5166ba6738dfe0e310d70536518c8ac2a338a
2020-06-12 03:11:52 +00:00
Chen Xu
eb55a3528d
Merge "rename "Emergency Alert" to "Public Warning" per IT requirements" into rvc-dev am: 6ebe9ae0ff
am: 34a3ec22f4
am: 8db9c072cf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11814763
Change-Id: Ie2ff64ce9c95d8f6b9f9661686ca0eddbcad6a4a
2020-06-12 03:11:52 +00:00
TreeHugger Robot
b4f3669c2a
Merge "Unicode-wrap app names for default apps summary." into rvc-dev am: 6791e1c09b
am: 9ece2c0ae7
am: 632bda0e30
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11844071
Change-Id: I00e65be423667001c0d84b8c992c698f0ed3b391
2020-06-12 03:11:45 +00:00
TreeHugger Robot
d937d41e10
Merge "Unicode-wrap app names for default apps summary." into rvc-dev am: 6791e1c09b
am: 9ece2c0ae7
am: 50ab6f1fc7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11844071
Change-Id: I77285dae59997e7fcf8dec9d43b9d738db0862e1
2020-06-12 03:11:19 +00:00
Automerger Merge Worker
50d595d4ee
Merge "Merge "rename "Emergency Alert" to "Public Warning" per IT requirements" into rvc-dev am: 6ebe9ae0ff
am: e5c24841f8" into rvc-d1-dev-plus-aosp
2020-06-12 02:56:37 +00:00
Automerger Merge Worker
860e66242a
Merge "Merge "rename "Emergency Alert" to "Public Warning" per IT requirements" into rvc-dev am: 6ebe9ae0ff
am: 34a3ec22f4" into rvc-d1-dev-plus-aosp
2020-06-12 02:56:32 +00:00
Chen Xu
945fa6f547
Merge "rename "Emergency Alert" to "Public Warning" per IT requirements" into rvc-dev am: 6ebe9ae0ff
am: e5c24841f8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11814763
Change-Id: I6a78ca2602d9c9d81f1db6d80cb7cb3fa96d7a22
2020-06-12 02:56:32 +00:00
Chen Xu
a4a6763dbd
Merge "rename "Emergency Alert" to "Public Warning" per IT requirements" into rvc-dev am: 6ebe9ae0ff
am: 34a3ec22f4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11814763
Change-Id: I60ee8564c111629578c655a00bde6d1bc8abf58b
2020-06-12 02:56:27 +00:00
Automerger Merge Worker
9100e94c03
Merge "Merge "Unicode-wrap app names for default apps summary." into rvc-dev am: 6791e1c09b
am: 72041754a5" into rvc-d1-dev-plus-aosp
2020-06-12 02:56:26 +00:00
Chen Xu
8db9c072cf
Merge "rename "Emergency Alert" to "Public Warning" per IT requirements" into rvc-dev am: 6ebe9ae0ff
am: 34a3ec22f4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11814763
Change-Id: I7e49a8d9eaa2d562d32d78193387b2fa7f7ee46d
2020-06-12 02:56:24 +00:00
TreeHugger Robot
9074a0c6f3
Merge "Unicode-wrap app names for default apps summary." into rvc-dev am: 6791e1c09b
am: 72041754a5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11844071
Change-Id: I784f1ebba2b68f0c78e2976c8c5eb8eb3d9f0423
2020-06-12 02:56:22 +00:00
TreeHugger Robot
50ab6f1fc7
Merge "Unicode-wrap app names for default apps summary." into rvc-dev am: 6791e1c09b
am: 9ece2c0ae7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11844071
Change-Id: I9b366d0a1900be5e9a5d541260c4b06c91f41447
2020-06-12 02:56:14 +00:00
TreeHugger Robot
632bda0e30
Merge "Unicode-wrap app names for default apps summary." into rvc-dev am: 6791e1c09b
am: 9ece2c0ae7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11844071
Change-Id: I4a001a32186ee9913934f7dcc31a992d09af28bf
2020-06-12 02:56:13 +00:00
Chen Xu
34a3ec22f4
Merge "rename "Emergency Alert" to "Public Warning" per IT requirements" into rvc-dev am: 6ebe9ae0ff
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11814763
Change-Id: I48ef871f2fd9229ff9fb88a2b54126b5a4132908
2020-06-12 02:41:00 +00:00
Chen Xu
e5c24841f8
Merge "rename "Emergency Alert" to "Public Warning" per IT requirements" into rvc-dev am: 6ebe9ae0ff
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11814763
Change-Id: I7aeece4315ed3b30da38a810cda49d17262b152f
2020-06-12 02:40:59 +00:00
TreeHugger Robot
72041754a5
Merge "Unicode-wrap app names for default apps summary." into rvc-dev am: 6791e1c09b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11844071
Change-Id: I578b119b97da6a5351d5ebd4b898de1a88ea500d
2020-06-12 02:40:50 +00:00