Bill Yi
262743bde0
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 88cbc21e3d
-s ours am: d98f641fca
-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: I9c62b63cc1b1eea6547695060c3b0e49aace0ef7
2020-07-21 19:59:09 +00:00
Bill Yi
33b2e52e7e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 708e1e4f9e
-s ours am: 8a34f66650
-s ours am: d6b18921f0
-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: I8176e5231e8c15b1267d0393a9ca030a3056ff39
2020-07-21 19:59:06 +00:00
Bill Yi
3bffde37c7
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 88cbc21e3d
-s ours am: 5d58d1a565
-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: I266661759a8e4d5770277e4afc1c4bf9138c32fb
2020-07-21 19:58:47 +00: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
41d9c588eb
[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: I78f5d02091240477fe94aea04fbe80213f97d227
2020-07-21 19:41:37 +00:00
Bill Yi
d98f641fca
[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: I51328dd01d32d999500fd72c622168ed0e989860
2020-07-21 19:41:17 +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
a8bae3391c
Add explicit dep on framework-wifi.impl am: 40a8846e54
am: 668e8678aa
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12194165
Change-Id: I4e632b7d812dbe855e3bfbc89aacfeec58043eee
2020-07-21 18:29:13 +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
784b908bbb
Add explicit dep on ims-common am: d3c9df3e7e
am: cf29ee30f0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12194164
Change-Id: Id6f89d1188248c7838925df62425b53a9c3d1594
2020-07-21 12:48:40 +00: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
10a88c97b7
Merge "Fix mvno data field summary not update issue" am: 4615179fc5
am: 36c9ca1f2c
am: f876f3d0cc
am: 442a99bedf
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1354603
Change-Id: I3c56b22f77436451a8e241714000929029fcdb3c
2020-07-21 07:46:05 +00: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
09cd543262
Merge "Track core platform API change" am: 1d45573eb2
am: 83d7191a22
am: 173a7e73b3
am: 11ed9a5133
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1367136
Change-Id: Id36b65955f7f41c8e825c9727dad5c65685f3117
2020-07-20 15:34:06 +00: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
TreeHugger Robot
1ec9222c36
Merge "UX updates for notif history" into rvc-qpr-dev am: 1fafa1b738
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12178344
Change-Id: I3fa33a4f5334f05239a1ab4685485a8cb84295fa
2020-07-20 14:19:30 +00:00
TreeHugger Robot
1fafa1b738
Merge "UX updates for notif history" into rvc-qpr-dev
2020-07-20 14:08:10 +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
Automerger Merge Worker
546d76d368
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: a118c94070
-s ours am: c8cff2628f
-s ours am: d019b9d4ff
-s ours" into rvc-qpr-dev-plus-aosp
2020-07-18 23:07:38 +00:00
TreeHugger Robot
64590f8cc6
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: a118c94070
-s ours am: c8cff2628f
-s ours am: d019b9d4ff
-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: Ie5b3de37faa32e7fe1c227f8a9656aaafee41393
2020-07-18 23:07:33 +00:00
TreeHugger Robot
ec79c7e303
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: a118c94070
-s ours am: 733eed05c8
-s ours am: 2f0feea3c2
-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: I96a1de7563d1c05116adf3084c3a19e0e37af80e
2020-07-18 23:07:30 +00:00
TreeHugger Robot
23129fe972
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: a118c94070
-s ours am: c8cff2628f
-s ours am: 9af1becfce
-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: I0ce7d9f9c484813625fb653239c25418e5030f83
2020-07-18 23:07:20 +00: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
TreeHugger Robot
d019b9d4ff
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: a118c94070
-s ours am: c8cff2628f
-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: I5dc849c9fbe45e90b47adc9cb1632998f9322470
2020-07-18 22:45:52 +00:00
TreeHugger Robot
9af1becfce
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: a118c94070
-s ours am: c8cff2628f
-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: Id714265422fcd526946b6dffc65fd18bf117866d
2020-07-18 22:45:37 +00:00
TreeHugger Robot
733eed05c8
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: a118c94070
-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: Ie9d2c4d6d4618a167af1c5627d5d7918a404f398
2020-07-18 22:30:28 +00:00
TreeHugger Robot
c8cff2628f
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: a118c94070
-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: I34932052aef59e637a60d74efeb1db6cfc807e77
2020-07-18 22:30:16 +00:00
TreeHugger Robot
a118c94070
Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev
2020-07-18 22:14:24 +00:00
Bill Yi
504c673017
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: If5aefe4449fb12bc20991bc9f55da58264b9bb72
2020-07-18 01:41:07 -07:00
Automerger Merge Worker
43fa4ce074
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: 8469a447c0
-s ours am: de0205d7f0
-s ours" into rvc-d1-dev-plus-aosp am: 432af91964
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12178345
Change-Id: I8813f1f465302e5e305a19771fa63c3490bebbe8
2020-07-18 01:38:09 +00:00
Automerger Merge Worker
bed83a4519
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: 8469a447c0
-s ours am: de0205d7f0
-s ours am: a679da84a0
-s ours" into rvc-qpr-dev-plus-aosp
2020-07-18 01:37:32 +00:00
TreeHugger Robot
516f2072c7
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: 8469a447c0
-s ours am: 2101d1230a
-s ours am: 881b14a74d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12178345
Change-Id: I34625d3fc4edd3f090a8d4b36b62ef191d743378
2020-07-18 01:36:41 +00:00
TreeHugger Robot
4ce6f7a73e
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: 8469a447c0
-s ours am: de0205d7f0
-s ours am: a679da84a0
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12178345
Change-Id: Ia01214ca2bd472d7c66baaeff0f8d3288d4bb148
2020-07-18 01:36:39 +00:00
TreeHugger Robot
a679da84a0
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: 8469a447c0
-s ours am: de0205d7f0
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12178345
Change-Id: I87c0e2fcb1af85b6703706e1e31fda80a0bec4bd
2020-07-18 01:19:55 +00:00
Automerger Merge Worker
432af91964
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: 8469a447c0
-s ours am: de0205d7f0
-s ours" into rvc-d1-dev-plus-aosp
2020-07-18 01:19:55 +00:00
TreeHugger Robot
8817099bae
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: 8469a447c0
-s ours am: de0205d7f0
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12178345
Change-Id: I6a1b3dbf3c42eafdab788412813eb27d074abd5c
2020-07-18 01:19:47 +00:00