Julia Reynolds
68d3972a36
Merge "Remove unused development setting" into rvc-dev am: e2eb832033
am: 04b6152ef0
...
Change-Id: I14a3372d2ca7304667e3923b94d1a377eb927aa9
2020-04-29 15:52:56 +00:00
Julia Reynolds
04b6152ef0
Merge "Remove unused development setting" into rvc-dev am: e2eb832033
...
Change-Id: Ic77ae688d2b211a1dc3ad5c0b8e2b5967698604e
2020-04-29 15:42:46 +00:00
Julia Reynolds
e2eb832033
Merge "Remove unused development setting" into rvc-dev
2020-04-29 15:25:24 +00:00
Neil Fuller
d76d0c680b
Merge "Fix missing zone strings in some cases" am: 738df11447
am: 6a19fdf877
am: 6bcbd8ed89
...
Change-Id: I696eafa89264541b6c98d864f8d75c2cdeb4926d
2020-04-29 12:57:22 +00:00
Neil Fuller
6bcbd8ed89
Merge "Fix missing zone strings in some cases" am: 738df11447
am: 6a19fdf877
...
Change-Id: Id54f91141814eb0f1adda28f9ec72b48f434c997
2020-04-29 12:45:01 +00:00
Neil Fuller
6a19fdf877
Merge "Fix missing zone strings in some cases" am: 738df11447
...
Change-Id: I66ba5583cdd3632c6e6efb47fb1c0a0ea3b137cb
2020-04-29 12:30:24 +00:00
Neil Fuller
738df11447
Merge "Fix missing zone strings in some cases"
2020-04-29 12:18:53 +00:00
hoffc
535ebae5fb
Settings: Fix force close when destory sim lock fragment view am: d6c805f0bb
...
Change-Id: I1c1c3b249f938ee487dc9346bcad4c9223e2e4e7
2020-04-29 10:12:39 +00:00
SongFerng Wang
4d8db97e90
Merge "Settings: Fix force close when destory sim lock fragment view" am: 0d4010c5e5
am: 7999b0a9a2
am: d5cc228c82
...
Change-Id: I0a4007846f5a75bf83fd6c5a4992eb72bad505f0
2020-04-29 09:24:18 +00:00
Neil Fuller
eafec7a244
Fix missing zone strings in some cases
...
ICU's TimeZoneNames requires a "canonical" zone ID, otherwise it will
return no data. Usually the ID being used is the same as the canonical
ID so there's no problem. TZDB version 2020a switched the ID of one of
Greenland's zones from America/Godthab to America/Nuuk, and ICU/CLDR
hold their translation data against America/Godthab in the current
version of ICU on Android.
Bug: 155167041
Test: Manual - viewed settings on a device with the tzdb 2020a update
Change-Id: Ia89c777a832f8b41c8d56d3327a9b7370ba44b52
2020-04-29 10:16:19 +01:00
SongFerng Wang
d5cc228c82
Merge "Settings: Fix force close when destory sim lock fragment view" am: 0d4010c5e5
am: 7999b0a9a2
...
Change-Id: I99e0482c5102182c50d171c733927b7c29dddbca
2020-04-29 09:08:42 +00:00
SongFerng Wang
7999b0a9a2
Merge "Settings: Fix force close when destory sim lock fragment view" am: 0d4010c5e5
...
Change-Id: I1799dd42b0400e29772bb01ddeb957031df6aa8b
2020-04-29 08:50:04 +00:00
Alex Johnston
85404a89c2
Merge "Check if FRP policy is supported in Settings" into rvc-dev am: d1408a66a6
am: b2c004b3b7
...
Change-Id: I35a73ed9051d360ab493968defcee656ca92f0c1
2020-04-29 08:49:52 +00:00
hoffc
d6c805f0bb
Settings: Fix force close when destory sim lock fragment view
...
Sim lock fragment does not override its parent onCreateView method and diretly
return null, which results in NPE when destory after removing Sim card.
Override its parent onCreateView when no sim card inserted.
Bug: 154743278
Test: build pass
Change-Id: I0b10a07c1767cda74096dc44ef7ffa7839a9aae4
Merged-In: I0b10a07c1767cda74096dc44ef7ffa7839a9aae4
2020-04-29 16:34:21 +08:00
Alex Johnston
20555b3e39
Merge "Check if FRP policy is supported in Settings" into rvc-dev am: d1408a66a6
...
Change-Id: Ia730a919a16bb89f4d4543bc5cd592885ff730fd
2020-04-29 08:34:00 +00:00
Alex Johnston
b2c004b3b7
Merge "Check if FRP policy is supported in Settings" into rvc-dev am: d1408a66a6
...
Change-Id: I65079e2dc5c1cceb8489c7d691cdce08f0788c90
2020-04-29 08:33:53 +00:00
Menghan Li
aa0c512ff5
Merge "Fix InvisibleToggle type service does not turn on or turn off correctly when edit shortcut dialog." into rvc-dev am: 981d10db0b
am: 5d7fd4abc3
...
Change-Id: I0f0d7a674aacd998ee88a5627fa30586e3662c28
2020-04-29 08:24:51 +00:00
Alex Johnston
d1408a66a6
Merge "Check if FRP policy is supported in Settings" into rvc-dev
2020-04-29 08:19:14 +00:00
Menghan Li
36d7ad2e0d
Merge "Fix InvisibleToggle type service does not turn on or turn off correctly when edit shortcut dialog." into rvc-dev am: 981d10db0b
...
Change-Id: Iae5b3d775430bbdbb789be190a61dfbfb7975463
2020-04-29 08:14:13 +00:00
Menghan Li
5d7fd4abc3
Merge "Fix InvisibleToggle type service does not turn on or turn off correctly when edit shortcut dialog." into rvc-dev am: 981d10db0b
...
Change-Id: I3a7d6846feb4191cf09aea61f3b6e1eb0cea03e4
2020-04-29 08:13:57 +00:00
Menghan Li
981d10db0b
Merge "Fix InvisibleToggle type service does not turn on or turn off correctly when edit shortcut dialog." into rvc-dev
2020-04-29 07:59:35 +00:00
Zoey Chen
b041384d57
Merge "Improve the performance of displaying preference." into rvc-dev am: e6b7e24a09
am: 9bdb276281
...
Change-Id: I9d0e6885341b7810261f948710dde2766c2eaf8e
2020-04-29 06:27:05 +00:00
Zoey Chen
5ef8e70bba
Merge "Improve the performance of displaying preference." into rvc-dev am: e6b7e24a09
...
Change-Id: I501cd6da5ab4672cc7989b07a9c351953238ffae
2020-04-29 06:12:00 +00:00
Zoey Chen
9bdb276281
Merge "Improve the performance of displaying preference." into rvc-dev am: e6b7e24a09
...
Change-Id: If161edb6ba8db7861bd9e36fcec89e02f14031ce
2020-04-29 06:11:55 +00:00
Zoey Chen
e6b7e24a09
Merge "Improve the performance of displaying preference." into rvc-dev
2020-04-29 05:57:12 +00:00
TreeHugger Robot
a21603a224
Merge "Move ImeAwareTextEdit to android.widget" into rvc-dev am: 4c221d1609
am: 222da24344
...
Change-Id: Ie3ba8186a2b0ded3fcfeaf0689c2569aa99c475b
2020-04-29 05:49:42 +00:00
menghanli
de1258f9cf
Fix InvisibleToggle type service does not turn on or turn off correctly when edit shortcut dialog.
...
Root cause: service status is not updated after the shortcut status
changed.
Next: Add callback to update the service status
Bug: 155157599
Test: Manual test
Change-Id: I286a04d43066c787304c54eb7b0dfdac5728b6ac
2020-04-29 13:44:54 +08:00
TreeHugger Robot
b47f88ee05
Merge "Move ImeAwareTextEdit to android.widget" into rvc-dev am: 4c221d1609
...
Change-Id: I5db9bb66a86b1377f43bbf35b4410a44a79d4755
2020-04-29 05:33:23 +00:00
TreeHugger Robot
222da24344
Merge "Move ImeAwareTextEdit to android.widget" into rvc-dev am: 4c221d1609
...
Change-Id: I8ba500b881798bfe9ee55d5a1d82e3f8926cd4a0
2020-04-29 05:33:14 +00:00
TreeHugger Robot
4c221d1609
Merge "Move ImeAwareTextEdit to android.widget" into rvc-dev
2020-04-29 05:17:30 +00:00
zoey chen
84587b1aa3
Improve the performance of displaying preference.
...
- Set a variable to record the status then replace getAvailabilityStatus() with it.
Test: manual test, use command to run MobileNetworkSettings and record it.
Bug: 154061428
Change-Id: Ia13a75a3821bb6c17d0dfeffb5043f47b60adf61
2020-04-29 11:21:36 +08:00
TreeHugger Robot
88271f0273
Merge "Fix NPE if CarrierConfigManager is not available" into rvc-dev am: 7a2f3dd8a7
am: f2df3a44d6
...
Change-Id: I26e6ad236a906c1b55ae7c5e7f374d020dc8f057
2020-04-29 02:13:58 +00:00
TreeHugger Robot
0886b927ec
Merge "Fix NPE if CarrierConfigManager is not available" into rvc-dev am: 7a2f3dd8a7
...
Change-Id: I3749154738a770247a35284d26061a5f530294bf
2020-04-29 02:01:35 +00:00
TreeHugger Robot
f2df3a44d6
Merge "Fix NPE if CarrierConfigManager is not available" into rvc-dev am: 7a2f3dd8a7
...
Change-Id: I212bb31c2b1bf27b23da75853a0dbfa7074247a8
2020-04-29 02:00:40 +00:00
TreeHugger Robot
7a2f3dd8a7
Merge "Fix NPE if CarrierConfigManager is not available" into rvc-dev
2020-04-29 01:44:42 +00:00
Julia Reynolds
6b2716fce0
Remove unused development setting
...
Test: atest
Fixes: 151821676
Change-Id: I59338340ac88873d20cd715c82723590af64acd3
2020-04-28 19:11:47 -04:00
Kevin Chyn
1895f8b5f2
Move ImeAwareTextEdit to android.widget
...
Allows it to be used in more projects
Bug: 154161590
Test: Manually opened each setting that was impacted
Change-Id: Ife59074e5f8ffa76c2c81cca4022ca200bb59526
2020-04-28 15:57:40 -07:00
Mady Mellor
e62939420e
Merge "Add list of selected/excluded convos to bubble settings" into rvc-dev am: 2b42301a6e
am: 0ffd6c0b17
...
Change-Id: I9cea0ab8a2d0c1173e8bbd412a08065f9c18794d
2020-04-28 22:43:11 +00:00
Mady Mellor
ec9e965d90
Merge "Add list of selected/excluded convos to bubble settings" into rvc-dev am: 2b42301a6e
...
Change-Id: I382f080699006d2a3d160290f7b71d84cd65f033
2020-04-28 22:30:18 +00:00
Mady Mellor
0ffd6c0b17
Merge "Add list of selected/excluded convos to bubble settings" into rvc-dev am: 2b42301a6e
...
Change-Id: Ia002914e6a8c939fdb79ff9a1a918b3869e721d2
2020-04-28 22:30:08 +00:00
Mady Mellor
a27918494f
Add list of selected/excluded convos to bubble settings
...
* Some changes to extend AppConversationListPrefController
* When a user removes something from the selected or
excluded list that resets the channel setting
Bug: 148619540
Test: make -j40 RunSettingsRoboTests ROBOTEST_FILTER="Bubble"
Change-Id: I7a9ed7b70208dbdefca6c3c09d34d55c65f06408
2020-04-28 13:18:56 -07:00
Brad Ebinger
e6fae38169
Fix NPE if CarrierConfigManager is not available
...
Fixes: 155147094
Test: Test: m RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.network.telephony
Change-Id: Iecf3e385a88d18c7578eb520449f4042324e21f5
2020-04-28 11:27:27 -07:00
Beverly
2c3e295e2f
Update strings to be more translation friendly am: dcc79e9942
am: 0d644b34ed
...
Change-Id: I4954569d276c25c4e14bd6031d11d0209abcb384
2020-04-28 17:16:38 +00:00
Beverly
f32362f03a
Update strings to be more translation friendly am: dcc79e9942
...
Change-Id: Ic9de15791cf1298605683eb42c25ee4a0901b613
2020-04-28 16:50:46 +00:00
Beverly
0d644b34ed
Update strings to be more translation friendly am: dcc79e9942
...
Change-Id: Ic545a4151940b97dc705d1f7bb8f252e108c9d1b
2020-04-28 16:49:37 +00:00
TreeHugger Robot
6b3c8a4169
Merge "[Wi-Fi] Show Wi-Fi editor for authentication failures" into rvc-dev am: 4eeb99d63e
am: 46f68f51e6
...
Change-Id: I6e114287d6495105022e498293000b8fbacda13d
2020-04-28 14:54:57 +00:00
Beverly
dcc79e9942
Update strings to be more translation friendly
...
Use different strings for "None" based on the context of the string.
Some languages may require different gendered grammar depending on its
context.
Also update contacts summary string to include plurals (1 vs many).
Test: make RunSettingsRoboTests7
Bug: 154898476
Fixes: 154944295
Change-Id: If9949d75de573042389a19df3d4c5d15c6cbeb25
2020-04-28 14:53:08 +00:00
TreeHugger Robot
47b56d7152
Merge "[Wi-Fi] Show Wi-Fi editor for authentication failures" into rvc-dev am: 4eeb99d63e
...
Change-Id: I4a63e84c417fd31e87b0b4cae0a957b13e9b79c5
2020-04-28 14:36:28 +00:00
TreeHugger Robot
46f68f51e6
Merge "[Wi-Fi] Show Wi-Fi editor for authentication failures" into rvc-dev am: 4eeb99d63e
...
Change-Id: Iaa49b317fbe48f2641b0d3a75be9596ead8bcc7b
2020-04-28 14:36:23 +00:00
TreeHugger Robot
4eeb99d63e
Merge "[Wi-Fi] Show Wi-Fi editor for authentication failures" into rvc-dev
2020-04-28 14:21:14 +00:00