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
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
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
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
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
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
TreeHugger Robot
9ece2c0ae7
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: I2fdb01e00f706fc50d1fe37b9a462aeb08e2c6f1
2020-06-12 02:40:44 +00:00
Chen Xu
6ebe9ae0ff
Merge "rename "Emergency Alert" to "Public Warning" per IT requirements" into rvc-dev
2020-06-12 02:29:17 +00:00
TreeHugger Robot
6791e1c09b
Merge "Unicode-wrap app names for default apps summary." into rvc-dev
2020-06-12 02:28:48 +00:00
Hai Zhang
3f511d8ca9
Unicode-wrap app names for default apps summary.
...
This was done for permissions summary inside PermissionController, so
also do it in Settings.
Bug: 153804329
Test: manually confirm that the summary matches what linguist
suggested after fix
Change-Id: I650fbed4488abfd871adafba5afb1ae9a2995c62
2020-06-11 16:54:25 -07:00
TreeHugger Robot
581716a9ef
Merge "Don't pass channel info for the bubble app page" into rvc-dev am: d6081039c6
am: b299d90b7f
am: 266700a7a4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11636410
Change-Id: I1fe9134d62d240bf3c4edcac990acddd88bc9f0e
2020-06-11 18:23:33 +00:00
TreeHugger Robot
95c1934376
Merge "Don't pass channel info for the bubble app page" into rvc-dev am: d6081039c6
am: 4327cd65cc
am: f836c42063
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11636410
Change-Id: Idfd05075c197965f7c8092021fdc26b67d666481
2020-06-11 18:21:19 +00:00
Automerger Merge Worker
47315c0651
Merge "Merge "[adbwifi] Handle tls port changes." into rvc-dev am: 63facb88bd
am: 928e81ae49" into rvc-d1-dev-plus-aosp am: 93dc50a6df
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11828521
Change-Id: Ic783aa228c98f02d3cf823a4f9b7c01cc8c96044
2020-06-11 18:20:14 +00:00
Joshua Duong
7e59ac6b3d
Merge "[adbwifi] Handle tls port changes." into rvc-dev am: 63facb88bd
am: b84cafa24c
am: ac85fec739
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11828521
Change-Id: Id30aa42c7fcca2d479c14bbc67b4f7d176ac2a36
2020-06-11 18:19:30 +00:00
TreeHugger Robot
54f86cfc61
Merge "Don't pass channel info for the bubble app page" into rvc-dev am: d6081039c6
am: 4327cd65cc
am: 38aaa31584
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11636410
Change-Id: I7a9fd26057bf32433c35026dc0ed08a19ec3058e
2020-06-11 18:11:16 +00:00
Joshua Duong
95326e7f31
Merge "[adbwifi] Handle tls port changes." into rvc-dev am: 63facb88bd
am: b84cafa24c
am: 4e3d96116f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11828521
Change-Id: Ia9fd81d14025536c5a53a9c68112f55c866953b5
2020-06-11 18:10:29 +00:00
TreeHugger Robot
266700a7a4
Merge "Don't pass channel info for the bubble app page" into rvc-dev am: d6081039c6
am: b299d90b7f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11636410
Change-Id: I8ddca6ec04857daed135d72bfd0aa2bfebc770f6
2020-06-11 17:56:47 +00:00
TreeHugger Robot
38aaa31584
Merge "Don't pass channel info for the bubble app page" into rvc-dev am: d6081039c6
am: 4327cd65cc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11636410
Change-Id: Icf50cfb1ae51a07c3ac86b183f53607ea8ea69d1
2020-06-11 17:56:19 +00:00
TreeHugger Robot
f836c42063
Merge "Don't pass channel info for the bubble app page" into rvc-dev am: d6081039c6
am: 4327cd65cc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11636410
Change-Id: Idafdf6a714a9c35f92a21684de3aeb941f772e12
2020-06-11 17:56:12 +00:00
Automerger Merge Worker
93dc50a6df
Merge "Merge "[adbwifi] Handle tls port changes." into rvc-dev am: 63facb88bd
am: 928e81ae49" into rvc-d1-dev-plus-aosp
2020-06-11 17:55:46 +00:00
Joshua Duong
4e3d96116f
Merge "[adbwifi] Handle tls port changes." into rvc-dev am: 63facb88bd
am: b84cafa24c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11828521
Change-Id: I67d23dafeb10db85c0b07a746c540dbf2dffd318
2020-06-11 17:55:40 +00:00
Joshua Duong
41c3dc79df
Merge "[adbwifi] Handle tls port changes." into rvc-dev am: 63facb88bd
am: 928e81ae49
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11828521
Change-Id: I419b3b9af1fa6df8484dd9f5238d8a251cb0422f
2020-06-11 17:55:36 +00:00
Joshua Duong
ac85fec739
Merge "[adbwifi] Handle tls port changes." into rvc-dev am: 63facb88bd
am: b84cafa24c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11828521
Change-Id: Idb0fee5e98d8618634eace2b5adabc65997c7cf9
2020-06-11 17:55:24 +00:00
TreeHugger Robot
4327cd65cc
Merge "Don't pass channel info for the bubble app page" into rvc-dev am: d6081039c6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11636410
Change-Id: Icc6c824db2ad89a8a18fdcdcd595afc4f406aa6d
2020-06-11 17:37:14 +00:00
Joshua Duong
b84cafa24c
Merge "[adbwifi] Handle tls port changes." into rvc-dev am: 63facb88bd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11828521
Change-Id: Ib5e569614e15f5c39590fc40a18b2673e45f9767
2020-06-11 17:36:49 +00:00
TreeHugger Robot
b299d90b7f
Merge "Don't pass channel info for the bubble app page" into rvc-dev am: d6081039c6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11636410
Change-Id: I88d711322b1b3ea5f4e50f534bab68e7a5b17b96
2020-06-11 17:36:29 +00:00
Joshua Duong
928e81ae49
Merge "[adbwifi] Handle tls port changes." into rvc-dev am: 63facb88bd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11828521
Change-Id: If2438ebe5f39ba9543d3a74d27e71902f6f93c4e
2020-06-11 17:36:19 +00:00
TreeHugger Robot
d6081039c6
Merge "Don't pass channel info for the bubble app page" into rvc-dev
2020-06-11 17:23:56 +00:00