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
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
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
Hall Liu
c2a4d3ec70
Merge "Replace TelephonyManager methods for mobile data"
2020-10-22 17:27:59 +00:00
Hall Liu
17ba8166a3
Replace TelephonyManager methods for mobile data
...
TelephonyManager had a minor refactor of some of the methods revolving
around mobile data. Change code in Settings to use the new ones instead.
Exempt-From-Owner-Approval: Cherry-picked from internal
Bug: 169367013
Test: existing unit tests, manual
Change-Id: I7ebae37373d53fb2c59b6b546232dbddf77398d4
Merged-In: I7ebae37373d53fb2c59b6b546232dbddf77398d4
2020-10-21 23:38:20 +00:00
Treehugger Robot
0a2c406023
Merge "Highlight the MMS messages preference for ACTION_MMS_MESSAGE_SETTING" am: 21846b228b
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1405190
Change-Id: I195b2215ba250f7831de87d6b325560712fa8112
2020-10-21 02:52:54 +00:00
Treehugger Robot
21846b228b
Merge "Highlight the MMS messages preference for ACTION_MMS_MESSAGE_SETTING"
2020-10-21 02:40:55 +00:00
Treehugger Robot
bda0c67436
[automerger skipped] Merge "Merge redfin/bramble support." am: 7881b23f1f
-s ours
...
am skip reason: Change-Id I600c63a996b1684a2b801787d88974501062c073 with SHA-1 38747f76f3
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1465940
Change-Id: I70a4a5ebc491947ec7d9205d54301eb5dc28f4b9
2020-10-20 19:03:54 +00:00
Treehugger Robot
7881b23f1f
Merge "Merge redfin/bramble support."
2020-10-19 23:20:09 +00:00
Xin Li
5734fefefa
Merge redfin/bramble support.
...
Bug: 171218636
Merged-In: I600c63a996b1684a2b801787d88974501062c073
Change-Id: I2d54882d98577db7f5c2a70281d626a726adf947
2020-10-19 10:08:23 -07:00
Andrei-Valentin Onea
38747f76f3
Merge "Add support for @EnabledSince compat changes" am: 2d57867aba
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1455019
Change-Id: I600c63a996b1684a2b801787d88974501062c073
2020-10-19 14:37:30 +00:00
Andrei-Valentin Onea
2d57867aba
Merge "Add support for @EnabledSince compat changes"
2020-10-19 14:19:31 +00:00
Amit Mahajan
b09f09b02d
Merge "Add the extra "Ask every time" if supported only" am: 7b9edcde47
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1455946
Change-Id: Ib2b9864613071c7a6819f03d5c1803b81b9a6575
2020-10-16 06:39:15 +00:00
Amit Mahajan
7b9edcde47
Merge "Add the extra "Ask every time" if supported only"
2020-10-16 06:21:34 +00:00
Treehugger Robot
6d5943e6b8
Merge "Remove dup READ_PRIVILEGED_PHONE_STATE permission" am: 3eb10277da
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1455948
Change-Id: I0ed900b4fcfb24200d68d7bbb802a5192d1f967b
2020-10-14 09:24:07 +00:00
Treehugger Robot
3eb10277da
Merge "Remove dup READ_PRIVILEGED_PHONE_STATE permission"
2020-10-14 09:10:25 +00:00
TreeHugger Robot
4cee165533
Merge "Merge ab/6749736 in stage." into stage-aosp-master
2020-10-13 03:31:33 +00:00
Taesu Lee
50ef14540d
Add the extra "Ask every time" if supported only
...
Test: manual
Change-Id: Ie4bb150db41f1e654ea427a605050afbb57114cf
Signed-off-by: Taesu Lee <taesu82.lee@samsung.com >
2020-10-13 10:13:50 +09:00
Taesu Lee
7e0a1522c9
Remove dup READ_PRIVILEGED_PHONE_STATE permission
...
Test: build
Signed-off-by: Taesu Lee <taesu82.lee@samsung.com >
Change-Id: I877ac1631869e804a28a0f0d4c218ff1a8746dfd
2020-10-12 17:48:34 +09:00
Xin Li
8656492241
Merge ab/6749736 in stage.
...
Bug: 167233921
Merged-In: I8e3eb6c072488fdc33fae1ebabd17980a67f5d7d
Change-Id: I0411c2f1dbc2fa47b23ff52cacca990f3141f52f
2020-10-08 23:40:50 -07:00
Bill Yi
de21809c01
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I4b4ef8198075875b40875e95144cb7d130f10a70
2020-10-08 20:51:34 -07:00
Andrei Onea
f21ba0c650
Add support for @EnabledSince compat changes
...
Bug: 49103556
Test: make RunSettingsRoboTests ROBOTEST_FILTER=PlatformCompatDashboardTest
Change-Id: Iaf83b1ef2f07a910a3590f59562c2f638b5a6089
2020-10-08 21:54:02 +01:00
TreeHugger Robot
f0313f1328
Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master
2020-10-07 18:03:32 +00:00