Treehugger Robot
b07d67eeaf
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 97bc1fcff7
-s ours am: 7c2ed6be16
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1519229
Change-Id: I719c254b4796c4dd1d53dc30e0f53d63b3e75fce
2020-12-06 16:06:01 +00:00
Treehugger Robot
4d181cc04f
Merge "Import translations. DO NOT MERGE ANYWHERE"
2020-12-06 16:05:53 +00:00
Treehugger Robot
7c2ed6be16
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 97bc1fcff7
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1519229
Change-Id: I215cb3c7612b323dd67437d31dfee850b8a12227
2020-12-06 15:48:44 +00:00
Treehugger Robot
97bc1fcff7
Merge "Import translations. DO NOT MERGE ANYWHERE"
2020-12-06 15:36:04 +00:00
Bill Yi
10caa304c0
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I6e8d356f279ba834c5493badcb5a0f8e7b916c6c
2020-12-06 12:37:23 +00:00
Bill Yi
b9a5248b95
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I518f13a32c239dfc98b053ad002d31577cd41a9a
2020-12-06 12:10:17 +00:00
Bill Yi
a815a12c40
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I267bdda4fe2a243d548b1842e9a08950e61069c0
2020-12-05 16:49:34 -08:00
TreeHugger Robot
8e913664b5
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 448ec6b5fe
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13168703
Change-Id: Id2a91ce9acfc651d32f9a3ca46f52612a8904eb7
2020-12-05 01:55:42 +00:00
TreeHugger Robot
448ec6b5fe
Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master
2020-12-05 01:04:28 +00:00
Bill Yi
d582948ff6
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d890249a20
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13168705
Change-Id: Ibdf3ca3e032c9eba6d58bfca5409556ede8d15e7
2020-12-05 00:10:24 +00:00
Bill Yi
d890249a20
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I106d32515484c4ad081b1a0bc2bf01d79b5097ad
2020-12-04 03:58:02 -08:00
Bill Yi
d0f3a4ca19
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I2d0e585779a9e28de3aeb1eb8ca3246a09b717d4
2020-12-04 03:09:46 -08:00
Wesley.CW Wang
15cad1e712
Update Settings Battery Defender strings am: 45a02ee994
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13146801
Change-Id: I9b6d03d465b981e13da2f056680d04f6f4f3ec6e
2020-12-04 03:39:03 +00:00
Wesley.CW Wang
45a02ee994
Update Settings Battery Defender strings
...
Bug: 172794045
Test: make SettingsRoboTests
Change-Id: Ia9612fe891431869dc8e84e78db952ac8f1ab3dc
2020-12-03 19:00:44 +00:00
TreeHugger Robot
1710016924
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: ec47b9a783
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13161901
Change-Id: I2cb6d59d77c7d4671660f064f492f3337a176709
2020-12-03 17:18:05 +00:00
TreeHugger Robot
ec47b9a783
Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev
2020-12-03 16:51:46 +00:00
Bill Yi
4b1662623a
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ied07776386dcf321cb8405f5f972bc792b696da4
2020-12-03 14:54:31 +00:00
Xin Li
b23c8335fb
[automerger skipped] Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855 am: cec81e3030
-s ours
...
am skip reason: Change-Id Iafcefc2aa64cf3c50b1d139ec0204a315be29da7 with SHA-1 159de41477
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13122824
Change-Id: I63b84242c8f858bb3abd3d04a64ccb3e3db8d3ac
2020-12-03 04:25:17 +00:00
TreeHugger Robot
473d899903
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 084b1e0ece
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13154699
Change-Id: Ibe505474c923eb2a548f1516387ec3cde4cfb549
2020-12-02 18:31:24 +00:00
Bill Yi
b6bb945dac
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a86f4b1fc8
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13153923
Change-Id: I30ebedab39bbe054f5cfc1e5d2983079be268fe6
2020-12-02 18:31:16 +00:00
TreeHugger Robot
084b1e0ece
Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev
2020-12-02 17:33:31 +00:00
Bill Yi
def7fc914e
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Id901b94be193bb820bf90a645d7c716497af96dc
2020-12-02 00:31:42 -08:00
Xin Li
cec81e3030
Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855
...
Bug: 172690556
Merged-In: Iafcefc2aa64cf3c50b1d139ec0204a315be29da7
Change-Id: I5d4e70fe723d890b5694c3490d6ec841b1ac596e
2020-12-02 00:29:15 -08:00
Bill Yi
a86f4b1fc8
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I91b4abf5fc6aa17632203a700fbc0306a231bdf0
2020-12-01 23:44:15 -08:00
Treehugger Robot
2112d09ac6
Merge "Makes this class abstract so that Tradefed's automatic search for runnable test classes doesn't get confused by this class." am: 4f8b47e5c2
am: 0cf0f58ceb
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1515029
Change-Id: I9804a65d41dd36fea23925e62a8958d0808a87c6
2020-12-01 02:57:03 +00:00
Treehugger Robot
0cf0f58ceb
Merge "Makes this class abstract so that Tradefed's automatic search for runnable test classes doesn't get confused by this class." am: 4f8b47e5c2
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1515029
Change-Id: Ib92cfdb77164a7b24e65b2a028f963b606144096
2020-12-01 02:41:37 +00:00
Treehugger Robot
4f8b47e5c2
Merge "Makes this class abstract so that Tradefed's automatic search for runnable test classes doesn't get confused by this class."
2020-12-01 01:59:21 +00:00
Joseph Murphy
6d78a33475
Makes this class abstract so that Tradefed's automatic search for runnable test classes doesn't get confused by this class.
...
Bug: b/174168302
Change-Id: I765e3f6c7f8ef2f2734862e75513e73353fea4c0
2020-12-01 00:25:00 +00:00
timhypeng
b97ff55b3b
Add FLAG_RECEIVER_FOREGROUND to run redirect intent at foreground priority
...
Bug: 172178632
Test: make -j50 RunSettingsRoboTests
Merged-In: Idf6b07fb5918c487956fd1485d409c3161525f1b
Change-Id: Idf6b07fb5918c487956fd1485d409c3161525f1b
2020-11-30 13:34:16 +00:00
timhypeng
7207584d6c
Redirect to output switcher panel to the new dialog
...
-Redirect for Cast button
-Send intent when call MediaOutputPanel::create()
-Return null to finish the activity
Bug: 172178632
Test: make -j50 RunSettingsRoboTests
Merged-In: I1038e237113f433c847aff98a45b1dd6089d80a8
Change-Id: I1038e237113f433c847aff98a45b1dd6089d80a8
2020-11-30 13:34:07 +00:00
timhypeng
6472c98ffa
Update rule of launching media output dialog
...
-Do not hide Media Output Dialog in Settings, and let dialog handles
-Hide Media output slice panel when launching dialog
Bug: 155822415
Test: make -j50 RunSettingsRoboTests
Merged-In: I16732f625f100b259d6e53c85db40af0ec1652c5
Change-Id: I16732f625f100b259d6e53c85db40af0ec1652c5
2020-11-30 13:33:59 +00:00
timhypeng
7127fff467
Update OutputSwitcher from MediaOutputSlice to MediaOutputDialog in Settings
...
-Update entry point at media indicator in volume panel
-Update entry point at remote media slice in volume panel
-Update entry point at remote volume group in Sound Settings
-Update entry point at media output preference in Sound Settings
-Hide Media output dialog when the caller is not active
Bug: 155822415
Test: make -j50 RunSettingsRoboTests
Merged-In: Ib6c86067522925c439f336644e4d027dbae3379c
Change-Id: Ib6c86067522925c439f336644e4d027dbae3379c
2020-11-30 13:33:47 +00:00
timhypeng
6afe358556
Add PairNewBluetoothReceiver to launch Bluetooth pairing page
...
-A new SystemUI dialog requires to launch Bluetooth pairing page
-Add receiver in manifest
Bug: 155822415
Test: build pass
Merged-In: I16767af3afb05eab7246be133011bc9148909d11
Change-Id: I16767af3afb05eab7246be133011bc9148909d11
2020-11-30 13:33:37 +00:00
TreeHugger Robot
e2e2607455
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 9b7efe7e65
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13140302
Change-Id: I6fc01abdc33861887340313b475b3195e8bd7d28
2020-11-30 00:59:32 +00:00
TreeHugger Robot
9b7efe7e65
Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev
2020-11-30 00:56:24 +00:00
TreeHugger Robot
6501f5cef7
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 47ec10611a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13140301
Change-Id: Ife76cf99f06d97b73e1a4c71f1048cf8fa601c9e
2020-11-30 00:48:55 +00:00
TreeHugger Robot
47ec10611a
Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev
2020-11-30 00:44:24 +00:00
Bill Yi
cd97ee0dc7
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fa52d17990
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13140300
Change-Id: Ibcd465c09efe6a43c0b99fbc54111dde9644fae4
2020-11-30 00:43:22 +00:00
Bill Yi
083ed222ef
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I3eb3ece2a217721085c78454efaeb28374059b64
2020-11-29 03:26:43 -08:00
Bill Yi
64801bbc60
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I2bc9b3c357b5c05495fa078ce360f334f054f655
2020-11-29 02:40:29 -08:00
Bill Yi
fa52d17990
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Icac16a2140545637a0b86acaca0f97c85492c7a0
2020-11-29 01:53:13 -08:00
timhypeng
8469dea09b
Fix java.lang.ArrayIndexOutOfBoundsException in RemoteVolumeGroupController
...
-Caused by removing and adding preference at the same time
-Make preference operation method synchronized
-Not to update preference by removing and adding. To check session status and update its content to preference
-Post to UI thread to handle the onDeviceListUpdate() callback from framework
Bug: 170049403
Test: make -j50 RunSettingsRoboTests
Merged-In: Ibfc11e1bd99ba2e578b5d9e7dcc9132e372b68dd
Change-Id: Ibfc11e1bd99ba2e578b5d9e7dcc9132e372b68dd
(cherry picked from commit 1268629fda
)
2020-11-27 07:20:20 +00:00
Bonian Chen
69a79dda66
Merge "[Settings] Reduce the operation of VoLTE config redraw" am: 967311df7f
am: d9ba9cf45b
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1510918
Change-Id: I7e23c867d495ae670c975f1f2c8d54fd71ddfeb0
2020-11-26 08:40:23 +00:00
Bonian Chen
fc69b02cde
Merge "[Settings] Add voice call status and VoLTE mode detection into VoLTE UI test case" am: 3c934b2859
am: 80a69cb5e0
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1510917
Change-Id: Iaa5acc6cfdd34acf82c0b20b6016f30963c7b737
2020-11-26 08:40:08 +00:00
Bonian Chen
d9ba9cf45b
Merge "[Settings] Reduce the operation of VoLTE config redraw" am: 967311df7f
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1510918
Change-Id: I84f2911036c321bb2129e4df82125c9fe3b54bc7
2020-11-26 08:24:12 +00:00
Bonian Chen
80a69cb5e0
Merge "[Settings] Add voice call status and VoLTE mode detection into VoLTE UI test case" am: 3c934b2859
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1510917
Change-Id: I3c19b17b3daa801a4fac4f4cb5742113e3602ba5
2020-11-26 08:23:25 +00:00
Bonian Chen
967311df7f
Merge "[Settings] Reduce the operation of VoLTE config redraw"
2020-11-26 07:35:21 +00:00
Bonian Chen
3c934b2859
Merge "[Settings] Add voice call status and VoLTE mode detection into VoLTE UI test case"
2020-11-26 07:35:00 +00:00
Bonian Chen
f9256b41f2
[Settings] Reduce the operation of VoLTE config redraw
...
There're 3 VoLTE configuration UIs sharing the same configuration,
but only 1 of them will be displayed.
The 3 classes extending Enhanced4gBasePreferenceController are:
1. Enhanced4gAdvancedCallingPreferenceController
2. Enhanced4gCallingPreferenceController
3. Enhanced4gLtePreferenceController
They're different in the value of getMode().
The design within Enhanced4gBasePreferenceController only allows to show one of them.
Which means, the other two don't need to register for PhoneStateListener and should ignore actions in response to it when receiving callback from PhoneStateListener.
Through detecting the VoLTE configuration mode, some operations could be
avoided.
This fix is targeting to avoid these operations from happening.
Bug: 172987488
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=Enhanced4gBasePreferenceControllerTest
Merged-In: I56d4900b5bcb189693c99e870b013da97ed283db
(cherry picked from commit d2e22f4cee
)
Change-Id: I92e4b84b81622548fb356a4c7af99668bd2a9e00
2020-11-26 14:18:25 +08:00
Bonian Chen
9769677a3c
[Settings] Add voice call status and VoLTE mode detection into VoLTE UI test case
...
1. VoLTE UI should gray out during voice call.
2. UI should be invisible when VoLTE mode mismatch.
Bug: 172781455
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=Enhanced4gBasePreferenceControllerTest
Merged-In: I8b6a212dc727f1ab78f4dd280cb41966b7054180
(cherry picked from commit 227329b2f7
)
Change-Id: I1bd239b6434038323a0689e2bc3bf05182bfcd45
2020-11-26 13:52:47 +08:00