Jay Aliomer
c6dec5780a
Merge "Fix Master: Add settings for scheduling dark theme"
2019-11-26 15:44:20 +00:00
TreeHugger Robot
66b82d06ab
Merge "Add new bit per sample dialog layout for new Bluetooth developer option"
2019-11-26 10:44:04 +00:00
Bonian Chen
573cda658e
[automerger skipped] Merge "[Setting] Fix merge conflict" am: 67805d8e5e am: ec4e1a14e0
...
am: 42eec158340f844d168b
2019-11-26 02:14:42 -08: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
TreeHugger Robot
50eb686fbd
Merge "Add new LDAC quality dialog layout for new Bluetooth developer option"
2019-11-26 09:39:26 +00:00
Bonian Chen
67805d8e5e
Merge "[Setting] Fix merge conflict"
2019-11-26 08:45:05 +00:00
Raff Tsai
8f962122a7
Merge "Prevent null point exception" am: 45b03edd00 am: bfa1f2979e
...
am: 14990a1901
2019-11-26 00:07:40 -08: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
TreeHugger Robot
1590910490
Merge "Add FutureTask approach in DashboardFragment"
2019-11-26 07:22:53 +00: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
1a359b5b22
Merge "[Settings] Fix test case" am: 9d66571966 am: 1aac3bb569
...
am: 5b6dcf42af
2019-11-25 21:48:54 -08: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
Bonian Chen
747e7e1fa2
Merge "[Settings] Re-enable test case"
2019-11-26 05:31:39 +00:00
Raff Tsai
468a8c79f7
Merge "Remove shadow below the actionbar"
2019-11-26 05:31:36 +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
Sunny Shao
3351c78b74
Add FutureTask approach in DashboardFragment
...
- Use the multiple tasks to enhance the controllers loading.
Bug: 137558156
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.dashboard
Change-Id: I629ff5dc81347cddf9762a87015b9b86b6a46e50
2019-11-26 11:27:03 +08:00
Raff Tsai
290aa7345b
Remove shadow below the actionbar
...
Bug: 141601408
Test: manual
Change-Id: Iaa196ff3b67dbc274116b5215ef48e126099edb9
2019-11-26 11:20:52 +08:00
Jay Aliomer
a377b5c4aa
Fix Master: Add settings for scheduling dark theme
...
Adding a settings page similar to night light for Dark theme. it will allow the user to schedule
dark mode from sunrise to sunset
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: 141567787
Change-Id: Iee5d020ac6ea093be712a4f191d4601c9d4617fa
2019-11-25 18:03:29 -05:00
Bill Yi
01cf29b958
[automerger skipped] Import translations. DO NOT MERGE am: 5dd4272ee4 -s ours
...
am: 2245b41b31
2019-11-25 08:30:37 -08:00
Bonian Chen
a72ff6f7ff
[automerger skipped] Merge "[Settings] Fix conflict of AOSP merge on wifi call" am: 95e1c8d099 am: d7f0fb6cc1
...
am: 8efd95c4132aafbd38e7
2019-11-25 08:26:00 -08:00
Jay Aliomer
b85bd3c15a
[automerger skipped] Merge "Revert "Revert "Add settings for scheduling dark theme""" into qt-qpr1-dev am: 26ce6885c9
...
am: c2302a3d93abf06340cb
2019-11-25 08:17:29 -08:00
Bill Yi
887de07ffa
[automerger skipped] Import translations. DO NOT MERGE am: adfc51a550 -s ours
...
am: 0014dd2d63
2019-11-25 08:12:33 -08:00
Bill Yi
2245b41b31
[automerger skipped] Import translations. DO NOT MERGE
...
am: 5dd4272ee4
2019-11-25 07:32:53 -08:00
Andrei-Valentin Onea
da820e2289
Merge "Add compatibility change preference" am: 0e7b8f7a93 am: 5f2ee93a4b
...
am: 555425a990
2019-11-25 07:19:21 -08:00
Bonian Chen
9ef7aa1cde
[Settings] Re-enable test case
...
Re-enable MobileNetworkActivityTest
Bug: 144664534
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=MobileNetworkActivityTest
Change-Id: I39f96f549b711a628d02d7b112964c851a43bd6f
2019-11-25 22:54:32 +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
Raff Tsai
056e99b053
Merge "Remove unused string"
2019-11-25 13:09:34 +00:00
Alan Stokes
3596aeeca7
Merge "Stop relying on PACKAGE_VERIFIER_ENABLE."
2019-11-25 11:27:51 +00:00
TreeHugger Robot
fbc8bbf870
Merge "Fix crash while lauching location settings"
2019-11-25 10:10:49 +00:00
TreeHugger Robot
901ba391d3
Merge "[Wi-Fi] Fix unit test fails"
2019-11-25 08:33:35 +00:00
Tsung-Mao Fang
9c8a1b0db9
Fix crash while lauching location settings
...
Use a regular drawable icon instead.
Change-Id: I53e437c8f68eed1ea64e6fed30c1823c7807d0bf
Fix: 144578394
Test: Rebuild
2019-11-25 16:09:00 +08:00
Arc Wang
0614a7d1ea
[Wi-Fi] Fix unit test fails
...
Bug: 144405885
Test: WifiSettingsTest
WifiSettings2Test
WifiDetailPreferenceControllerTest
WifiDetailPreferenceController2Test
Change-Id: Ib6a34364c3eb47d59a153f07e31c9cddddcf1f8a
2019-11-25 14:46:03 +08:00
Raff Tsai
2229585e88
Refactor LocationSettings
...
- Extends BasePreferenceController in LocationBasePreferenceController
which binds preference key based on xml file instead of writing the key
in java code. Then the controller can be used in many xmls.
- Modify LocationServicePreferenceController to support only personal or
profile user.
Bug: 141601408
Test: manual, robolectric
Change-Id: I51ee950dfb87474df84a8dc3db55fb911edcf599
2019-11-25 13:11:12 +08:00
TreeHugger Robot
a6198c25be
Merge "Adjust lock screen tests"
2019-11-25 03:29:24 +00:00
Bonian Chen
95e1c8d099
Merge "[Settings] Fix conflict of AOSP merge on wifi call"
2019-11-25 03:07:16 +00:00
Jason Chiu
bfbb0181a3
Merge "[Settings] Support master switch of inline toggle of Settings Injection v2"
2019-11-25 02:36:09 +00:00
Lucas Dupin
b5c17fb361
Adjust lock screen tests
...
Lock screen dashboard is now always visible, and tests should reflect
the new behavior.
Fixes: 144899234
Test: treehugger
Test: make RunSettingsRoboTests ROBOTEST_FILTER=LockScreenPreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=LockscreenDashboardFragmentTest
Change-Id: Ia1cd79c5d8f6ea74525f6afdea900c230806fd88
2019-11-24 16:34:25 -08:00
Bonian Chen
a6e7aa1237
[automerger skipped] Merge "[Settings] Fix conflict of AOSP merge" am: 56385ed9f8 -s ours am: 88594b8bf7 -s ours
...
am: 3f413f1a177a4c679790
2019-11-24 05:22:28 -08:00
Hai Shalom
36a13b3714
[automerger skipped] Merge "Revert submission" into qt-qpr1-dev am: 775106e40d
...
am: 59185d0931979b95777a
2019-11-24 04:57:25 -08:00
Preston O'Neal
a8ebfe6d75
Merge "Revert "Add settings for scheduling dark theme"" into qt-qpr1-dev am: a3e26f10f2
...
am: 1a67e3048e
2019-11-24 04:57:03 -08:00
Jay Aliomer
1d69613ac1
Merge "DarkUIPreferenceController null exception" into qt-qpr1-dev am: 48f4e5722e
...
am: 29c4d02b92
2019-11-24 04:56:47 -08:00
Jay Aliomer
0c5b37d602
[automerger skipped] Add settings for scheduling dark theme am: 7141b142df
...
am: 204b82e2e7204b82e2e7
2019-11-24 04:50:16 -08: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
