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
Jason Chiu
f7afded1d1
Fix Slice not pinned error
...
Slices should be pinned before being bound. The original design calls
registerSliceCallback() to pin a slice, and then calls bindSlice() and
passes the result to the callback directly. When the callback is
called, it executes unregisterSliceCallback() and unpins the slice.
However, registerSliceCallback() starts to observe the slice change and
then rebind it in an AsyncTask. If the slice is updating via its
background worker and the timing of the binding overlaps the callback
execution, it's possible to bind the slice right after unpinning it and
causes the error.
The solution is to remove the callback mechanism, and just to pin, bind
and unpin the slice directly.
Fixes: 157387583
Test: robotest
Change-Id: I8748dd3038a3662599935f07420d07cf254a4073
2020-06-12 04:14:46 +08:00
Kevin Chyn
895ddf239a
BiometricFragment should commitAllowingStateLoss
...
This is a terminal case for both authentication as well as the
activity itself, so this should be safe.
Fixes: 158635014
Test: Builds
Change-Id: Ieef1ab305e6518dbc0ae34ad59d52da82895972a
2020-06-11 12:59:05 -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
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