Commit Graph

71144 Commits

Author SHA1 Message Date
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
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
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
TreeHugger Robot
7381f63126 Merge "Unicode-wrap app names for default apps summary." into rvc-dev am: 6791e1c09b am: 9ece2c0ae7 am: 632bda0e30 am: b4f3669c2a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11844071

Change-Id: Ie402bdfe439b7d5a4c9bb15e07bfd022abbafa65
2020-06-12 03:30:23 +00:00
TreeHugger Robot
e3b37b1989 Merge "Unicode-wrap app names for default apps summary." into rvc-dev am: 6791e1c09b am: 9ece2c0ae7 am: 50ab6f1fc7 am: d937d41e10
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11844071

Change-Id: Ie520861dccfdf4db695a8f9617dc1289cf75ccfb
2020-06-12 03:29:50 +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
74ef5a2959 Merge "Don't pass channel info for the bubble app page" into rvc-dev am: d6081039c6 am: b299d90b7f am: 266700a7a4 am: 581716a9ef
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11636410

Change-Id: Icf3fc0e9fc338419f3584cb41d289612edf58d93
2020-06-11 18:46:37 +00:00
TreeHugger Robot
3a1313486d Merge "Don't pass channel info for the bubble app page" into rvc-dev am: d6081039c6 am: 4327cd65cc am: f836c42063 am: 95c1934376
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11636410

Change-Id: I199b16f9eeeac3ad4756dbeb45e6cae1ed4f79c8
2020-06-11 18:45:21 +00:00
Automerger Merge Worker
e9272dc787 Merge "Merge "[adbwifi] Handle tls port changes." into rvc-dev am: 63facb88bd am: 928e81ae49" into rvc-d1-dev-plus-aosp am: 93dc50a6df am: 47315c0651
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11828521

Change-Id: Ida513b562d07a80a1b782de314330f3e1ab688bf
2020-06-11 18:44:19 +00:00
Joshua Duong
dc71644772 Merge "[adbwifi] Handle tls port changes." into rvc-dev am: 63facb88bd am: b84cafa24c am: ac85fec739 am: 7e59ac6b3d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11828521

Change-Id: Ie0a766b6264b2d2be801ca587d5d4bd5b085be84
2020-06-11 18:44:02 +00:00
TreeHugger Robot
f3c20305fb Merge "Don't pass channel info for the bubble app page" into rvc-dev am: d6081039c6 am: 4327cd65cc am: 38aaa31584 am: 54f86cfc61
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11636410

Change-Id: I9e1c1df385b75ad0469b23de904db23ef3298aa1
2020-06-11 18:43:25 +00:00
Joshua Duong
dec3d00370 Merge "[adbwifi] Handle tls port changes." into rvc-dev am: 63facb88bd am: b84cafa24c am: 4e3d96116f am: 95326e7f31
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11828521

Change-Id: Icc817959eeb559d89c3f8b0bc7d14481de919b36
2020-06-11 18:41:48 +00: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