Commit Graph

56273 Commits

Author SHA1 Message Date
Sarah Chin
00649c664e Merge "Add NGRAN" am: 4ff75ef786
am: 48388d0949

Change-Id: I131d35236c4fab49ea1a407479b7d75718399c62
2019-12-05 13:56:01 -08:00
Sarah Chin
48388d0949 Merge "Add NGRAN"
am: 4ff75ef786

Change-Id: I18dcc1c05ade3e240beb8ca0c2577c7090064bcb
2019-12-05 13:49:10 -08:00
Sarah Chin
4ff75ef786 Merge "Add NGRAN" 2019-12-05 21:37:37 +00:00
Automerger Merge Worker
615f2311d9 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: a90da5ea94 -s ours
am skip reason: subject contains skip directive

Change-Id: I0abef5f40c0fedbde20e38b7463b4ac88b6f12b2
2019-12-05 18:51:26 +00:00
TreeHugger Robot
a90da5ea94 Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev 2019-12-05 18:33:31 +00:00
Neil Fuller
5f1c405f30 Merge "Switch settings to use TimeDetector" am: 5da6521458
am: 72ed7e8f64

Change-Id: Ia2f12a24835f83136c9400641992348b69f40270
2019-12-05 09:15:16 -08:00
Neil Fuller
72ed7e8f64 Merge "Switch settings to use TimeDetector"
am: 5da6521458

Change-Id: Ibcdf80e3616fd5f3093fbe2bbe7fd4b26576734e
2019-12-05 09:13:16 -08:00
Neil Fuller
5da6521458 Merge "Switch settings to use TimeDetector" 2019-12-05 17:05:05 +00:00
Anna Trostanetski
ba1e18dff9 Merge "Add descriptions to compat changes." am: fdb5a1ce2a
am: d76cef9f7c

Change-Id: I7eca4097e3c795dab6bd045877ebdc6308bb24d0
2019-12-05 04:36:20 -08:00
Anna Trostanetski
d76cef9f7c Merge "Add descriptions to compat changes."
am: fdb5a1ce2a

Change-Id: I97ba671e7520c8111e31d53764b45cbbefab3e53
2019-12-05 04:31:10 -08:00
Anna Trostanetski
fdb5a1ce2a Merge "Add descriptions to compat changes." 2019-12-05 12:22:27 +00:00
Bill Yi
45ded2ad1e Import translations. DO NOT MERGE
Change-Id: I5889a4f6f9637d34eb5df1f844770dd68cc04e39
Auto-generated-cl: translation import
2019-12-05 03:22:50 -08:00
Raff Tsai
ed870944d0 Merge "Fix cannot see "see more" button in UI" am: 2dbc2db581
am: 1fdadc1125

Change-Id: I86c112f43556ca1dc345c0c36610a367a327bc18
2019-12-04 20:28:27 -08:00
Raff Tsai
1fdadc1125 Merge "Fix cannot see "see more" button in UI"
am: 2dbc2db581

Change-Id: I1ad3c46aa2e79aec39725a76d3033be848f79506
2019-12-04 20:26:34 -08:00
Treehugger Robot
2dbc2db581 Merge "Fix cannot see "see more" button in UI" 2019-12-05 04:17:42 +00:00
Ilya Matyukhin
1de3feb026 Fix "Skip lock screen" not working for secondary user
Bug: 140878309
Test: the option is not grayed out for secondary user.
Change-Id: I2413aa3c634e89a90d104e9ad60df15e49c75ed2
(cherry picked from commit e17caeea3f)
2019-12-05 04:11:49 +00:00
Raff Tsai
28a6bcc729 Fix cannot see "see more" button in UI
Bug: 144546394
Test: Cts test
android.provider.cts.SettingsPanelTest#volumePanel_seeMoreButton_launchesIntoSettings

