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
448ec6b5fe
Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master
2020-12-05 01:04:28 +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
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
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
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
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
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
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
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
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
Taesu Lee
ed51eed0c3
Fix unexpected highlight
...
Check a key of preferences also.
Bug: 172699068
Test: Manual
make RunSettingsRoboTests
ROBOTEST_FILTER=HighlightablePreferenceGroupAdapterTest
Signed-off-by: Taesu Lee <taesu82.lee@samsung.com >
Change-Id: I9bb0ea68de0ab1bcc2134345905644d869f69e28
2020-11-13 15:07:04 +09:00
Tobias Thierer
7a8b3a140e
Merge "Fix malformed OWNERS." am: b460d47489
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1495947
Change-Id: I7d6c0fa35036ac7d0ac130c0b96fbb181f29aa9d
2020-11-11 21:06:20 +00:00
Tobias Thierer
b460d47489
Merge "Fix malformed OWNERS."
2020-11-11 20:46:05 +00:00
Tobias Thierer
6b3df1be9e
Fix malformed OWNERS.
...
Per go/android-owners, include directions should be of the form
[gerrit_project_name]:[absolute_path_to_included_file].
Exempt-From-Owner-Approval: Only editing OWNERS file that ought
to be owned by ourselves, anyway.
Bug: 159055442
Test: Treehugger
Change-Id: I9130985b484349264f1fc42c320e93b2bc672a59
2020-11-11 20:45:53 +00:00
Treehugger Robot
3cda0e9872
Merge "Fix crash on "Connection preferences"" am: b75c952800
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1485157
Change-Id: I329bb9cb76f9dddd02c3d339a7fc450f0e0b5698
2020-11-04 08:40:13 +00:00
Treehugger Robot
b75c952800
Merge "Fix crash on "Connection preferences""
2020-11-04 08:14:27 +00:00
Hugh Chen
eda6d60e05
Fix crash on "Connection preferences"
...
This CL adds a null check condition to avoid crash for
some device not support PrintManager.
Bug: 159848003
Test: make -j42 SettingsGoogle
Change-Id: Ic6c4c17bb563458f4f5a61dc0d93ae22b05f8763
2020-11-03 11:02:38 +08:00
Treehugger Robot
f977a632b0
Merge "backup settings: Update OWNERS." am: c7c020688d
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1480538
Change-Id: I3074b0da6146f9cd5b5eeb4d4644c84c689f590d
2020-11-02 22:48:18 +00:00
Treehugger Robot
c7c020688d
Merge "backup settings: Update OWNERS."
2020-11-02 21:55:49 +00:00
Andrei-Valentin Onea
770e30b1f9
Merge "Fix app compat dashboard from settings app" am: 4445b40a65
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1481502
Change-Id: I4b33afc345e7e3e2a45cb71777843a5aa8eb77df
2020-11-02 15:04:33 +00:00
Andrei-Valentin Onea
4445b40a65
Merge "Fix app compat dashboard from settings app"
2020-11-02 14:52:50 +00:00
Tobias Thierer
efd5a23b73
backup settings: Update OWNERS.
...
Refer to platform OWNERS + bug component.
Bug: 159055442
Test: Treehugger
Change-Id: I2fdbf98a8326285ef41482cc207ed9aa94e9a0f4
Merged-In: I2fdbf98a8326285ef41482cc207ed9aa94e9a0f4
2020-10-31 01:23:27 +00:00
Andrei Onea
b0a6dd680e
Fix app compat dashboard from settings app
...
Fix an issue due to recent changes tha made the settings app
accidentally categorize non sdk gated changes as targetSdk > -1.
The recent changes made target sdk changes have a '>=' condition instead
of strictly '>', so address that issue as well.
Bug: 172043600
Test: open App Compatibility Changes option in Developer Options
Change-Id: Ic5ee203c5a82ac982164304e3ae399947a39e058
2020-10-30 16:38:08 +00:00
Sarah Chin
94cabf8a02
Merge "Hide 'View plan' button in data usage settings" am: 07f2c27cbf
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1480638
Change-Id: I851c0994ed2aa79148b2b22d1733256c845a50a9
2020-10-30 03:24:46 +00:00
Sarah Chin
07f2c27cbf
Merge "Hide 'View plan' button in data usage settings"
2020-10-30 02:48:14 +00:00
Sarah Chin
d6e4e9d8fe
Hide 'View plan' button in data usage settings
...
There are currently no callers of the setSubscriptionPlan() API that
have a MDP app set up. Remove the button when SubscriptionPlans are
defined, since it does nothing and causes confusion for users.
Test: manually verify button does not exist when a plan is defined
Test: make RunSettingsRoboTests
Bug: 169806315
Change-Id: Ieda020bfa692e9465d6297e50cf338deff91a8a9
Merged-In: Ieda020bfa692e9465d6297e50cf338deff91a8a9
2020-10-29 16:36:28 -07:00
George Chang
ef4f13c936
Merge "Support RTL mode in payment option" am: 7e65d7f6fc
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1476376
Change-Id: Ibfb1960e19f913cff8f879beb3da011d60108aa3
2020-10-28 13:16:12 +00:00
George Chang
7e65d7f6fc
Merge "Support RTL mode in payment option"
2020-10-28 12:42:11 +00:00
Treehugger Robot
b50fba15b3
Merge "Settings: Set preference controller for all VideoPreference widget usages" am: 4e04e32679
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1475616
Change-Id: Ief5693cd34838cec35e7e5c650752c3b4cdb9d02
2020-10-28 06:28:27 +00:00
Treehugger Robot
4e04e32679
Merge "Settings: Set preference controller for all VideoPreference widget usages"
2020-10-28 06:05:41 +00:00
George Chang
13f1c1249d
Support RTL mode in payment option
...
Bug: 156770848
Test: right-aligned under RTL mode
Change-Id: I01879056bbac08da0856f35012c8c8456328071c
2020-10-27 11:49:33 +00:00
LuK1337
c6b9c9fa86
Settings: Set preference controller for all VideoPreference widget usages
...
Fixes blank VideoPreference for settings with missing media.
Test: manual, open quickly open camera or other affected prefs
Change-Id: I5d4ffbcaa9fa1a344bb66abe53cc01e7be5e07b2
2020-10-26 23:10:11 +00:00
Automerger Merge Worker
bab12d1aa2
Merge "Merge "Replace TelephonyManager methods for mobile data" am: c2a4d3ec70" into stage-aosp-master
2020-10-22 21:35:15 +00:00
Hall Liu
5a5e0e021d
Merge "Replace TelephonyManager methods for mobile data" am: c2a4d3ec70
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1470180
Change-Id: I31b5513de4f5f9985f44ce124e4f0eea83ec107f
2020-10-22 21:19:11 +00:00
Hall Liu
4af7d6a7d2
Merge "Replace TelephonyManager methods for mobile data" am: c2a4d3ec70
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1470180
Change-Id: I02440f0bc76eea3d66526e7c1d02343893603cab
2020-10-22 21:14:05 +00:00