Automerger Merge Worker
b15374611f
Dark theme drop down does not show selected option am: 268d6b092a
...
Change-Id: I96c2d1253366543685ca9aaf56f55b93488bd27e
2019-12-10 23:39:11 +00:00
Jay Aliomer
268d6b092a
Dark theme drop down does not show selected option
...
a place holder for the summary was updated in commit https://googleplex-android-review.git.corp.google.com/changes/platform%2Fpackages%2Fapps%2FSettings~9818614/revisions/3/files/res%2Fxml%2Fdark_mode_settings.xml/download?parent=1
This change is reverted in this CL
Test: manual
Fixes: 145672617
Change-Id: I41443e7334487e3afac0343333a9ed289d2fe390
2019-12-07 22:19:41 +00:00
jiabin
a32c7abcac
Merge "Remove DEVICE_OUT_ALL_SCO." am: ada1f6b10b
...
am: 15d7195311
2019-12-06 09:39:58 -08:00
jiabin
15d7195311
Merge "Remove DEVICE_OUT_ALL_SCO."
...
am: ada1f6b10b
2019-12-06 09:33:50 -08:00
Treehugger Robot
ada1f6b10b
Merge "Remove DEVICE_OUT_ALL_SCO."
2019-12-06 17:26:20 +00:00
Automerger Merge Worker
39f1a86a3a
Merge "Fix "Skip lock screen" not working for secondary user" into qt-qpr1-dev am: 95820eb001
...
Change-Id: I4937675c9088f53e1c6f82a55c6422f699f5ce36
2019-12-06 02:10:43 +00:00
Ilya Matyukhin
95820eb001
Merge "Fix "Skip lock screen" not working for secondary user" into qt-qpr1-dev
2019-12-06 01:58:55 +00:00
Automerger Merge Worker
edb8dd6140
Merge changes from topic "update_battery_icon" into qt-qpr1-dev am: c08f70b7dd
...
Change-Id: I73ebb69f6bfcff8c3c09b8768dd48c9124d67594
2019-12-06 01:21:32 +00:00
Automerger Merge Worker
835fa1fd59
Battery icon is too large am: b6b29c1af0
...
Change-Id: I799cccf2808289b8f080cfa339b3bb35bef2690a
2019-12-06 01:21:24 +00:00
TreeHugger Robot
c08f70b7dd
Merge changes from topic "update_battery_icon" into qt-qpr1-dev
...
* changes:
Sync dimen from SystemUI
Battery icon is too large
2019-12-06 01:05:30 +00:00
jiabin
70858ea40b
Remove DEVICE_OUT_ALL_SCO.
...
Due to the refactor of audio device type, DEVICE_OUT_ALL_SCO has been
removed. Use DEVICE_OUT_BLUETOOTH_SCO_HEADSET for the test instead.
Bug: 135621476
Test: make RunSettingsRoboTests ROBOTEST_FILTER="AudioOutputSwitchPreferenceControllerTest"
Change-Id: Ib32f4c313c5d318b6f99e1f0591c98c4c7c82ade
Merged-In: Ib32f4c313c5d318b6f99e1f0591c98c4c7c82ade
2019-12-05 15:32:32 -08:00
Sarah Chin
00649c664e
Merge "Add NGRAN" am: 4ff75ef786
...
am: 48388d0949
2019-12-05 13:56:01 -08:00
Sarah Chin
48388d0949
Merge "Add NGRAN"
...
am: 4ff75ef786
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
2019-12-05 09:15:16 -08:00
Neil Fuller
72ed7e8f64
Merge "Switch settings to use TimeDetector"
...
am: 5da6521458
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
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
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
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
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
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
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
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