Change-Id: I786d62937e93abdaf96f89b03669302159d571a1
2019-12-05 11:09:49 +08:00
Automerger Merge Worker
3ebabb50f3 Merge "Always use local timezone for parsing date" into qt-qpr1-dev am: 1284d9de67
Change-Id: I949816a65e74fb6b9772906146684db8e4eb1dcd
2019-12-05 03:04:44 +00:00
TreeHugger Robot
1284d9de67 Merge "Always use local timezone for parsing date" into qt-qpr1-dev 2019-12-05 02:49:13 +00:00
atrost
edd75ce519 Add descriptions to compat changes.
Capture the comment above a definition of a compat change and make it
the description.
Next: make sure existing changes use supported format (only /**
comments, only above the annotations), and use in developer UI.

Bug: 144927670
Test: treeHugger
Change-Id: I5f53517751762a637dc6fc0f220b83d84eb3a916
2019-12-04 19:19:57 +00:00
Sarah Chin
bf7ee4a861 Add NGRAN
Test: build
Bug: 143683654
Change-Id: I5aae9ea088d8a4625d9c8f6600f7d1bddc8fbf9c
Merged-In: I5aae9ea088d8a4625d9c8f6600f7d1bddc8fbf9c
2019-12-04 09:16:04 -08:00
Bonian Chen
fd3557954f Merge "[Settings] Enable support on testing" am: 84a2951a33
am: 08dcb51c6c

Change-Id: I07d2017ef71d2ce17d4a414d26efff9894d93d63
2019-12-04 09:08:24 -08:00
Xin Li
944b8b330f Merge "Merge Android10 QPR1 into AOSP master" am: bd2174cda1
am: f9b5a6bd07

Change-Id: I2e5b8ed863bf41ab88146acd780f95ba99aac271
2019-12-04 08:13:43 -08:00
Neil Fuller
df086ecb4f Switch settings to use TimeDetector
Switch settings to use TimeZoneDetector when setting the system time
zone rather than using AlarmManager directly.

Bug: 140712361
Test: treehugger
Test: manual
Test: make -j30 RunSettingsRoboTests
Change-Id: I6042093294ba9690d4355bfe1c47d9f88a2b7ac6
2019-12-04 13:43:58 +00:00
Bonian Chen
08dcb51c6c Merge "[Settings] Enable support on testing"
am: 84a2951a33

Change-Id: Idcd4d1013ef5c0e8581f94d40ac1770dc26b38fc
2019-12-03 20:34:29 -08:00
Bonian Chen
84a2951a33 Merge "[Settings] Enable support on testing" 2019-12-04 04:32:58 +00:00
android-build-team Robot
fe87582102 Snap for 6047316 from f4bc80c45c to qt-qpr2-release
Change-Id: I01d82433ac939dc7d7e8299133815b7dcb29b1b1
2019-12-04 02:07:49 +00:00
Xin Li
f9b5a6bd07 Merge "Merge Android10 QPR1 into AOSP master"
am: bd2174cda1

Change-Id: Ia9a27e2d5b245f8e3b52b86e0a155fc40383c42e
2019-12-03 16:13:50 -08:00
Treehugger Robot
bd2174cda1 Merge "Merge Android10 QPR1 into AOSP master" 2019-12-03 23:14:56 +00:00
Jay Aliomer
5fb68ae95d Battery saver mode should disable dark mode modification
am: f4bc80c45c

Change-Id: Iff4cb52ba46e20bd012f95e9d29917f7952b4259
2019-12-03 09:47:41 -08:00
Bonian Chen
5cf137e0bb [Settings] Enable support on testing
1. Support ActivityScenario
2. Support add Service through ShadowServiceManager

Bug: 140542283
Test: build pass
Change-Id: Ib1066394114fb6077e1fa82872f029e6ee2b5da9
2019-12-03 20:06:59 +08:00
Tsung-Mao Fang
be895aea4c Always use local timezone for parsing date
Use local time zone to be in line with entry
in phonesky mainline module.

Test: Rebuild
Bug: 143357811
Change-Id: I1ecf57ec7952cff580af932e58c453622d4536f0
2019-12-03 09:06:59 +00:00
Xin Li
b4fe2d062d Merge Android10 QPR1 into AOSP master
Bug: 145570283
Change-Id: I4a45c18c3ee945f3603921c60d0762e44e686688
2019-12-02 21:25:19 -08:00
Jay Aliomer
f4bc80c45c Battery saver mode should disable dark mode modification
disable toggle options and disable the dark theme drop down selection

Test: make -j64 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.display.DarkUIPreferenceControllerTest" && \
make -j64 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.display.darkmode.DarkModeActivationPreferenceControllerTest" && \
make -j64 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.display.darkmode.DarkModeObserverTest" && \
make -j64 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.display.darkmode.DarkModeScheduleSelectorControllerTest"

Fixes: 	145098277
Fixes: 145297188
Fixes: 	145254016
Change-Id: I5c81a295810cc2d9a45657978104647e9c15da46
2019-12-02 18:19:52 +00:00
Bonian Chen
6c1861b3c0 Merge "Consider subId when loading Wfc string resources" am: 9c2c1b4784
am: 944689abd6

Change-Id: I6bfa2099cdb382109c90f0c3b9ea76a2a7df4d19
2019-11-28 07:28:07 -08:00
Bonian Chen
944689abd6 Merge "Consider subId when loading Wfc string resources"
am: 9c2c1b4784

Change-Id: Ib680198aff74daa31d5ca0413ca3dd869b3126af
2019-11-28 07:26:07 -08:00
Bonian Chen
9c2c1b4784 Merge "Consider subId when loading Wfc string resources" 2019-11-28 15:22:21 +00:00
Neil Fuller
3296857f38 Merge "Switch settings to use TimeDetector" am: d32eee26e3
am: 5ef64ad89b

Change-Id: I8901a6595677380013cc3d063426a4dfead18b97
2019-11-28 00:59:44 -08:00
Neil Fuller
5ef64ad89b Merge "Switch settings to use TimeDetector"
am: d32eee26e3

Change-Id: I1f3c05b986768be9c29043eea51143d6ab22bd12
2019-11-28 00:54:40 -08:00
Neil Fuller
d32eee26e3 Merge "Switch settings to use TimeDetector" 2019-11-28 08:47:32 +00:00
Neil Fuller
3c794261a5 Switch settings to use TimeDetector
Switch settings to use TimeDetector when setting the system clock rather
than using AlarmManager directly.

Bug: 140712361
Test: treehugger
Test: manual
Test: make -j30 RunSettingsRoboTests ROBOTEST_FILTER=TimePreferenceControllerTest
Test: make -j30 RunSettingsRoboTests ROBOTEST_FILTER=DatePreferenceControllerTest
Change-Id: I671bf0e7e7364f64f1397d524c6277591eb4e22e
Merged-In: I671bf0e7e7364f64f1397d524c6277591eb4e22e
(cherry picked from commit 9861696306)
2019-11-27 16:36:59 +00:00
Torbjorn Eklund
4f44b44168 Consider subId when loading Wfc string resources
Consider subId when loading string resources in screen
WifiCallingSettingsForSub and Wi-Fi Calling slice.

This ensures that correct string resources is loaded in multi sim
scenario when operators are using customized strings.

Bug: 129893058
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiCallingPreferenceController
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiCallingSliceHelper
Change-Id: Ia5b763d4b59f7e738cb741b778bb859884a85198
2019-11-27 14:35:07 +01:00
android-build-team Robot
edf015b8de Snap for 6034952 from 5dd4272ee4 to qt-qpr2-release
Change-Id: I813e1911f7288255b8cab19fd2211ce5352bfaab
2019-11-27 02:12:37 +00:00
Bonian Chen
b61f54519b Merge "IMS: Grey out Wifi calling option when either sub is having call." am: 262b4f7434
am: 37e02742a4

Change-Id: I81eac0ecd2948e7b5bd6b92ae90b349ab46675e7
2019-11-26 17:49:06 -08:00
Bonian Chen
37e02742a4 Merge "IMS: Grey out Wifi calling option when either sub is having call."
am: 262b4f7434

Change-Id: I59a18265dc053386854c6c4b4b30e90c287b34e8
2019-11-26 17:46:38 -08:00
Bonian Chen
262b4f7434 Merge "IMS: Grey out Wifi calling option when either sub is having call." 2019-11-27 01:35:23 +00:00
Bonian Chen
42eec15834 Merge "[Setting] Fix merge conflict" am: 67805d8e5e
am: ec4e1a14e0

Change-Id: I716436a78316eb111fa53bb6834d81934f7830f1
2019-11-26 02:11:19 -08:00
Bonian Chen
ec4e1a14e0 Merge "[Setting] Fix merge conflict"
am: 67805d8e5e

Change-Id: Ie7f67b9a80efdceb1e3c5fd3054dd4eb71c4dcd8
2019-11-26 02:02:03 -08:00
Bonian Chen
67805d8e5e Merge "[Setting] Fix merge conflict" 2019-11-26 08:45:05 +00:00
Raff Tsai
14990a1901 Merge "Prevent null point exception" am: 45b03edd00
am: bfa1f2979e

Change-Id: Ib0afc6d71113b52fc63caf5b960ca7239a5c364c
2019-11-26 00:04:15 -08:00