TreeHugger Robot
caec49117e
Merge "Revert "[Provider Model] Internet Picker implementation.""
2020-11-26 09:41:09 +00:00
TreeHugger Robot
80e8ba3996
Merge "Add myself to OWNERS for emergency approval."
2020-11-26 09:26:59 +00:00
Bonian Chen
961f9588af
[automerger skipped] Merge "[Settings] Reduce the operation of VoLTE config redraw" am: 967311df7f
am: d9ba9cf45b
am: 69a79dda66
-s ours
...
am skip reason: Change-Id I56d4900b5bcb189693c99e870b013da97ed283db with SHA-1 d2e22f4cee
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1510918
Change-Id: Id75863e3531d04adeea34fc14c970240dd642bd3
2020-11-26 08:54:26 +00:00
Bonian Chen
4787217c52
[automerger skipped] Merge "[Settings] Add voice call status and VoLTE mode detection into VoLTE UI test case" am: 3c934b2859
am: 80a69cb5e0
am: fc69b02cde
-s ours
...
am skip reason: Change-Id I8b6a212dc727f1ab78f4dd280cb41966b7054180 with SHA-1 227329b2f7
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1510917
Change-Id: I41856bea6a1f7a0052c123823d9314ba52fe2f22
2020-11-26 08:54:06 +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
TreeHugger Robot
65bc7af6bc
Merge "Fix robotests failure in connectivity settings"
2020-11-26 07:20:30 +00:00
Jason Chiu
ec3d482884
Revert "[Provider Model] Internet Picker implementation."
...
This reverts commit 329d753a29
.
Reason for revert: Broken tests on NetworkProviderSettingsTest
Bug: 174285440
Change-Id: I47e6a9479559cb424bd4b8ac0e967f013f2fba86
2020-11-26 07:05: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
Hugh Chen
e61a5e3bc7
Fix robotests failure in connectivity settings
...
Bug: 174212358
Test: make -j42 RunSettingsRoboTests
Change-Id: I50baeb18b00f16808dc958d77251a01ba991adf6
2020-11-26 11:36:30 +08:00
Tom Hsu
ffd1ed3e8b
Merge "[Provider Model] Internet Picker implementation."
2020-11-26 02:38:33 +00:00
luyota
b06d89475b
Add myself to OWNERS for emergency approval.
...
Test: N/A
Change-Id: I6d07bac17d409483599eaa12696878cfde548d26
2020-11-26 01:34:01 +00:00
Alex Stetson
c62327981e
Allow extended apps to change package name
...
For the added flexibility of allowing apps that extend from settings to
have a different package name, these instances of com.android.settings
as a xmlns need to be replaced with res-auto (which subsitutes the
package name at build time).
Bug: 174264676
Test: manual (sdk_gphone), make -j20 SettingsRoboTests
Change-Id: I03acda25dbf4d028cc73b77f41ad5dedca110ecb
2020-11-25 14:28:25 -08:00
TreeHugger Robot
301603dfe3
Merge "[Settings] init UI entry for Cross SIM calling"
2020-11-25 17:14:40 +00:00
Bonian Chen
0bff334632
[Settings] init UI entry for Cross SIM calling
...
Create an empty UI entry for Cross SIM calling.
TODO: fill-in implementation based on UI within document.
Document:
https://docs.google.com/document/d/1INEwrq5_M62hJcRMshdO0OaFruVR0goYByxdpMdFr_o/edit?disco=AAAAHQo7ang&ts=5fadc9b4&usp_dm=true#heading=h.8gw4a7e503pz
Bug: 174012397
Test: manual
Change-Id: I344a18954924c4665295ef244bfee773f3f98d55
2020-11-25 15:51:08 +00:00
Treehugger Robot
c9dd92e991
Merge "Fix unexpected highlight" am: e763da5884
am: 6e347e61ca
am: b03d666b47
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1490657
Change-Id: I60dbfab818b97007025b1a295d1c8d157320279a
2020-11-25 11:05:55 +00:00
Treehugger Robot
b03d666b47
Merge "Fix unexpected highlight" am: e763da5884
am: 6e347e61ca
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1490657
Change-Id: Iee515a52a2bd470e2587202427a76826f8ba5f32
2020-11-25 10:46:22 +00:00
Treehugger Robot
6e347e61ca
Merge "Fix unexpected highlight" am: e763da5884
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1490657
Change-Id: I421b2f253178e9adba05fc4ada6a5b7d2e9498f4
2020-11-25 10:19:53 +00:00
Treehugger Robot
e763da5884
Merge "Fix unexpected highlight"
2020-11-25 09:00:54 +00:00
TreeHugger Robot
3b95bd6792
Merge "Apply banner message for night light page"
2020-11-25 05:35:14 +00:00
timhypeng
9f66bd0be8
Add FLAG_RECEIVER_FOREGROUND to run redirect intent at foreground priority
...
Bug: 172178632
Test: make -j50 RunSettingsRoboTests
Change-Id: Idf6b07fb5918c487956fd1485d409c3161525f1b
2020-11-25 11:17:24 +08:00
Weng Su
378eb869ad
[Provider Model] Saved networks Settings UI change
...
- Change sub-title to “OTHER NETWORKS”
- Screenshot
https://screenshot.googleplex.com/35k9YjnrN3wkSHh
Bug: 172788849
Test: manual test
Change-Id: Ib41b0e7955f9afdfb74343adad5883bb89c3f03b
2020-11-24 18:14:18 +00:00
TreeHugger Robot
4a921534ef
Merge "Apply top intro preference for app pinning feature"
2020-11-24 16:17:07 +00:00
TreeHugger Robot
e5ee4152cb
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 7b203b94d5
-s ours am: 88e42134ed
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13119748
Change-Id: I9ae3e864cde46e07b5dd7f9cf900651bd08c54e1
2020-11-24 16:02:10 +00:00
Bill Yi
171dd4219c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 84c4c0400b
-s ours am: d912bef0f6
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13119749
Change-Id: I594302753dd38e4a22d433bacd2458c1f13d9beb
2020-11-24 16:01:41 +00:00
TreeHugger Robot
88e42134ed
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 7b203b94d5
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13119748
Change-Id: I53fdaebc933fa943fbb6aef7539935aac8d2218d
2020-11-24 15:42:48 +00:00
Bill Yi
d912bef0f6
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 84c4c0400b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13119749
Change-Id: I062e7ac2e398cd21f1e94638a46d3067d5a938ee
2020-11-24 15:42:41 +00:00
TreeHugger Robot
7b203b94d5
Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev
2020-11-24 15:36:06 +00:00
TreeHugger Robot
502eef5314
Merge "Fix crash on connected devices settings"
2020-11-24 13:25:01 +00:00
Bill Yi
84c4c0400b
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I924ad03633e508567ba0d58b8784793758ab666f
2020-11-24 12:46:29 +00:00
Bill Yi
5b2805da81
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Iba0e1e93ff77cf74bacf6f73049157826afaca2d
2020-11-24 12:20:12 +00:00
TreeHugger Robot
8766032372
[automerger skipped] Merge "Revert^2 "Update the summary of AoD when Bedtime mode is on"" into rvc-qpr-dev am: b115ff305e
-s ours am: d9b1c33aa6
-s ours
...
am skip reason: Change-Id Id2511cb0ad93b44f6bf701a707b7ddef9438653d with SHA-1 bca70dd22d
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13090677
Change-Id: I12b02d732004b27c2cdf7fb75d0ba8c24b05de65
2020-11-24 12:11:05 +00:00
TreeHugger Robot
8359fac985
Merge "Fix anr issue on connected devices settings"
2020-11-24 09:56:11 +00:00
Hugh Chen
8f29850cca
Fix crash on connected devices settings
...
If disconnected bluetooth devices didn't exist in
recent devices, the index will return -1. Our condition
didn't check this situation, the IndexOutOfBoundsException
will throw when this case happens.
This CL adds the condition to check whether index is over
than or equal 0 to fix IndexOutOfBoundsException.
Bug: 173059077
Test: make -j42 RunSettingsRoboTests
Change-Id: Id93f4cb6bded83540045c5e8c21c6f6122a39fed
2020-11-24 17:54:48 +08:00
TreeHugger Robot
d9b1c33aa6
[automerger skipped] Merge "Revert^2 "Update the summary of AoD when Bedtime mode is on"" into rvc-qpr-dev am: b115ff305e
-s ours
...
am skip reason: Change-Id Id2511cb0ad93b44f6bf701a707b7ddef9438653d with SHA-1 bca70dd22d
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13090677
Change-Id: I587ecdea602390d060d18cb8dd4a14edbade7074
2020-11-24 09:52:05 +00:00
Hugh Chen
9ed009ad47
Fix output switcher will show 2 media session when remote playing
...
Before this CL, output switcher will show 2 media sessions when
some apps are remote playing. The root cause is some apps will
also create local media sessions when they cast media to remote
playing.
This CL add condition to only show remote sessions on output switcher
if apps both have remote and local sessions.
Bug: 169052790
Test: make -j42 RunSettingsRoboTests
Change-Id: I80479d35b2bb2e353cf41f41f457f2dfd15cadbf
Merged-In: I80479d35b2bb2e353cf41f41f457f2dfd15cadbf
(cherry picked from commit e16a8077b5
)
2020-11-24 16:11:56 +08:00
TreeHugger Robot
b115ff305e
Merge "Revert^2 "Update the summary of AoD when Bedtime mode is on"" into rvc-qpr-dev
2020-11-24 06:46:48 +00:00
Edgar Wang
c5dfd3eb76
Revert^2 "Update the summary of AoD when Bedtime mode is on"
...
Since Bedtime mode can suppress AoD, after reviewed by UX, we decide
update the summary to "Unavailable because Bedtime mode is on" when AoD
is suppressed by Bedtime mode.
Bug: 168790245
Test: manual & robotest
Change-Id: I96b401bcba213598344c4c4f01b12c275304b809
Merged-In: Id2511cb0ad93b44f6bf701a707b7ddef9438653d
2020-11-24 05:34:49 +00:00
tim peng
2a6ffedfee
Merge "Redirect to output switcher panel to the new dialog"
2020-11-24 01:18:08 +00:00
Fan Zhang
66e0dfe78f
Merge "Fix a typo"
2020-11-23 20:44:30 +00:00
Sarah Chin
af59e706d0
[automerger skipped] Merge "Update ICC lock API methods" am: bf2a6d1e11
am: 690de7e76e
am: a17907084e
-s ours
...
am skip reason: Change-Id Ia4ba222dfa7d7756a3675f75b3467d0265967516 with SHA-1 536cb60c65
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1506478
Change-Id: Ia6407ef8769ab5fd902cdf9007309823380859b6
2020-11-23 19:29:24 +00:00
Sarah Chin
a17907084e
Merge "Update ICC lock API methods" am: bf2a6d1e11
am: 690de7e76e
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1506478
Change-Id: Ia8a96a3271de030b6ebe6dc40c734d75887baa0a
2020-11-23 18:50:26 +00:00
Fan Zhang
c571cb42b9
Fix a typo
...
Fix: 174043156
Test: manual
Change-Id: If1f693d77e4e1eebe58f5f2d23350e6b968e8540
2020-11-23 10:48:33 -08:00
Sarah Chin
690de7e76e
Merge "Update ICC lock API methods" am: bf2a6d1e11
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1506478
Change-Id: Ia11d5dd7bd456bb0bc51078aeee97a166ca39e77
2020-11-23 18:17:48 +00:00
Sarah Chin
bf2a6d1e11
Merge "Update ICC lock API methods"
2020-11-23 17:50:19 +00:00