Anna Trostanetski
ba1e18dff9
Merge "Add descriptions to compat changes." am: fdb5a1ce2a
...
am: d76cef9f7c
2019-12-05 04:36:20 -08:00
Anna Trostanetski
d76cef9f7c
Merge "Add descriptions to compat changes."
...
am: fdb5a1ce2a
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
Raff Tsai
ed870944d0
Merge "Fix cannot see "see more" button in UI" am: 2dbc2db581
...
am: 1fdadc1125
2019-12-04 20:28:27 -08:00
Raff Tsai
1fdadc1125
Merge "Fix cannot see "see more" button in UI"
...
am: 2dbc2db581
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
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
Bonian Chen
fd3557954f
Merge "[Settings] Enable support on testing" am: 84a2951a33
...
am: 08dcb51c6c
2019-12-04 09:08:24 -08:00
Xin Li
944b8b330f
Merge "Merge Android10 QPR1 into AOSP master" am: bd2174cda1
...
am: f9b5a6bd07
2019-12-04 08:13:43 -08:00
Bonian Chen
08dcb51c6c
Merge "[Settings] Enable support on testing"
...
am: 84a2951a33
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
Xin Li
f9b5a6bd07
Merge "Merge Android10 QPR1 into AOSP master"
...
am: bd2174cda1
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
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
2019-11-28 07:28:07 -08:00
Bonian Chen
944689abd6
Merge "Consider subId when loading Wfc string resources"
...
am: 9c2c1b4784
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
2019-11-28 00:59:44 -08:00
Neil Fuller
5ef64ad89b
Merge "Switch settings to use TimeDetector"
...
am: d32eee26e3
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
Bonian Chen
b61f54519b
Merge "IMS: Grey out Wifi calling option when either sub is having call." am: 262b4f7434
...
am: 37e02742a4
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
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
2019-11-26 02:11:19 -08:00
Bonian Chen
ec4e1a14e0
Merge "[Setting] Fix merge conflict"
...
am: 67805d8e5e
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
2019-11-26 00:04:15 -08:00
Raff Tsai
bfa1f2979e
Merge "Prevent null point exception"
...
am: 45b03edd00
2019-11-26 00:02:27 -08:00
Bonian Chen
dfba6f8720
[Setting] Fix merge conflict
...
Fix merge conflict for I367ae3a5f97ff92e03312bed6fe37727ae3798ab
Bug: 144960427
Test: build pass
Change-Id: I24d684b4e695e8ab777f2ba7811b93f6028260d9
Merged-In: I5dfb71ceb87a8f658ef7fbceacf460ef8d35593a
2019-11-26 07:20:30 +00:00
Treehugger Robot
45b03edd00
Merge "Prevent null point exception"
2019-11-26 07:10:47 +00:00
Bonian Chen
5b6dcf42af
Merge "[Settings] Fix test case" am: 9d66571966
...
am: 1aac3bb569
2019-11-25 21:46:21 -08:00
Bonian Chen
1aac3bb569
Merge "[Settings] Fix test case"
...
am: 9d66571966
2019-11-25 21:43:52 -08:00
Bonian Chen
9d66571966
Merge "[Settings] Fix test case"
2019-11-26 05:32:00 +00:00
Raff Tsai
0e8a45a7f5
Prevent null point exception
...
Test: Settings -> click search bar, not seeing null point exception
Change-Id: Ib9df9d97b374246fa36c79f531760b57d7c6c508
2019-11-26 12:05:58 +08:00
Bill Yi
2245b41b31
[automerger skipped] Import translations. DO NOT MERGE
...
am: 5dd4272ee4
2019-11-25 07:32:53 -08:00
Bonian Chen
6c25c29464
[Settings] Fix test case
...
Change annotation library
Bug: 144664534
Test: build pass
Change-Id: Iffafc3a9a7dadc961d180c6a1ef2764c8d72eb2f
2019-11-25 22:28:22 +08:00
Bonian Chen
8efd95c413
Merge "[Settings] Fix conflict of AOSP merge on wifi call" am: 95e1c8d099
...
am: d7f0fb6cc1
2019-11-25 05:53:45 -08:00
Bonian Chen
d7f0fb6cc1
Merge "[Settings] Fix conflict of AOSP merge on wifi call"
...
am: 95e1c8d099
2019-11-25 05:43:18 -08:00
Pooja Jain
812f8e9065
IMS: Grey out Wifi calling option when either sub is having call.
...
The WifiCallingSettingsForSub was not checking for call state reported
by telephony manager, hence, when call was on other sub, the option was not
getting greyed out.
Use the TelephonyManager API to fetch callstate.
Test: Manual
Bug: 130706399
Change-Id: Ib4b0e1191c83e23377ccf8ed013252728ef9dd95
2019-11-25 12:10:03 +05:30
Bonian Chen
95e1c8d099
Merge "[Settings] Fix conflict of AOSP merge on wifi call"
2019-11-25 03:07:16 +00:00
Bill Yi
5dd4272ee4
Import translations. DO NOT MERGE
...
Change-Id: I0258ef130ec225a374ae445da558755f621556d0
Auto-generated-cl: translation import
2019-11-24 04:38:04 -08:00
