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
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
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
timhypeng
953eb229c0
Sync dimen from SystemUI
...
Bug: 141139595
Test: manual
Change-Id: Ifa9a31750b9a926e09aec9262aa89e8de66c91e2
(cherry picked from commit 3dd4f2cc19
2019-11-26 12:39:43 +08:00
timhypeng
b6b29c1af0
Battery icon is too large
...
-sync layout from SystemUI
Bug: 141139595
Test: make -j42 RunSettingsRoboTests
Change-Id: I5e165e953682fcfdebf0d06475bb1abd171684d9
(cherry picked from commit c71f996da9
2019-11-26 12:35:22 +08: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
android-build-team Robot
19a3d09442
Snap for 6029402 from 26ce6885c9 to qt-qpr2-release
...
Change-Id: I777ff78054b2a1bcf6382eeef802e5bb67e27d0d
2019-11-24 00:18:26 +00:00
Jay Aliomer
c2302a3d93
Merge "Revert "Revert "Add settings for scheduling dark theme""" into qt-qpr1-dev
...
am: 26ce6885c9
2019-11-22 14:42:52 -08:00
Jay Aliomer
26ce6885c9
Merge "Revert "Revert "Add settings for scheduling dark theme""" into qt-qpr1-dev
2019-11-22 22:29:43 +00:00
Jay Aliomer
53ad4fedc6
Revert "Revert "Add settings for scheduling dark theme""
...
This reverts commit 50c0fa136c
2019-11-22 20:58:23 +00:00
Bonian Chen
cacf047daa
[Settings] Fix conflict of AOSP merge on wifi call
...
Merge for fixing conflict of Ib4b0e1191c83e23377ccf8ed013252728ef9dd95
Bug: 144960427
Test: build pass
Change-Id: I2979a9a2ee1bc690486e25b7d470cf905cf02d17
Merged-In: Idb063bdab3d3b11c348804c1c0ecb268cca3068e
2019-11-22 20:38:13 +00:00
Bill Yi
0014dd2d63
[automerger skipped] Import translations. DO NOT MERGE
...
am: adfc51a550
2019-11-22 12:05:37 -08:00
Bill Yi
adfc51a550
Import translations. DO NOT MERGE
...
Change-Id: I64d2c2f4a3053bf7d163962d8a27929fd055b24b
Auto-generated-cl: translation import
2019-11-22 10:44:01 -08:00
Andrei-Valentin Onea
555425a990
Merge "Add compatibility change preference" am: 0e7b8f7a93
...
am: 5f2ee93a4b
2019-11-22 06:12:52 -08:00
Andrei-Valentin Onea
5f2ee93a4b
Merge "Add compatibility change preference"
...
am: 0e7b8f7a93
2019-11-22 06:06:39 -08:00
Andrei-Valentin Onea
0e7b8f7a93
Merge "Add compatibility change preference"
2019-11-22 13:02:45 +00:00
Bonian Chen
3f413f1a17
[automerger skipped] Merge "[Settings] Fix conflict of AOSP merge" am: 56385ed9f8 -s ours
...
am: 88594b8bf7c7c84d2c87
2019-11-22 01:16:57 -08:00
Bonian Chen
88594b8bf7
[automerger skipped] Merge "[Settings] Fix conflict of AOSP merge"
...
am: 56385ed9f8c7c84d2c87
2019-11-22 01:13:28 -08:00
Bonian Chen
56385ed9f8
Merge "[Settings] Fix conflict of AOSP merge"
2019-11-22 09:05:29 +00:00
Hai Shalom
59185d0931
Merge "Revert submission" into qt-qpr1-dev
...
am: 775106e40d
2019-11-21 19:57:51 -08:00
Hai Shalom
775106e40d
Merge "Revert submission" into qt-qpr1-dev
2019-11-22 03:46:02 +00:00
