Amy Hsu
f9a021511e
Merge "Add Smooth Display option to developer in Settings" into rvc-dev
2020-06-15 08:39:26 +00:00
Automerger Merge Worker
b312f2af4b
Merge "Merge "Merge "Replace ConnectivityManager as TetheringManager" into rvc-dev am: 2aa2b0a2f8
am: 52a3551a7a" into rvc-d1-dev-plus-aosp am: ac3266b1be" into rvc-qpr-dev-plus-aosp am: 8152e9d40f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11770823
Change-Id: I145def075a545a397ce7e631175a5f4e9ada9330
2020-06-15 07:20:58 +00:00
Mark Chien
75b2a75ccd
Merge "Remove schedule recheck logic from TetherService" into rvc-dev am: 49b74e24d6
am: 10ef08d80f
am: 78b4bc6020
am: 1912ee3e9a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11524846
Change-Id: I78a0a2d461fd96f2af1850c74d78cd34060e66cc
2020-06-15 07:20:22 +00:00
Mark Chien
77fb97f1dc
Merge "Replace ConnectivityManager as TetheringManager" into rvc-dev am: 2aa2b0a2f8
am: 52a3551a7a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11770823
Change-Id: I7042245d05b956b28cb08aced653afaf845e77b2
2020-06-15 06:55:23 +00:00
Mark Chien
78b4bc6020
Merge "Remove schedule recheck logic from TetherService" into rvc-dev am: 49b74e24d6
am: 10ef08d80f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11524846
Change-Id: I38b762a4ad65059c737b962e87944b5f99ffc377
2020-06-15 06:55:17 +00:00
Mark Chien
969648b937
Merge "Replace ConnectivityManager as TetheringManager" into rvc-dev am: 2aa2b0a2f8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11770823
Change-Id: Ideb30fac609a33accdf40e949b63cc53ba05dfd3
2020-06-15 06:40:11 +00:00
Mark Chien
52a3551a7a
Merge "Replace ConnectivityManager as TetheringManager" into rvc-dev am: 2aa2b0a2f8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11770823
Change-Id: I50a9ff0710db37ae8513afbf876b3e7ca83fa787
2020-06-15 06:40:10 +00:00
Mark Chien
10ef08d80f
Merge "Remove schedule recheck logic from TetherService" into rvc-dev am: 49b74e24d6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11524846
Change-Id: I4e08cfb19cf7600ed8bdd42675152e518446e541
2020-06-15 06:39:59 +00:00
Mark Chien
ccdefc1ea5
Merge "Remove schedule recheck logic from TetherService" into rvc-dev am: 49b74e24d6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11524846
Change-Id: I8800bc4ae09b3ce8d318a81dbeee9afe17e57b8f
2020-06-15 06:39:57 +00:00
Mark Chien
2aa2b0a2f8
Merge "Replace ConnectivityManager as TetheringManager" into rvc-dev
2020-06-15 06:23:28 +00:00
Mark Chien
49b74e24d6
Merge "Remove schedule recheck logic from TetherService" into rvc-dev
2020-06-15 06:23:11 +00:00
SongFerng Wang
832a6e54af
Merge "Revert "Mainline: removed legacy UI for network selection mode."" into rvc-dev am: 518ffd7c76
am: d32cb38e45
am: c2f0ab12d8
am: 86aa01ea4f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11837795
Change-Id: Iefd7c8b53d1b57ecaafde5d9c4756d4f5338cfd4
2020-06-15 03:44:07 +00:00
Yanting Yang
3fc7639cee
Merge "Update App info behavior for mainline module" into rvc-dev am: 8357871465
am: 14da7dd1fa
am: c75c3ce3b3
am: be4dbdbea4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11822585
Change-Id: Id7f84e04a85a1c00c5fd172d451d140769008b8c
2020-06-15 03:43:43 +00:00
SongFerng Wang
86aa01ea4f
Merge "Revert "Mainline: removed legacy UI for network selection mode."" into rvc-dev am: 518ffd7c76
am: d32cb38e45
am: c2f0ab12d8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11837795
Change-Id: Ibd93f92445af453f6e01aafcb9a7d5531b0cdf5d
2020-06-15 03:31:15 +00:00
Yanting Yang
be4dbdbea4
Merge "Update App info behavior for mainline module" into rvc-dev am: 8357871465
am: 14da7dd1fa
am: c75c3ce3b3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11822585
Change-Id: Id210b618f8febff7f3be3dc85681adfde580087a
2020-06-15 03:30:59 +00:00
SongFerng Wang
24d6bb3ed0
Merge "Revert "Mainline: removed legacy UI for network selection mode."" into rvc-dev am: 518ffd7c76
am: d32cb38e45
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11837795
Change-Id: Ie3b090330bc2114a67e9229060ba5c6e23b74347
2020-06-15 03:18:41 +00:00
Yanting Yang
70a20ad328
Merge "Update App info behavior for mainline module" into rvc-dev am: 8357871465
am: 14da7dd1fa
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11822585
Change-Id: I9e15289b31778b138f1668bcf556e650635c621e
2020-06-15 03:18:31 +00:00
TreeHugger Robot
9cc918849c
Merge "NetworkRequestDialog: Exit the dialog on connect failure" into rvc-dev am: eac45c6a89
am: 051df5910e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11852224
Change-Id: Ie3357deaaa46e7a2172f9760b77321bd3705bc83
2020-06-15 03:18:21 +00:00
SongFerng Wang
58d36c2d48
Merge "Revert "Mainline: removed legacy UI for network selection mode."" into rvc-dev am: 518ffd7c76
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11837795
Change-Id: If6fbc2d5b6e82fedbb3f41ce7c11301491fd0c70
2020-06-15 03:12:27 +00:00
SongFerng Wang
d32cb38e45
Merge "Revert "Mainline: removed legacy UI for network selection mode."" into rvc-dev am: 518ffd7c76
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11837795
Change-Id: I8de7097200c087bac8cf74001000b96712f370d7
2020-06-15 03:11:50 +00:00
SongFerng Wang
518ffd7c76
Merge "Revert "Mainline: removed legacy UI for network selection mode."" into rvc-dev
2020-06-15 03:09:21 +00:00
Yanting Yang
14da7dd1fa
Merge "Update App info behavior for mainline module" into rvc-dev am: 8357871465
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11822585
Change-Id: Ia4f89a44ef37dc53ac32e25a2ee7757e652d3c1f
2020-06-15 03:07:05 +00:00
Yanting Yang
af13156dea
Merge "Update App info behavior for mainline module" into rvc-dev am: 8357871465
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11822585
Change-Id: I5852891ae326e0e88c184f94b46f5d9ff9134aa1
2020-06-15 03:07:05 +00:00
TreeHugger Robot
d452bfdfdc
Merge "NetworkRequestDialog: Exit the dialog on connect failure" into rvc-dev am: eac45c6a89
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11852224
Change-Id: I95f0cda2c92101ea746916cee813f0a2d56d2ac2
2020-06-15 03:06:26 +00:00
TreeHugger Robot
051df5910e
Merge "NetworkRequestDialog: Exit the dialog on connect failure" into rvc-dev am: eac45c6a89
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11852224
Change-Id: Ibe7a5bfe717c511c585eb651c3ba7cc0a412a3a9
2020-06-15 03:06:16 +00:00
Yanting Yang
8357871465
Merge "Update App info behavior for mainline module" into rvc-dev
2020-06-15 02:59:13 +00:00
TreeHugger Robot
eac45c6a89
Merge "NetworkRequestDialog: Exit the dialog on connect failure" into rvc-dev
2020-06-15 02:52:27 +00:00
Roshan Pius
924e9e39c1
NetworkRequestDialog: Exit the dialog on connect failure
...
Connection failure (similar to connection success) is the end of the
processng of a request. We should dismiss the dialog on connection
failure.
Bug: 158844146
Bug: 158616070
Test: Manual tests - Simulate connection failure and ensure that the
dialog vanishes with a toast.
Change-Id: I625ca76298ed549dbed76d398aea0c957c9102fc
Merged-In: I625ca76298ed549dbed76d398aea0c957c9102fc
2020-06-14 15:19:30 +00:00
Roshan Pius
81f9391105
NetworkRequestDialog: Exit the dialog on connect failure
...
Connection failure (similar to connection success) is the end of the
processng of a request. We should dismiss the dialog on connection
failure.
Bug: 158844146
Test: Manual tests - Simulate connection failure and ensure that the
dialog vanishes with a toast.
Change-Id: I625ca76298ed549dbed76d398aea0c957c9102fc
2020-06-12 19:28:16 +00:00
TreeHugger Robot
0ca5c9526b
Merge "[Wi-Fi] Add WifiNetworkDetailsFragment2 unit test cases"
2020-06-12 12:58:04 +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
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
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
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
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
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
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
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
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
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
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
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
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