Stanley Wang
8015cbab9e
Add work profile items of Account page to dynamic index.
...
- Add "Work profile settings" & "Remove work profile"
to dynamic index
Test: manual & robotests AccountPreferenceControllerTest
Change-Id: I122269927fd466bc8fbce1dd68faa372a6a7477b
Bugs: 69907442
2019-11-27 18:44:12 +08:00
Bonian Chen
1a359b5b22
Merge "[Settings] Fix test case" am: 9d66571966 am: 1aac3bb569
...
am: 5b6dcf42af
Change-Id: Ia68856654d377c38444299282a7d4e1bb5c4c6e5
2019-11-25 21:48:54 -08:00
Bonian Chen
5b6dcf42af
Merge "[Settings] Fix test case" am: 9d66571966
...
am: 1aac3bb569
Change-Id: I699e94aef7180509ca1f8bf4dd8d4f6ade7413fd
2019-11-25 21:46:21 -08:00
Bonian Chen
1aac3bb569
Merge "[Settings] Fix test case"
...
am: 9d66571966
Change-Id: Ieea99bd4da19962a6d7bd826b6678168e755cf2f
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
290aa7345b
Remove shadow below the actionbar
...
Bug: 141601408
Test: manual
Change-Id: Iaa196ff3b67dbc274116b5215ef48e126099edb9
2019-11-26 11:20:52 +08:00
Bill Yi
01cf29b958
[automerger skipped] Import translations. DO NOT MERGE am: 5dd4272ee4 -s ours
...
am: 2245b41b31 -s ours
am skip reason: subject contains skip directive
Change-Id: If89fcb13087b6a6c27bbc9e35b77e435b35b24f7
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: 8efd95c413 -s ours
am skip reason: change_id Idb063bdab3d3b11c348804c1c0ecb268cca3068e with SHA1 2aafbd38e7 is in history
Change-Id: I55c5c96a2855c56bbc8c3dc46a0afea5909aafbf
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: c2302a3d93 -s ours
am skip reason: change_id I8f05b50f8198c4b2565bb9b6f62ddda5029c8365 with SHA1 abf06340cb is in history
Change-Id: I59a988a34d06d6f6a64f3c207b907726f4a7dade
2019-11-25 08:17:29 -08:00
Bill Yi
887de07ffa
[automerger skipped] Import translations. DO NOT MERGE am: adfc51a550 -s ours
...
am: 0014dd2d63 -s ours
am skip reason: subject contains skip directive
Change-Id: I3fdb30af2db3035e4e4a39f4e72e0cf3f950765f
2019-11-25 08:12:33 -08:00
Bill Yi
2245b41b31
[automerger skipped] Import translations. DO NOT MERGE
...
am: 5dd4272ee4 -s ours
am skip reason: subject contains skip directive
Change-Id: Ibb0fffe0070fe272970636fa012c26900ad4e3e1
2019-11-25 07:32:53 -08:00
Andrei-Valentin Onea
da820e2289
Merge "Add compatibility change preference" am: 0e7b8f7a93 am: 5f2ee93a4b
...
am: 555425a990
Change-Id: Ifd5e10c2aab269ca67356f68d1adcfeda0938f66
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
Change-Id: Ic6268671ff092174866dbd6341a9d7113bd2a4bd
2019-11-25 05:53:45 -08:00
Bonian Chen
d7f0fb6cc1
Merge "[Settings] Fix conflict of AOSP merge on wifi call"
...
am: 95e1c8d099
Change-Id: Ia69e14def5abf09d286d20f7922ea6900e9d61f1
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: 3f413f1a17 -s ours
am skip reason: change_id I7a86395c86d31fe2ba54c04ac16b1a0ebfc843f3 with SHA1 7a4c679790 is in history
Change-Id: I813e25cef095719329e73b1b24fbccbbc060c875
2019-11-24 05:22:28 -08:00
Hai Shalom
36a13b3714
[automerger skipped] Merge "Revert submission" into qt-qpr1-dev am: 775106e40d
...
am: 59185d0931 -s ours
am skip reason: change_id I5f3a6e31dc96fbc016e6ab5f56c3c68eb9e7723f with SHA1 979b95777a is in history
Change-Id: I982ca7c43ce8683d3139a8960aefd4e520bebd57
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
Change-Id: Ice680ada896b5b0d954e7e4b0c6318a9adfd23d0
2019-11-24 04:57:03 -08:00
Jay Aliomer
1d69613ac1
Merge "DarkUIPreferenceController null exception" into qt-qpr1-dev am: 48f4e5722e
...
am: 29c4d02b92
Change-Id: I6b79b52853605052e08aa744d8f612a2c35d0eba
2019-11-24 04:56:47 -08:00
Jay Aliomer
0c5b37d602
[automerger skipped] Add settings for scheduling dark theme am: 7141b142df
...
am: 204b82e2e7 -s ours
am skip reason: SHA1 204b82e2e7 skipped by user beverlyt
Change-Id: If99426f192005bc1d1a7a430aa6d3c9ef14b8f61
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
Jay Aliomer
c2302a3d93
Merge "Revert "Revert "Add settings for scheduling dark theme""" into qt-qpr1-dev
...
am: 26ce6885c9
Change-Id: If216838715772b9d45624e77213ec81f0c84bd60
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 .
Reason for revert: Fixed the error which is code incompatibility
Test: run all settings tests
Change-Id: I8f05b50f8198c4b2565bb9b6f62ddda5029c8365
Merged-In: I8f05b50f8198c4b2565bb9b6f62ddda5029c8365
Bug: 141567787
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
40785974b5
Merge "Import translations. DO NOT MERGE"
2019-11-22 20:33:46 +00:00
Bill Yi
0014dd2d63
[automerger skipped] Import translations. DO NOT MERGE
...
am: adfc51a550 -s ours
am skip reason: subject contains skip directive
Change-Id: Ieddaa832f55b0414da39936c058b95c31d7b3aca
2019-11-22 12:05:37 -08:00
Jay Aliomer
abf06340cb
Revert "Revert "Add settings for scheduling dark theme""
...
This reverts commit 50c0fa136c .
Reason for revert: Fixed the error which is code incompatibility
Test: run all settings tests
Change-Id: I8f05b50f8198c4b2565bb9b6f62ddda5029c8365
Merged-In: I3094b655c04f59c23a95162a1be5ee8260e28a48
2019-11-22 19:15:12 +00: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
Bill Yi
e3655b3a78
Import translations. DO NOT MERGE
...
Change-Id: Ic2795d74051ea90315a4e74a3de2ef73af8ee049
Auto-generated-cl: translation import
2019-11-22 09:28:51 -08:00
Alan Stokes
2afeb5f43f
Stop relying on PACKAGE_VERIFIER_ENABLE.
...
This setting is being removed, and it no longer controls whether a
package verifier will be invoked. (Each verifier may have its own
controls, but they are outside the framework.)
Test: atest VerifyAppsOverUsbPreferenceControllerTest
Bug: 135751498
Change-Id: I78029c3529f331a88fde42a7aac5c155954f825e
2019-11-22 14:39:01 +00:00
Andrei-Valentin Onea
555425a990
Merge "Add compatibility change preference" am: 0e7b8f7a93
...
am: 5f2ee93a4b
Change-Id: I04714e52df6c5e967af744d584f5d2db38cb5680
2019-11-22 06:12:52 -08:00
Andrei-Valentin Onea
5f2ee93a4b
Merge "Add compatibility change preference"
...
am: 0e7b8f7a93
Change-Id: Ied50da0e1cdda7c390603f184ae614dd8584025b
2019-11-22 06:06:39 -08:00
Raff Tsai
6c45ef5328
Merge "Fix navigation to wrong page"
2019-11-22 13:10:19 +00:00
Andrei-Valentin Onea
0e7b8f7a93
Merge "Add compatibility change preference"
2019-11-22 13:02:45 +00:00
Goven Liu
a9ba39fb16
Merge "[Wi-Fi] Add basic UI structure for adding Wi-Fi for apps feature."
2019-11-22 11:21:07 +00:00