Commit Graph

10286 Commits

Author SHA1 Message Date
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
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
747e7e1fa2 Merge "[Settings] Re-enable test case" 2019-11-26 05:31:39 +00: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
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
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
Alan Stokes
3596aeeca7 Merge "Stop relying on PACKAGE_VERIFIER_ENABLE." 2019-11-25 11:27:51 +00:00
TreeHugger Robot
901ba391d3 Merge "[Wi-Fi] Fix unit test fails" 2019-11-25 08:33:35 +00: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
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
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
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
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
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
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
govenliu
d507b56ad1 [Wi-Fi] Add basic UI structure for adding Wi-Fi for apps feature.
Add following changes:
1. Add intent receiver.
2. Add panel UI with icon, title, summary.
3. Add two buttons (save and cancel).
4. Add test case for activity and fragment

Bug: 136472483
Test: Add following test cases for checking button and package name in activity and fragment.
      1. AddAppNetworksActivityTest
      2. AddAppNetworksFragmentTest
Change-Id: I5515a96fa3feb0e3e6d68159b2c0dec0894c15ee
2019-11-22 17:02:59 +08:00
Jason Chiu
10e675d6b5 [Settings] Support master switch of inline toggle of Settings Injection v2
Allow developers to inject MasterSwitchPreference, a switch
preference with two tap targets, to Settings page.

Developers should declare keyhint and switch_uri for the activity
in AndroidManifest,and then implement a SwitchesProvider.

Bug: 132808482
Test: robotest
Change-Id: I64cdf18268be0cfcd38aab2c059144536dd79b32
2019-11-22 04:04:04 +00:00
TreeHugger Robot
632958cfb0 Merge "Remove DEVICE_OUT_ALL_SCO." 2019-11-22 00:52:24 +00:00
Preston O'Neal
1a67e3048e Merge "Revert "Add settings for scheduling dark theme"" into qt-qpr1-dev
am: a3e26f10f2

Change-Id: I3ab3f5c219789a2b48d90607c17188e634e0c448
2019-11-21 15:01:23 -08:00
Preston O'Neal
50c0fa136c Revert "Add settings for scheduling dark theme"
This reverts commit 7141b142df.

Reason for revert: This is breaking builds on git_qt-qpr1-dev

Change-Id: I7766826d3fc86a12fc8411b027a52eceb5a66019
2019-11-21 22:09:53 +00:00
Jay Aliomer
204b82e2e7 Add settings for scheduling dark theme
am: 7141b142df

Change-Id: Ib58ca2eceaea6638e29028126c377802cac9df1d
2019-11-21 13:48:14 -08:00
Jay Aliomer
7141b142df 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: I3094b655c04f59c23a95162a1be5ee8260e28a48
(cherry picked from commit 0828e6be9c)
2019-11-21 20:07:24 +00:00
Andrei Onea
486fd49e87 Add compatibility change preference
Add UI for modifying the compatibility change overrides per-app.

Test: make RunSettingsRoboTests ROBOTEST_FILTER=PlatformCompatDashboardTest
Bug: 138280620
Change-Id: I07c7602e7a439e47b0b1fa59b047231afbbc0ab6
2019-11-21 11:48:07 +00:00
Arc Wang
ade3cc7b49 Merge "[Wi-Fi] Force users to select a phase2 authentication for PEAP & TTLS" 2019-11-21 05:54:12 +00:00
TreeHugger Robot
76756f43db Merge "[Settings] Support pure switch of inline toggle of Settings Injection v2" 2019-11-21 04:35:29 +00:00
Bonian Chen
7d2d92df21 Merge "[Settings] Fix robotest build breakage" am: 6c9b9f41d6 am: 635c2fa095
am: 04b12dd0ae

Change-Id: Ic98c3165d78897c9c7200c613934137d06b26f8b
2019-11-20 19:18:21 -08:00
Bonian Chen
04b12dd0ae Merge "[Settings] Fix robotest build breakage" am: 6c9b9f41d6
am: 635c2fa095

Change-Id: I2bbd23c7600dc608abd42cb350324cd42cecc00f
2019-11-20 19:14:51 -08:00
Bonian Chen
635c2fa095 Merge "[Settings] Fix robotest build breakage"
am: 6c9b9f41d6

Change-Id: I0b52f783c5dd46a06ebfb0a51650666c0e52b961
2019-11-20 19:11:18 -08:00
TreeHugger Robot
1e714110ca Merge "Do not hide lock screen settings conditionally" 2019-11-21 03:06:43 +00:00
Lucas Dupin
01c00962a9 Do not hide lock screen settings conditionally
Users have reached out to us asking where are their settings and
cannot understand why things disappear.

Test: LockScreenPreferenceControllerTest
Change-Id: I05b182a26724fd14b0a8240e280f216ebf4d43b9
2019-11-20 09:49:23 -08:00
Raff Tsai
21c466ff5b Fix testcase error
Fixes: 144832138
Fixes: 144831580
Test: robolectric
Change-Id: I01efc467cf75b5beb2d2dd23188a8fa7d67f32ed
2019-11-21 01:06:10 +08:00
Jay Aliomer
bb32051ce0 Merge "Add settings for scheduling dark theme" 2019-11-20 16:41:23 +00:00
Bonian Chen
4a1dbccac6 [Settings] Fix robotest build breakage
Add annotation library into test build

Bug: 144810473
Test: build pass
Change-Id: Idb4e056fb73a349ac268e5d2292a31fe7d9a6642
2019-11-20 23:05:55 +08:00
Yi-Ling Chuang
c19f4f41ec Merge "Add a new column for slices_index table." 2019-11-20 05:44:04 +00:00
TreeHugger Robot
5035742f6c Merge "Move UpdatableListPreferenceDialogFragment to SettingsLib" 2019-11-20 05:14:08 +00:00
Yi-Ling Chuang
c7cd6c4671 Add a new column for slices_index table.
To distinguish public and non-public slices, add public_slice column
to the database so we can return corresponding results based on this
value.

Bug: 141088937
Test: robotests
Change-Id: I05d003875a8be27e5cb735b4814eb86d6dc40174
2019-11-20 11:44:23 +08:00
Arc Wang
41661fe69c [Wi-Fi] Force users to select a phase2 authentication for PEAP & TTLS
To improve security.

Bug: 143601727
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiConfigControllerTest
Change-Id: I0cb1ceda6d89a52224f80ea5ffd1af709a6acace
2019-11-20 10:59:23 +08:00