Commit Graph

71738 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
Sarah Chin
111a371005 Merge "Update setCdmaRoaming/SubscriptionMode APIs" am: b26cf2d260 am: 04b9046ec6 am: caa76d8261
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1506517

Change-Id: I3305ed2659027a109672c10a06b70300c66ba80e
2020-11-20 04:43:00 +00:00
TreeHugger Robot
5c0a32c3de [automerger skipped] Merge "Revert "Import translations. DO NOT MERGE ANYWHERE"" into rvc-qpr-dev am: 1e1c7c1b0e -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13094553

Change-Id: I5bda8d3f4f4cb3b67f8053b623b3a68e32c2a22e
2020-11-20 04:19:17 +00:00
Sarah Chin
caa76d8261 Merge "Update setCdmaRoaming/SubscriptionMode APIs" am: b26cf2d260 am: 04b9046ec6
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1506517

Change-Id: I8780119041580b96c823b76ba944599484ac317f
2020-11-20 04:08:18 +00:00
TreeHugger Robot
1e1c7c1b0e Merge "Revert "Import translations. DO NOT MERGE ANYWHERE"" into rvc-qpr-dev 2020-11-20 04:02:14 +00:00
Sarah Chin
04b9046ec6 Merge "Update setCdmaRoaming/SubscriptionMode APIs" am: b26cf2d260
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1506517

Change-Id: I5d299e2907e204ffccbe898eef0c508b1e518bb0
2020-11-20 03:33:18 +00:00
Bill Yi
1aa452a6f7 Revert "Import translations. DO NOT MERGE ANYWHERE"
This reverts commit fc3b543d7d.

Reason for revert: Incorrect import

Change-Id: I0d37e83fe5cc4ee8e55a303e38e89dcd1fb7d872
2020-11-20 02:57:59 +00:00
Sarah Chin
b26cf2d260 Merge "Update setCdmaRoaming/SubscriptionMode APIs" 2020-11-20 02:45:35 +00:00
Sarah Chin
e962520266 Update ICC lock API methods
Test: atest TelephonyManagerTest
Bug: 171884262
Change-Id: Ia4ba222dfa7d7756a3675f75b3467d0265967516
Merged-In: Ia4ba222dfa7d7756a3675f75b3467d0265967516
2020-11-19 15:04:12 -08:00
Sarah Chin
ce9fda5a60 Update setCdmaRoaming/SubscriptionMode APIs
Test: atest TelephonyManagerTest
Test: make RunSettingsRoboTests
Bug: 171884158
Bug: 171883908
Change-Id: Ib78149c41612d56a46974621eb71b5e0cfe97c5a
Merged-In: Ib78149c41612d56a46974621eb71b5e0cfe97c5a
2020-11-19 14:46:37 -08:00
TreeHugger Robot
7d86bc9ca9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: e2ee9d02f5 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13086497

Change-Id: I4520d3b4cd60d8c10a0c6347edff34facd505308
2020-11-19 19:04:50 +00:00
TreeHugger Robot
e2ee9d02f5 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2020-11-19 18:17:44 +00:00
Jakub Pawlowski
4f7edf692f Prevent overlay drawing on top of Bluetooth activity dialog
Bug: 168504491
Change-Id: I04ebe580db2b299af2bd5e44e0b0f20bd42f8535
2020-11-19 13:47:53 +01:00
Chris Manton
1951d27669 Add bluetooth package to permission request intent
Limit the component that may resolve this intent to the
bluetooth package.

Bug: 158219161
Test: Security Fix
Tag: #security
Change-Id: If732f940a7aa256f5975349118e8eb6cf5584676
2020-11-19 10:20:24 +00:00
Sarah Chin
de7bf28a18 [automerger skipped] Merge "Update signal strength on ServiceState in service" am: 3169b21b4e am: 4928687552 am: a86bc76ef9 -s ours
am skip reason: Change-Id Ibf69f9e9ec2acafef1316069d37b8d2a27d7d4d7 with SHA-1 62efb18365 is in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1505031

Change-Id: Ia11e13192dbef00b7071a9f4d9a3cd47caa5a58a
2020-11-19 10:05:57 +00:00
Sarah Chin
a86bc76ef9 Merge "Update signal strength on ServiceState in service" am: 3169b21b4e am: 4928687552
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1505031

Change-Id: I908564533b6813aeffe1ed57ef0416dd7f1fce25
2020-11-19 09:52:29 +00:00
Sarah Chin
4928687552 Merge "Update signal strength on ServiceState in service" am: 3169b21b4e
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1505031

Change-Id: I33153c2891cd16bd4f4cb2d5e792aa20154226b9
2020-11-19 09:40:30 +00:00
Sarah Chin
3169b21b4e Merge "Update signal strength on ServiceState in service" 2020-11-19 09:17:18 +00:00
Sarah Chin
99aad232be Update signal strength on ServiceState in service
Test: make RunSettingsRobotTests
Bug: 167643728
Change-Id: Ibf69f9e9ec2acafef1316069d37b8d2a27d7d4d7
Merged-In: Ibf69f9e9ec2acafef1316069d37b8d2a27d7d4d7
(cherry picked from commit 3b3704d693)
2020-11-19 00:11:36 -08:00
Wesley.CW Wang
e0429fdeea Add Battery Defender strings to Settings am: 6117acedb0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13053209

Change-Id: I3077301357b48298cf018c23ec4b738808c3deea
2020-11-19 06:55:03 +00:00
Wesley.CW Wang
6117acedb0 Add Battery Defender strings to Settings
Bug: 172794045
Test: make SettingsRoboTests
Change-Id: I44f669879a4cb141d3107f77c6a78a1a4406e37c
2020-11-19 06:43:06 +00:00
Yi-yo Chiang
d69b381ab1 Revert "Update the summary of AoD when Bedtime mode is on" am: cd4a35de8e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13082204

Change-Id: Ief1b70558800858ac67c0857e562740ae5d42142
2020-11-19 05:22:14 +00:00
Yi-yo Chiang
cd4a35de8e Revert "Update the summary of AoD when Bedtime mode is on"
Revert "Update the summary of Idle lock screen when Bedtime mode..."

Revert submission 13071396-cherrypick-cherrypick-bedtime-hpxwlbiuim-0q85x8kaar

Reason for revert: Broken test b/173663404

Reverted Changes:
Id2511cb0a:Update the summary of AoD when Bedtime mode is on
I041599b9c:Update the summary of Idle lock screen when Bedtim...

Bug: 173663404
Change-Id: I9bea7499393d3ab1733b82140942499dddd9a2aa
Merged-In: I3b7053ad752f548f421dcca10cc1203500b1220b
2020-11-19 04:32:44 +00:00