Treehugger Robot
da02fb34b7
Merge "Update language to comply with Android's inclusive language guidance" am: c0d28b0f96
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1375043
Change-Id: I9ceecd654f6ac6403d46b8287c18afe6994fc953
2020-07-29 02:23:33 +00:00
Treehugger Robot
ba534426bf
Merge "Update language to comply with Android's inclusive language guidance"
2020-07-29 02:22:28 +00:00
Treehugger Robot
c0d28b0f96
Merge "Update language to comply with Android's inclusive language guidance"
2020-07-29 02:09:58 +00:00
Curtis Belmonte
5612e2c5c7
Update language to comply with Android's inclusive language guidance
...
See https://source.android.com/setup/contribute/respectful-code for reference
Test: Presubmit
Bug: 161896447
Change-Id: Ib5f445c3987c6eda2c3f3be8b9ac641c4e7f934e
2020-07-28 20:23:05 +00:00
Curtis Belmonte
1e8c7905a2
Update language to comply with Android's inclusive language guidance
...
See https://source.android.com/setup/contribute/respectful-code for reference
Test: Presubmit
Bug: 161896447
Change-Id: I4ecfd2d806314e7dc3bbff00849ad4be6f81d506
2020-07-28 20:16:03 +00:00
Curtis Belmonte
bd8f120e95
Update language to comply with Android's inclusive language guidance
...
See https://source.android.com/setup/contribute/respectful-code for reference
Test: Presubmit
Bug: 161896447
Change-Id: I89dbc737c62a796d3622cf17437f9eac930c99b3
2020-07-28 20:12:49 +00:00
Curtis Belmonte
1aa03da058
Update language to comply with Android's inclusive language guidance
...
See https://source.android.com/setup/contribute/respectful-code for reference
Change-Id: I25b5f8a2d87d8754e6536d24f986ab90a2bc69fe
Test: Presubmit
Bug: 161896447
2020-07-28 20:08:17 +00:00
Treehugger Robot
3366290e20
Merge "BluetoothPairingRequest: Add null check for action" am: ed7662f6f6
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1372268
Change-Id: Icebef90c2b18b36e5112d94aae02ae770ab300d3
2020-07-28 19:05:02 +00:00
Treehugger Robot
ed7662f6f6
Merge "BluetoothPairingRequest: Add null check for action"
2020-07-28 18:51:00 +00:00
Treehugger Robot
ef56fb20c3
Merge "More inclusive language." am: 4be2b5c2f6
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1373177
Change-Id: I4848004145a681e49a75a3f2d6e267b32c424585
2020-07-28 10:42:13 +00:00
Treehugger Robot
4be2b5c2f6
Merge "More inclusive language."
2020-07-28 10:25:10 +00:00
Alan Stokes
cd2c453cbd
More inclusive language.
...
Test: Builds
Bug: 161896447
Change-Id: Ie4d64dca9f4720eea532b534162e47ed81aea03b
2020-07-27 18:21:56 +01:00
Chen Chen
fc7b6693ee
BluetoothPairingRequest: Add null check for action
...
Bug: 159728132
Test: Build
Change-Id: I24668e20accf96c7469c9e1ab589b1383ab59d18
Merged-In: I24668e20accf96c7469c9e1ab589b1383ab59d18
(cherry picked from commit 1805f666e7
)
2020-07-24 14:54:35 -07:00
Anton Hansson
7fe08c1923
Merge "Add explicit dep on ims-common" am: 0f6b2ec233
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1370159
Change-Id: I4a02bab9e52768605891f076f504256b3198fa4a
2020-07-22 16:11:05 +00:00
Anton Hansson
0f6b2ec233
Merge "Add explicit dep on ims-common"
2020-07-22 15:55:41 +00:00
Anton Hansson
3d12fcb246
Add explicit dep on ims-common
...
android_robolectric_test is having some implicit deps removed
from it, so add in what we depend on directly.
Bug: 157451444
Test: m RunSettingsRoboTests
Exempt-From-Owner-Approval: cp from internal
Change-Id: Ic663e206a0e2e780be2f27b5d539c274d4eef245
Merged-In: Ic663e206a0e2e780be2f27b5d539c274d4eef245
2020-07-22 14:40:27 +00:00
Treehugger Robot
44c538ccef
Merge "Remove "storage type" preference from Settings" am: d6ac86d602
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1353609
Change-Id: I2c12af92fc35cbfc73a58773023bd2f36edeab15
2020-07-22 08:52:21 +00:00
Treehugger Robot
d6ac86d602
Merge "Remove "storage type" preference from Settings"
2020-07-22 08:34:56 +00:00
Treehugger Robot
bf44d4eed2
Merge "Improve the performance of displaying preference - multithread." am: 01eeece2f1
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1369637
Change-Id: I46f554c200cb9f1c20e03a98f7188f3799bb6b5d
2020-07-22 06:46:52 +00:00
Treehugger Robot
01eeece2f1
Merge "Improve the performance of displaying preference - multithread."
2020-07-22 06:33:42 +00:00
Zoey Chen
c33f162fc9
Improve the performance of displaying preference - multithread.
...
Test: manual test, use command to run MobileNetworkSettings and record it.
Bug: 161691402
Change-Id: I33be3fab9eb470b48c0d0870d4c03cdaecbac334
Merged-In: I33be3fab9eb470b48c0d0870d4c03cdaecbac334
2020-07-22 13:17:43 +08:00
joffenberg
43ee102921
Remove "storage type" preference from Settings
...
Since storage type is mandated as hardware-backed, this preference is no longer meaningful.
Bug: 160225361
Test: atest SettingsRoboTests
Change-Id: I9b6c1d6afdd3563201b1e85673acf4d8cb81c0a1
2020-07-21 17:18:47 +02:00
Treehugger Robot
36c9ca1f2c
Merge "Fix mvno data field summary not update issue" am: 4615179fc5
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1354603
Change-Id: Idf9f8b66f9b65f4118b8b2abd32eca2a076aea79
2020-07-21 06:58:14 +00:00
Treehugger Robot
4615179fc5
Merge "Fix mvno data field summary not update issue"
2020-07-21 06:44:08 +00:00
Neil Fuller
83d7191a22
Merge "Track core platform API change" am: 1d45573eb2
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1367136
Change-Id: Ib891567707808332c1fda6228fbb191b13f7df38
2020-07-20 14:45:41 +00:00
Neil Fuller
1d45573eb2
Merge "Track core platform API change"
2020-07-20 14:39:35 +00:00
Neil Fuller
d1c4ea906f
Track core platform API change
...
This commit tracks changes in libcore to extend the IDs recognized
to be associated with a country.
Bug: 155738410
Test: treehugger
Change-Id: I0d75b6c41cdce4a373f73761ccd2d7db357d6548
2020-07-20 11:26:14 +01:00
Treehugger Robot
df7e42a213
Merge "Remove NR NSA from voice network type" am: 46a50b35be
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1347930
Change-Id: Ic9f0a1b78d4bd5321dbc8ab814246d62d419a563
2020-07-17 18:16:14 +00:00
Treehugger Robot
46a50b35be
Merge "Remove NR NSA from voice network type"
2020-07-17 17:57:43 +00:00
Treehugger Robot
73a28754f1
Merge "[DO NOT MERGE] Rollup Cert-related changes from R" am: 01ec6774e6
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1363547
Change-Id: I5c4f7993abf41fbbefca12962061451345c2e62e
2020-07-17 08:43:40 +00:00
Eran Messeri
091c73f768
[DO NOT MERGE] Rollup Cert-related changes from R am: f37c8cb4f7
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1363547
Change-Id: Ie170b54b9b15d3abff3ec883d943d597b3719a77
2020-07-17 08:43:38 +00:00
Treehugger Robot
01ec6774e6
Merge "[DO NOT MERGE] Rollup Cert-related changes from R"
2020-07-17 08:28:38 +00:00
Eran Messeri
f37c8cb4f7
[DO NOT MERGE] Rollup Cert-related changes from R
...
This change includes the following commits from internal R branch
which are related to certificate management:
0206e76f46 CredentialStorage: Install keys using KeyChain
09ceea53d9 Added functionality to select type of certificate to be installed from the Settings app
3acf3f5433 WiFi certificates installable from Wifi sub-preference
8439fd15f7 Fix strings for certificate installation in Settings
Bug: 161347472
Test: builds & manual testing
Change-Id: Ia59dc4780254fab4f34c2f61b25f3b4e56ed7b77
2020-07-15 15:12:06 +01:00
Wei Huang
012c5858c9
Fix mvno data field summary not update issue
...
With current code logic, whenever user changing
mvno type, it only updates mvno data field text,
but the summary is not get updated.
For example, there is an apn configured as mvno
type 'GID' and mvno data 'FF', and user changes
mvno type to:
1. 'none' then save, the APN is saved with mvno
type 'none' and mvno data 'FF' while it is
better to save mvno data as empty value.
2. 'imsi', although the APN can be saved with mvno
type 'imsi' and mvno data 'mcc + mnc + x',
the UI still display mvno data field as 'FF'
unchanged(until user edit mvno data then save)
while the mvno data text is already changed to
'mcc + mnc + x'. It is better to also update
mvno data summary as 'mcc + mnc + x'
With current patch, either adding new apn or edit
exist apn, the mvno data field summary is always
consistent with latest mvno data field text, which
won't make user feel confused.
Test: Build and manual test on device.
Change-Id: Ica72e246296c20a6d20283b315e6e6c46e80ac08
Signed-off-by: Wei Huang <hwbest.v@gmail.com >
Signed-off-by: Honggang Luo <luo.loky@gmail.com >
Signed-off-by: Chao Yuan <chaoyuanx@gmail.com >
2020-07-04 04:11:52 +08:00
vichang
7485036f53
Merge "Move libcore.timezone to the i18n module - Final part" am: 268371c44e
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1348663
Change-Id: I745cd8bb0dc761d269e804ee871b249a157c4b6a
2020-07-02 10:38:54 +00:00
vichang
268371c44e
Merge "Move libcore.timezone to the i18n module - Final part"
2020-07-02 10:25:54 +00:00
Victor Chang
b07e53c1c8
Move libcore.timezone to the i18n module - Final part
...
Bug: 141747409
Test: atest CtsLibcoreTestCases CtsLibcoreTestCases
Change-Id: I48a1f383403a553639f525ef92996292fab84c5e
2020-06-30 14:35:09 +01:00
Treehugger Robot
fce601ea2a
Merge "Settings: Fix fallback summary for power_button_instantly_locks preference" am: b1cea4f1bc
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1298027
Change-Id: Ia62597a163e529ef20e4136645709b0d300a4fc4
2020-06-29 14:28:03 +00:00
Treehugger Robot
b1cea4f1bc
Merge "Settings: Fix fallback summary for power_button_instantly_locks preference"
2020-06-29 14:14:47 +00:00
LuK1337
ad243904db
Settings: Fix fallback summary for power_button_instantly_locks preference
...
* Using summary_placeholder instead of summary_empty
leaves an ugly empty space.
Change-Id: I73a90f1b3203d6cb17e1875dc8163eb67140de89
2020-06-29 12:27:06 +02:00
Sarah Chin
1017caf120
Remove NR NSA from voice network type
...
Since voice calls on NR NSA use LTE, the voice network type
should not be updated to be NR NSA.
Test: manual testing
Bug: 159382203
Change-Id: I77d92fab0020da356ae43293016237be7494c1e2
Merged-In: I77d92fab0020da356ae43293016237be7494c1e2
2020-06-24 00:40:40 -07:00
Treehugger Robot
980a6b8d30
Merge "Add logic for 5G icon to SIM status dialog" am: 5733d3a31a
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1347925
Change-Id: Ice4cd34368434361af8220d5af85024708fee2a1
2020-06-24 07:35:30 +00:00
Treehugger Robot
5733d3a31a
Merge "Add logic for 5G icon to SIM status dialog"
2020-06-24 07:18:41 +00:00
Sarah Chin
de62ae7ff4
Add logic for 5G icon to SIM status dialog
...
Test: manual test with fake 5G data network type
Bug: 156815536
Change-Id: I764f4ade8032511b44098e7eccb19b909fccc717
Merged-In: I764f4ade8032511b44098e7eccb19b909fccc717
2020-06-23 15:32:07 -07:00
Mark Chien
cbfe64ea94
Merge changes from topics "pass-res", "remove-isProvisioningNeeded" am: 92eb12c0e2
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1344640
Change-Id: I872b45c0a3d824f173d29ad1665148af54091e7f
2020-06-20 04:17:02 +00:00
markchien
017dd38916
Get entitlement configuration from intent extra am: 6d2c010891
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1344639
Change-Id: Ica0ea1d13697ceffc0b4f3b9b13ebd4479d6935f
2020-06-20 04:17:00 +00:00
markchien
1932ef4389
Remove isProvisioningNeededButUnavailable usage am: e48a3d7a76
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1344638
Change-Id: I51f35111c46cc080baf2a462c67fde749148e8d4
2020-06-20 04:16:58 +00:00
Mark Chien
92eb12c0e2
Merge changes from topics "pass-res", "remove-isProvisioningNeeded"
...
* changes:
Remove unused resource from TetherServiceTest
Get entitlement configuration from intent extra
Remove isProvisioningNeededButUnavailable usage
2020-06-20 04:02:15 +00:00
Mark Chien
ba4af7020c
Merge "Replace ConnectivityManager as TetheringManager" am: 4064368496
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1344637
Change-Id: I9dcb7ee1f1e2c0dfbaf14cf9636b0b153e636cb7
2020-06-20 03:17:33 +00:00
Mark Chien
3548a5eb0e
Merge "Remove schedule recheck logic from TetherService" am: 9f1fe57bda
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1298536
Change-Id: If30d8e11f18380b3ab5f2ef840951d550532077a
2020-06-20 03:17:20 +00:00