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
785b480259
Merge "BluetoothPairingRequest: Add null check for action" am: ed7662f6f6
am: 3366290e20
am: 5486a2fdd4
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1372268
Change-Id: Ia6bb375c12cf0acba4c5c79e292eefa2d69cddfe
2020-07-28 19:50:46 +00:00
Treehugger Robot
5486a2fdd4
Merge "BluetoothPairingRequest: Add null check for action" am: ed7662f6f6
am: 3366290e20
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1372268
Change-Id: Iad124b74fc6c55d2220d340fbe14ae85ddcb1d13
2020-07-28 19:33:12 +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
17c895b94c
Merge "More inclusive language." am: 4be2b5c2f6
am: ef56fb20c3
am: b2a470166e
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1373177
Change-Id: I9d4404f5d94a9b18682b260eb7ed6413fb540202
2020-07-28 11:14:07 +00:00
Treehugger Robot
b2a470166e
Merge "More inclusive language." am: 4be2b5c2f6
am: ef56fb20c3
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1373177
Change-Id: I4cd918e07ced74d846b75f01550f57e447229d51
2020-07-28 10:58:05 +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
e812d32eba
[automerger skipped] Merge "Add explicit dep on ims-common" am: 0f6b2ec233
am: 7fe08c1923
-s ours am: afc6e0ac41
-s ours
...
am skip reason: Change-Id Ic663e206a0e2e780be2f27b5d539c274d4eef245 with SHA-1 d3c9df3e7e
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1370159
Change-Id: I3aaca7efeeb861bdb711f86eda21643b800dedf3
2020-07-22 16:47:47 +00:00
Anton Hansson
afc6e0ac41
[automerger skipped] Merge "Add explicit dep on ims-common" am: 0f6b2ec233
am: 7fe08c1923
-s ours
...
am skip reason: Change-Id Ic663e206a0e2e780be2f27b5d539c274d4eef245 with SHA-1 d3c9df3e7e
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1370159
Change-Id: I5a18c3037d6533ff85bf1f812cdc5214f99f2f50
2020-07-22 16:33:32 +00: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
b33b295586
Merge "Remove "storage type" preference from Settings" am: d6ac86d602
am: 44c538ccef
am: 7643891ae7
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1353609
Change-Id: I474c32b3800cbf5a9c48a6086655b6c5ea8953eb
2020-07-22 09:22:13 +00:00
Treehugger Robot
7643891ae7
Merge "Remove "storage type" preference from Settings" am: d6ac86d602
am: 44c538ccef
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1353609
Change-Id: I2e9fc90f247f4b088f749afeb75a0b3e67e73198
2020-07-22 09:07: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
a59338f4be
Merge "Improve the performance of displaying preference - multithread." am: 01eeece2f1
am: bf44d4eed2
am: b85a454835
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1369637
Change-Id: I372c94673199e4483ed3668c3e0648ba0f6bc859
2020-07-22 07:13:32 +00:00
Treehugger Robot
b85a454835
Merge "Improve the performance of displaying preference - multithread." am: 01eeece2f1
am: bf44d4eed2
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1369637
Change-Id: I8a0952d30e00f35779fd127abe9677a002f83186
2020-07-22 06:58:04 +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
TreeHugger Robot
f3bde78e6d
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: cc5fdda22e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12204184
Change-Id: Ieb8d3dc3df7b83e2a04c9c58e3bdd40197e550f8
2020-07-22 03:20:35 +00:00
TreeHugger Robot
cc5fdda22e
Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev
2020-07-22 03:08:07 +00:00
Bill Yi
533b0f5299
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Id0c490cbe4d3a3c21a2ebfec2046cf8492de5f2f
2020-07-21 16:18:49 -07:00
Bill Yi
e5727731fb
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 708e1e4f9e
-s ours am: cd282d2f47
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12199710
Change-Id: I42bfa594d58b7bdfbae1010b708a6b7d67620529
2020-07-21 19:48:09 +00:00
Bill Yi
d6b18921f0
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 708e1e4f9e
-s ours am: 8a34f66650
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12199710
Change-Id: I8d386ac068c8ddd43858efcb4b3bf1e657e8e8dd
2020-07-21 19:41:15 +00:00
Bill Yi
5d58d1a565
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 88cbc21e3d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12202448
Change-Id: I87f8241a7fbf2c16421124a88e7f40bac0d607fd
2020-07-21 19:41:02 +00:00
Bill Yi
8a34f66650
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 708e1e4f9e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12199710
Change-Id: I668468d502b5fd358665f59094cf3f7d78409da1
2020-07-21 19:29:14 +00:00
Bill Yi
cd282d2f47
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 708e1e4f9e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12199710
Change-Id: I6e3e30c796380b104bffd9e627231fa76eb6f8d8
2020-07-21 19:29:08 +00:00
Anton Hansson
668e8678aa
Add explicit dep on framework-wifi.impl am: 40a8846e54
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12194165
Change-Id: I4609cf27376e2fe82540cd855a95ecf2b117d27e
2020-07-21 18:11:38 +00:00
Bill Yi
88cbc21e3d
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I9a428e1d08ba9fb70b26998d6df3d2c9cd2ded32
2020-07-21 10:28:44 -07: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
Anton Hansson
cf29ee30f0
Add explicit dep on ims-common am: d3c9df3e7e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12194164
Change-Id: I3e0b30e399e85cf29128062dbbe9abfb843d5f63
2020-07-21 12:34:11 +00:00
Anton Hansson
40a8846e54
Add explicit dep on framework-wifi.impl
...
android_robolectric_test is having some implicit deps removed
from it, so add in what we depend on directly.
Bug: 157451444
Bug: 161767237
Test: m RunSettingsRoboTests
Merged-In: I800b434c8049121db115cff87d51e164e4529999
Change-Id: I847cbeaab7aab6e3cb109df7cafd8a63d63c6acb
2020-07-21 10:18:51 +01:00
Anton Hansson
d3c9df3e7e
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
Change-Id: Ic663e206a0e2e780be2f27b5d539c274d4eef245
2020-07-21 10:18:39 +01:00
Treehugger Robot
442a99bedf
Merge "Fix mvno data field summary not update issue" am: 4615179fc5
am: 36c9ca1f2c
am: f876f3d0cc
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1354603
Change-Id: I4d607a2c3141ce3c5863b41c88a3157ac6d622b9
2020-07-21 07:28:32 +00:00
Treehugger Robot
f876f3d0cc
Merge "Fix mvno data field summary not update issue" am: 4615179fc5
am: 36c9ca1f2c
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1354603
Change-Id: I21df066581d1f2a43b693026a7a389da81922f05
2020-07-21 07:12:31 +00: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
Bill Yi
708e1e4f9e
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I71c7609f5c78b3042c980428f08dbe0eb6db5b67
2020-07-20 21:45:04 -07:00
Neil Fuller
11ed9a5133
Merge "Track core platform API change" am: 1d45573eb2
am: 83d7191a22
am: 173a7e73b3
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1367136
Change-Id: Ieb4ebc79685777bc660df1c3c3aa19e0216dfec3
2020-07-20 15:21:18 +00:00
Neil Fuller
173a7e73b3
Merge "Track core platform API change" am: 1d45573eb2
am: 83d7191a22
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1367136
Change-Id: I7cb7175a827aae27836324e0865c9a6d5ff6b5ed
2020-07-20 15:07:02 +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
2f0feea3c2
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: a118c94070
-s ours am: 733eed05c8
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12185729
Change-Id: I581be581d49a7b490aac0b6cb091edf2eb271ac9
2020-07-18 22:45:56 +00:00